Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.MainForm.WindowsForms/3.3/MainForms

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs (modified) (4 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs (modified) (4 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (3 diffs)

branches/crossvalidation-2434/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs

@@ -34 +34 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DockForm));
       this.viewPanel = new System.Windows.Forms.Panel();
+      this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
+      this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.closeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.closeAllButThisToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+      this.cloneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.contextMenuStrip.SuspendLayout();
       this.SuspendLayout();
       // 
       // viewPanel
       // 
-      this.viewPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.viewPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.viewPanel.Location = new System.Drawing.Point(12, 12);
       this.viewPanel.Name = "viewPanel";
@@ -48 +56 @@
       this.viewPanel.TabIndex = 0;
       // 
+      // contextMenuStrip
+      // 
+      this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.closeToolStripMenuItem,
+            this.closeAllToolStripMenuItem,
+            this.closeAllButThisToolStripMenuItem,
+            this.toolStripSeparator1,
+            this.cloneToolStripMenuItem});
+      this.contextMenuStrip.Name = "contextMenuStrip";
+      this.contextMenuStrip.Size = new System.Drawing.Size(167, 120);
+      this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
+      // 
+      // closeToolStripMenuItem
+      // 
+      this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
+      this.closeToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+      this.closeToolStripMenuItem.Text = "Close";
+      this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
+      // 
+      // closeAllToolStripMenuItem
+      // 
+      this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem";
+      this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+      this.closeAllToolStripMenuItem.Text = "Close All";
+      this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.closeAllToolStripMenuItem_Click);
+      // 
+      // closeAllButThisToolStripMenuItem
+      // 
+      this.closeAllButThisToolStripMenuItem.Name = "closeAllButThisToolStripMenuItem";
+      this.closeAllButThisToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+      this.closeAllButThisToolStripMenuItem.Text = "Close All But This";
+      this.closeAllButThisToolStripMenuItem.Click += new System.EventHandler(this.closeAllButThisToolStripMenuItem_Click);
+      // 
+      // toolStripSeparator1
+      // 
+      this.toolStripSeparator1.Name = "toolStripSeparator1";
+      this.toolStripSeparator1.Size = new System.Drawing.Size(163, 6);
+      // 
+      // cloneToolStripMenuItem
+      // 
+      this.cloneToolStripMenuItem.Name = "cloneToolStripMenuItem";
+      this.cloneToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+      this.cloneToolStripMenuItem.Text = "Create Copy";
+      this.cloneToolStripMenuItem.Click += new System.EventHandler(this.cloneToolStripMenuItem_Click);
+      // 
       // DockForm
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.ClientSize = new System.Drawing.Size(632, 446);
@@ -59 +111 @@
       this.ShowInTaskbar = false;
       this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+      this.TabPageContextMenuStrip = this.contextMenuStrip;
+      this.contextMenuStrip.ResumeLayout(false);
       this.ResumeLayout(false);
+
     }
 
@@ -65 +120 @@
 
     private System.Windows.Forms.Panel viewPanel;
+    private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
+    private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem closeAllToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem closeAllButThisToolStripMenuItem;
+    private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+    private System.Windows.Forms.ToolStripMenuItem cloneToolStripMenuItem;
   }
 }

branches/crossvalidation-2434/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using WeifenLuo.WinFormsUI.Docking;
 
@@ -29 +32 @@
   /// </summary>
   internal partial class DockForm : DockContent {
-    public DockForm(IView view) {
+    public DockForm(IView view, bool allowContextMenu) {
       InitializeComponent();
       this.view = view;
+      this.allowContextMenu = allowContextMenu;
+
       if (view != null) {
         if (view is UserControl) {
@@ -87 +92 @@
       get { return this.view; }
     }
+    private readonly bool allowContextMenu;
 
     private void UpdateText() {
@@ -111 +117 @@
     }
     #endregion
+
+    #region Context Menu Events
+    private void contextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) {
+      if (!allowContextMenu) {
+        e.Cancel = true;
+        return;
+      }
+
+      var contentView = View as IContentView;
+      var content = contentView != null ? contentView.Content : null;
+
+      cloneToolStripMenuItem.Enabled = contentView != null && !contentView.Locked && content is IDeepCloneable;
+    }
+
+    private void closeToolStripMenuItem_Click(object sender, EventArgs e) {
+      Close();
+    }
+    private void closeAllToolStripMenuItem_Click(object sender, EventArgs e) {
+      foreach (var dockForm in CurrentDockForms) {
+        dockForm.Close();
+      }
+    }
+    private void closeAllButThisToolStripMenuItem_Click(object sender, EventArgs e) {
+      foreach (var dockForm in CurrentDockForms.Except(this.ToEnumerable())) {
+        dockForm.Close();
+      }
+    }
+    private IEnumerable<DockForm> CurrentDockForms {
+      get {
+        var dockForms = Pane.Contents.OfType<DockForm>().Where(c => c.Pane == Pane); // Pane.Contents contains DockForms that are not placed on that pane
+        return dockForms.ToList(); // .ToList() necessary because closing a DockForm removes it from the Content collection
+      }
+    }
+
+    private void cloneToolStripMenuItem_Click(object sender, EventArgs e) {
+      var contentView = View as IContentView;
+      if (contentView == null) return;
+
+      var cloneable = contentView.Content as IDeepCloneable;
+      if (cloneable == null) return;
+
+      var clone = (IContent)cloneable.Clone();
+
+      var viewHost = contentView as ViewHost;
+      var newView = viewHost != null ? viewHost.ViewType : contentView.GetType();
+      MainFormManager.MainForm.ShowContent(clone, newView);
+    }
+    #endregion
   }
 }

branches/crossvalidation-2434/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.cs

@@ -25 +25 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class DockingMainForm : MainForm {
+
+    public bool AllowContexMenu { get; set; }
+
     public DockingMainForm()
       : base() {
       InitializeComponent();
+      AllowContexMenu = true;
     }
     public DockingMainForm(Type userInterfaceItemType)
       : base(userInterfaceItemType) {
       InitializeComponent();
+      AllowContexMenu = true;
     }
     public DockingMainForm(Type userInterfaceItemType, bool showContentInViewHost)
@@ -60 +65 @@
 
     protected override Form CreateForm(IView view) {
-      return new DockForm(view);
+      return new DockForm(view, AllowContexMenu);
     }
 

branches/crossvalidation-2434/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -214 +214 @@
     }
 
-    internal Form GetForm(IView view) {
+    protected internal Form GetForm(IView view) {
       if (views.ContainsKey(view))
         return views[view];
@@ -456 +456 @@
     #region create menu and toolbar
     private void CreateGUI() {
-      IEnumerable<object> allUserInterfaceItems = ApplicationManager.Manager.GetInstances(userInterfaceItemType);
-
-      IEnumerable<IPositionableUserInterfaceItem> toolStripMenuItems =
-        from mi in allUserInterfaceItems
-        where (mi is IPositionableUserInterfaceItem) &&
-              (mi is IMenuItem || mi is IMenuSeparatorItem)
-        orderby ((IPositionableUserInterfaceItem)mi).Position
-        select (IPositionableUserInterfaceItem)mi;
-
-      foreach (IPositionableUserInterfaceItem menuItem in toolStripMenuItems) {
-        if (menuItem is IMenuItem)
-          AddToolStripMenuItem((IMenuItem)menuItem);
-        else if (menuItem is IMenuSeparatorItem)
-          AddToolStripMenuItem((IMenuSeparatorItem)menuItem);
-      }
-
-      IEnumerable<IPositionableUserInterfaceItem> toolStripButtonItems =
-        from bi in allUserInterfaceItems
-        where (bi is IPositionableUserInterfaceItem) &&
-              (bi is IToolBarItem || bi is IToolBarSeparatorItem)
-        orderby ((IPositionableUserInterfaceItem)bi).Position
-        select (IPositionableUserInterfaceItem)bi;
-
-      foreach (IPositionableUserInterfaceItem toolStripButtonItem in toolStripButtonItems) {
-        if (toolStripButtonItem is IToolBarItem)
-          AddToolStripButtonItem((IToolBarItem)toolStripButtonItem);
-        else if (toolStripButtonItem is IToolBarSeparatorItem)
-          AddToolStripButtonItem((IToolBarSeparatorItem)toolStripButtonItem);
-      }
-
+      if (userInterfaceItemType != null) {
+        IEnumerable<object> allUserInterfaceItems = ApplicationManager.Manager.GetInstances(userInterfaceItemType);
+
+        IEnumerable<IPositionableUserInterfaceItem> toolStripMenuItems =
+          from mi in allUserInterfaceItems
+          where (mi is IPositionableUserInterfaceItem) &&
+                (mi is IMenuItem || mi is IMenuSeparatorItem)
+          orderby ((IPositionableUserInterfaceItem)mi).Position
+          select (IPositionableUserInterfaceItem)mi;
+
+        foreach (IPositionableUserInterfaceItem menuItem in toolStripMenuItems) {
+          if (menuItem is IMenuItem)
+            AddToolStripMenuItem((IMenuItem)menuItem);
+          else if (menuItem is IMenuSeparatorItem)
+            AddToolStripMenuItem((IMenuSeparatorItem)menuItem);
+        }
+
+        IEnumerable<IPositionableUserInterfaceItem> toolStripButtonItems =
+          from bi in allUserInterfaceItems
+          where (bi is IPositionableUserInterfaceItem) &&
+                (bi is IToolBarItem || bi is IToolBarSeparatorItem)
+          orderby ((IPositionableUserInterfaceItem)bi).Position
+          select (IPositionableUserInterfaceItem)bi;
+
+        foreach (IPositionableUserInterfaceItem toolStripButtonItem in toolStripButtonItems) {
+          if (toolStripButtonItem is IToolBarItem)
+            AddToolStripButtonItem((IToolBarItem)toolStripButtonItem);
+          else if (toolStripButtonItem is IToolBarSeparatorItem)
+            AddToolStripButtonItem((IToolBarSeparatorItem)toolStripButtonItem);
+        }
+
+      }
       this.AdditionalCreationOfGuiElements();
+
+      if (menuStrip.Items.Count == 0) menuStrip.Visible = false;
+      if (toolStrip.Items.Count == 0) toolStrip.Visible = false;
     }
 
@@ -555 +560 @@
       try {
         ((IActionUserInterfaceItem)item.Tag).Execute();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
       }