Changeset 2514 for trunk

Timestamp:

11/19/09 18:13:55 (15 years ago)

Author:

mkommend

Message:

added ability to generate separators in between menu- and toolbaritems (ticket #771)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.Test/3.2/ButtonItems/OpenToolStripButtonItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/ButtonItems/SeparatorToolStripButtonItem.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/NewToolStripButtonItem.cs) (1 diff)
• HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj (modified) (2 diffs)
• HeuristicLab.MainForm.Test/3.2/MenuItems/SeparatorMenuItem.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/NewFormToolStripMenuItem.cs) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IMenuSeparatorItem.cs (added)
• HeuristicLab.MainForm/3.2/Interfaces/IToolBarSeparatorItem.cs (added)
• HeuristicLab.MainForm/3.2/MenuSeparatorItemBase.cs (added)
• HeuristicLab.MainForm/3.2/ToolBarSeparatorItemBase.cs (added)

trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/OpenToolStripButtonItem.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public class OpenToolStripButtonItem : ToolBarItemBase, ITestUserInterfaceItemProvider {
+  public class OpenToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
     public override int Position {
       get { return 20; }

trunk/sources/HeuristicLab.MainForm.Test/3.2/ButtonItems/SeparatorToolStripButtonItem.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public class NewToolStripButtonItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, ITestUserInterfaceItemProvider {
+  public class SeparatorToolStripButtonItem : ToolBarSeparatorItemBase, ITestUserInterfaceItemProvider {
     public override int Position {
-      get { return 10; }
-    }
-
-    public override string Name {
-      get { return "New"; }
-    }
-
-    public override bool IsDropDownButton {
-      get { return true; }
-    }
-
-    public override System.Drawing.Image Image {
-      get { return HeuristicLab.Common.Resources.Resources.NewIcon; }
-    }
-
-    public override void Execute() {
+      get { return 15; }
     }
   }

trunk/sources/HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj

@@ -83 +83 @@
   <ItemGroup>
     <Compile Include="Actions\NewEditorAction.cs" />
+    <Compile Include="ButtonItems\SeparatorToolStripButtonItem.cs" />
     <Compile Include="ButtonItems\NewEditorToolStripButtonItem.cs" />
     <Compile Include="ButtonItems\NewFormToolStripButtonItem.cs" />
@@ -107 +108 @@
       <DependentUpon>FormView.cs</DependentUpon>
     </Compile>
+    <Compile Include="MenuItems\SeparatorMenuItem.cs" />
     <Compile Include="MenuItems\ExitToolStripMenuItem.cs" />
     <Compile Include="MenuItems\NewFormToolStripMenuItem.cs" />

trunk/sources/HeuristicLab.MainForm.Test/3.2/MenuItems/SeparatorMenuItem.cs

@@ -9 +9 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public class NewFormToolStripMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, ITestUserInterfaceItemProvider {
-    public override string Name {
-      get { return "Form"; }
-    }
-
+  public class SeparatorMenuItem : MenuSeparatorItemBase, ITestUserInterfaceItemProvider {
     public override IEnumerable<string> Structure {
-      get { return "File/New".Split('/'); }
+      get { return new string[] { "File" }; }
     }
 
     public override int Position {
-      get { return 1110; }
-    
-    }
+      get { return 1120; }
 
-    public override void Execute() {
-      new NewFormAction().Execute(MainFormManager.MainForm);
     }
   }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs

@@ -207 +207 @@
 
       object[] items = ds.GetInstances(userInterfaceItemType);
-      IEnumerable<MenuItemBase> toolStripMenuItems =
+      IEnumerable<IMenuItem> toolStripMenuItems =
         from mi in items
-        where mi is MenuItemBase
-        orderby ((MenuItemBase)mi).Position
-        select (MenuItemBase)mi;
-      foreach (MenuItemBase menuItem in toolStripMenuItems)
+        where mi is IMenuItem
+        orderby ((IMenuItem)mi).Position
+        select (IMenuItem)mi;
+      foreach (IMenuItem menuItem in toolStripMenuItems)
         AddToolStripMenuItem(menuItem);
 
       items = ds.GetInstances(userInterfaceItemType);
-      IEnumerable<ToolBarItemBase> toolStripButtonItems =
+      IEnumerable<IToolBarItem> toolStripButtonItems =
         from bi in items
-        where bi is ToolBarItemBase
-        orderby ((ToolBarItemBase)bi).Position
-        select (ToolBarItemBase)bi;
-      foreach (ToolBarItemBase toolStripButtonItem in toolStripButtonItems)
+        where bi is IToolBarItem
+        orderby ((IToolBarItem)bi).Position
+        select (IToolBarItem)bi;
+      foreach (IToolBarItem toolStripButtonItem in toolStripButtonItems)
         AddToolStripButtonItem(toolStripButtonItem);
     }
 
-    private void AddToolStripMenuItem(MenuItemBase menuItem) {
-      ToolStripMenuItem item = new ToolStripMenuItem();
-      SetToolStripItemProperties(item, menuItem);
-      menuItem.ToolStripItem = item;
-      item.ShortcutKeys = menuItem.ShortCutKeys;
-      item.DisplayStyle = menuItem.ToolStripItemDisplayStyle;
-      this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), item, menuStrip.Items);
-    }
-
-    private void AddToolStripButtonItem(ToolBarItemBase buttonItem) {
-      ToolStripItem item;
-      if (buttonItem.IsDropDownButton)
-        item = new ToolStripDropDownButton();
-      else
-        item = new ToolStripButton();
-
-      SetToolStripItemProperties(item, buttonItem);
-      item.DisplayStyle = buttonItem.ToolStripItemDisplayStyle;
-      buttonItem.ToolStripItem = item;
+    private void AddToolStripMenuItem(IMenuItem menuItem) {
+      if (menuItem is MenuItemBase) {
+        ToolStripMenuItem item = new ToolStripMenuItem();
+        SetToolStripItemProperties(item, menuItem);
+        ((MenuItemBase)menuItem).ToolStripItem = item;
+        item.ShortcutKeys = ((MenuItemBase)menuItem).ShortCutKeys;
+        item.DisplayStyle = ((MenuItemBase)menuItem).ToolStripItemDisplayStyle;
+        this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), item, menuStrip.Items);
+      } else if (menuItem is MenuSeparatorItemBase) {
+        this.InsertItem(menuItem.Structure, typeof(ToolStripMenuItem), new ToolStripSeparator(), menuStrip.Items);
+      }
+     }
+
+    private void AddToolStripButtonItem(IToolBarItem buttonItem) {
+      ToolStripItem item = null;
+
+      if (buttonItem is ToolBarItemBase) {
+        if (((ToolBarItemBase)buttonItem).IsDropDownButton)
+          item = new ToolStripDropDownButton();
+        else
+          item = new ToolStripButton();
+
+        SetToolStripItemProperties(item, buttonItem);
+        item.DisplayStyle = ((ToolBarItemBase)buttonItem).ToolStripItemDisplayStyle;
+        ((ToolBarItemBase)buttonItem).ToolStripItem = item;
+      } else if (buttonItem is IToolBarSeparatorItem) 
+        item = new ToolStripSeparator();
+      
       this.InsertItem(buttonItem.Structure, typeof(ToolStripDropDownButton), item, toolStrip.Items);
     }

trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj

@@ -81 +81 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ToolBarSeparatorItemBase.cs" />
+    <Compile Include="Interfaces\IToolBarSeparatorItem.cs" />
     <Compile Include="Interfaces\IMenuItem.cs" />
+    <Compile Include="Interfaces\IMenuSeparatorItem.cs" />
     <Compile Include="Interfaces\IToolBarItem.cs" />
     <Compile Include="MainFormManager.cs" />
     <Compile Include="MenuItemBase.cs" />
+    <Compile Include="MenuSeparatorItemBase.cs" />
     <Compile Include="ToolBarItemBase.cs" />
     <Compile Include="HeuristicLabMainFormPlugin.cs" />