Changeset 3571 for trunk/sources/HeuristicLab.Optimizer/3.3

Timestamp:

04/30/10 13:07:31 (15 years ago)

Author:

mkommend

Message:

added Sidebar class and adapted Clipboard and OperatorSidebar (ticket #972)

Location:

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems

Files:

• CloseAllMenuItem.cs (modified) (2 diffs)
• CloseMenuItem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimizer.MenuItems {
@@ -42 +43 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainFormManager.MainForm.Views.Any<IView>(v => v.IsShown);
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.Any<IView>(v => v.IsShown && !(v is Sidebar));
     }
 
     public override void Execute() {
-      MainFormManager.MainForm.CloseAllViews();
+      foreach (IView view in MainFormManager.MainForm.Views)
+        if (!(view is Sidebar))
+          view.Close();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs

@@ -24 +24 @@
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimizer.MenuItems {
@@ -41 +42 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainFormManager.MainForm.ActiveView != null;
+      IView view = MainFormManager.MainForm.ActiveView;
+      ToolStripItem.Enabled = !(view is Sidebar);
     }
 
     public override void Execute() {
-      MainFormManager.MainForm.ActiveView.Close();
+      IView view = MainFormManager.MainForm.ActiveView;
+      if (!(view is Sidebar))
+        view.Close();
     }
   }