Changeset 3576

Timestamp:

05/01/10 02:46:16 (15 years ago)

Author:

swagner

Message:

Fixed exception in CloseAllMenuItem and corrected default enabled state of CloseMenuItem and CloseAllMenuItem (#972)

Location:

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems

Files:

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

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

@@ -40 +40 @@
 
     protected override void OnToolStripItemSet(EventArgs e) {
-      ToolStripItem.Enabled = false;
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.Any<IView>(v => v.IsShown && !(v is Sidebar));
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
@@ -47 +47 @@
 
     public override void Execute() {
-      foreach (IView view in MainFormManager.MainForm.Views)
-        if (!(view is Sidebar))
-          view.Close();
+      var views = MainFormManager.MainForm.Views.Where(x => !(x is Sidebar)).ToArray();
+      foreach (IView view in views)
+        view.Close();
     }
   }

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

@@ -39 +39 @@
 
     protected override void OnToolStripItemSet(EventArgs e) {
-      ToolStripItem.Enabled = false;
+      ToolStripItem.Enabled = !(MainFormManager.MainForm.ActiveView is Sidebar);
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      IView view = MainFormManager.MainForm.ActiveView;
-      ToolStripItem.Enabled = !(view is Sidebar);
+      ToolStripItem.Enabled = !(MainFormManager.MainForm.ActiveView is Sidebar);
     }