Changeset 2708 for trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems

Timestamp:

01/28/10 21:28:07 (14 years ago)

Author:

swagner

Message:

Adapted HL 3.3 plugins according to changes in MainForm (#857)

Location:

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems

Files:

• CloseAllMenuItem.cs (modified) (2 diffs)
• CloseMenuItem.cs (modified) (2 diffs)
• ExitMenuItem.cs (modified) (2 diffs)
• NewMenuItem.cs (modified) (1 diff)
• OpenMenuItem.cs (modified) (1 diff)
• OperatorsMenuItem.cs (modified) (4 diffs)
• SaveAllMenuItem.cs (modified) (2 diffs)
• SaveAsMenuItem.cs (modified) (2 diffs)
• SaveMenuItem.cs (modified) (2 diffs)
• Separators.cs (modified) (1 diff)

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

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class CloseAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class CloseAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Clos&e All"; }
@@ -20 +20 @@
       get { return 1700; }
     }
+    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
+      get { return ToolStripItemDisplayStyle.Text; }
+    }
 
-    public override void MainFormInitialized(object sender, EventArgs e) {
+    protected override void OnToolStripItemSet(EventArgs e) {
       ToolStripItem.Enabled = false;
     }
-    public override void ActiveViewChanged(object sender, EventArgs e) {
+    protected override void OnActiveViewChanged(object sender, EventArgs e) {
       ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
     }

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

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class CloseMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class CloseMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Close"; }
@@ -20 +20 @@
       get { return 1600; }
     }
+    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
+      get { return ToolStripItemDisplayStyle.Text; }
+    }
 
-    public override void MainFormInitialized(object sender, EventArgs e) {
+    protected override void OnToolStripItemSet(EventArgs e) {
       ToolStripItem.Enabled = false;
     }
-    public override void ActiveViewChanged(object sender, EventArgs e) {
+    protected override void OnActiveViewChanged(object sender, EventArgs e) {
       ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
     }
 
     public override void Execute() {
-      MainFormManager.MainForm.CloseView(MainFormManager.MainForm.ActiveView);
+      MainFormManager.MainForm.ActiveView.Close();
     }
   }

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

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class ExitMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class ExitMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
@@ -19 +19 @@
     public override int Position {
       get { return 1999; }
+    }
+    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
+      get { return ToolStripItemDisplayStyle.Text; }
     }
     public override Keys ShortCutKeys {

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

@@ -9 +9 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class NewMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class NewMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&New..."; }

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

@@ -9 +9 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class OpenMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class OpenMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Open..."; }

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

@@ -12 +12 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class OperatorsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class OperatorsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     private OperatorsSidebar view;
     private ToolStripMenuItem menuItem;
@@ -29 +29 @@
     }
 
-    public override void MainFormInitialized(object sender, EventArgs e) {
+    protected override void OnToolStripItemSet(EventArgs e) {
       view = new OperatorsSidebar();
       view.Dock = DockStyle.Left;
@@ -39 +39 @@
         menuItem.CheckOnClick = true;
       }
-      MainFormManager.MainForm.ShowView(view);
+      view.Show();
     }
 
@@ -50 +50 @@
       if (menuItem != null) {
         if (menuItem.Checked)
-          MainFormManager.MainForm.ShowView(view);
+          view.Show();
         else
-          MainFormManager.MainForm.HideView(view);
+          view.Hide();
       } else {
-        MainFormManager.MainForm.ShowView(view);
+        view.Show();
       }
     }

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

@@ -12 +12 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class SaveAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Save Al&l"; }
@@ -29 +29 @@
     }
 
-    public override void MainFormInitialized(object sender, EventArgs e) {
+    protected override void OnToolStripItemSet(EventArgs e) {
       ToolStripItem.Enabled = false;
     }
-    public override void ActiveViewChanged(object sender, EventArgs e) {
+    protected override void OnActiveViewChanged(object sender, EventArgs e) {
       var views = from v in MainFormManager.MainForm.Views
                   where v is IObjectView

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

@@ -12 +12 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class SaveAsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveAsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Save &As..."; }
@@ -29 +29 @@
     }
 
-    public override void MainFormInitialized(object sender, EventArgs e) {
+    protected override void OnToolStripItemSet(EventArgs e) {
       ToolStripItem.Enabled = false;
     }
-    public override void ActiveViewChanged(object sender, EventArgs e) {
+    protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));

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

@@ -12 +12 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class SaveMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Save"; }
@@ -32 +32 @@
     }
 
-    public override void MainFormInitialized(object sender, EventArgs e) {
+    protected override void OnToolStripItemSet(EventArgs e) {
       ToolStripItem.Enabled = false;
     }
-    public override void ActiveViewChanged(object sender, EventArgs e) {
+    protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));

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

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  internal class SeparatorMenuItem : MenuSeparatorItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SeparatorMenuItem : MenuSeparatorItem, IOptimizerUserInterfaceItemProvider {
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }