Changeset 13614 for trunk

Timestamp:

02/09/16 10:26:09 (8 years ago)

Author:

pfleck

Message:

#1235

• Clone menuitem is enabled only if view is not locked and content is deep cloneable.
• Cloned item shows in same view as the original item.
• Fixed possible NullReferenceException.
• Fixed inconsistency which views were closed on "close all (but this)".

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms

Files:

• DockForm.Designer.cs (modified) (1 diff)
• DockForm.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs

@@ -66 +66 @@
       this.contextMenuStrip.Name = "contextMenuStrip";
       this.contextMenuStrip.Size = new System.Drawing.Size(167, 120);
+      this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
       // 
       // closeToolStripMenuItem

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs

@@ -116 +116 @@
 
     #region Context Menu Events
+    private void contextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) {
+      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.ToList()) {
+      foreach (var dockForm in CurrentDockForms) {
         dockForm.Close();
       }
     }
     private void closeAllButThisToolStripMenuItem_Click(object sender, EventArgs e) {
-      foreach (var dockForm in CurrentDockForms.Except(this.ToEnumerable()).ToList()) {
+      foreach (var dockForm in CurrentDockForms.Except(this.ToEnumerable())) {
         dockForm.Close();
       }
@@ -131 +138 @@
     private IEnumerable<DockForm> CurrentDockForms {
       get {
-        return DockPanel.ActivePane.IsActiveDocumentPane
-            ? DockPanel.Documents.OfType<DockForm>()
-            : DockPanel.ActivePane.Contents.OfType<DockForm>();
-        // ActivePane.Contents contains all dockforms if ActivePane is the main DocumentPane
+        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
       }
     }
@@ -146 +151 @@
 
       var clone = (IContent)cloneable.Clone();
-      MainFormManager.MainForm.ShowContent(clone);
+
+      var viewHost = contentView as ViewHost;
+      var newView = viewHost != null ? viewHost.ViewType : contentView.GetType();
+      MainFormManager.MainForm.ShowContent(clone, newView);
     }
     #endregion