Changeset 2249 for trunk/sources/HeuristicLab.MainForm

Timestamp:

08/06/09 13:57:51 (15 years ago)

Author:

mkommend

Message:

adapted MainForm to create DropDownButtons (ticket #716)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• Interfaces/IToolStripButtonItem.cs (modified) (1 diff)
• Interfaces/IToolStripItem.cs (modified) (1 diff)
• Interfaces/IToolStripMenuItem.cs (modified) (1 diff)
• MainFormBase.cs (modified) (3 diffs)
• ToolStripButtonItemBase.cs (modified) (2 diffs)
• ToolStripItemBase.cs (modified) (1 diff)
• ToolStripMenuItemBase.cs (modified) (1 diff)
• UserInterfaceItemBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IToolStripButtonItem.cs

@@ -27 +27 @@
 namespace HeuristicLab.MainForm {
   public interface IToolStripButtonItem : IToolStripItem {
+    bool IsDropDownButton { get; }
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IToolStripItem.cs

@@ -32 +32 @@
     Image Image { get; }
     ToolStripItemDisplayStyle DisplayStyle { get; }
+
+    string Structure { get; }
+    char StructureSeparator { get; }
+
     ToolStripItem ToolStripItem { get; set; }
   }

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IToolStripMenuItem.cs

@@ -28 +28 @@
 namespace HeuristicLab.MainForm {
   public interface IToolStripMenuItem : IToolStripItem {
-    string MenuStructure { get; }
-    char MenuStructureSeparator { get; }
     Keys ShortCutKeys { get; }
   }

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

@@ -77 +77 @@
     private void CreateGUI() {
       DiscoveryService ds = new DiscoveryService();
-      Type[] userInterfaceTypes = ds.GetTypes(userInterfaceItemType);
 
       object[] items = ds.GetInstances(userInterfaceItemType);
@@ -96 +95 @@
     private void AddToolStripMenuItem(IToolStripMenuItem menuItem) {
       ToolStripMenuItem item = new ToolStripMenuItem();
-      SetToolStripItemProperties(item, menuItem);    
+      SetToolStripItemProperties(item, menuItem);
       item.ShortcutKeys = menuItem.ShortCutKeys;
 
-      ToolStripMenuItem parent = null;
-      if (!String.IsNullOrEmpty(menuItem.MenuStructure)) {
-        ToolStripItemCollection parentItems = menuStrip.Items;
-        foreach (string structure in menuItem.MenuStructure.Split(menuItem.MenuStructureSeparator)) {
-          if (parentItems.ContainsKey(structure))
-            parent = (ToolStripMenuItem)parentItems[structure];
-          else {
-            parent = new ToolStripMenuItem(structure);
-            parent.Name = structure;
-            parentItems.Add(parent);
-          }
-          parentItems = parent.DropDownItems;
-        }
-      }
-
+      ToolStripDropDownItem parent = FindParent(menuItem, menuStrip.Items);
       if (parent == null)
         menuStrip.Items.Add(item);
@@ -121 +106 @@
 
     private void AddToolStripButtonItem(IToolStripButtonItem buttonItem) {
-      ToolStripButton item = new ToolStripButton();
+      ToolStripItem item;
+      if (buttonItem.IsDropDownButton)
+        item = new ToolStripDropDownButton();
+      else
+        item = new ToolStripButton();
+
       SetToolStripItemProperties(item, buttonItem);
-      toolStrip.Items.Add(item);
+      ToolStripDropDownItem parent = FindParent(buttonItem,toolStrip.Items);
+      if (parent == null)
+        toolStrip.Items.Add(item);
+      else
+        parent.DropDownItems.Add(item);
+    }
+
+    private ToolStripDropDownItem FindParent(IToolStripItem item, ToolStripItemCollection parentItems) {
+      ToolStripDropDownItem parent = null;
+      foreach (string structure in item.Structure.Split(item.StructureSeparator)) {
+        if (parentItems.ContainsKey(structure))
+          parent = (ToolStripDropDownItem)parentItems[structure];
+        else
+          break;
+        parentItems = parent.DropDownItems;
+      }
+      return parent;
     }
 

trunk/sources/HeuristicLab.MainForm/3.2/ToolStripButtonItemBase.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.MainForm {
-  public abstract class ToolStripButtonItemBase : ToolStripItemBase, IToolStripItem {
+  public abstract class ToolStripButtonItemBase : ToolStripItemBase, IToolStripButtonItem {
     public override ToolStripItemDisplayStyle DisplayStyle {
       get {
@@ -36 +36 @@
       }
     }
+
+    public virtual bool IsDropDownButton {
+      get { return false; }
+    }
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/ToolStripItemBase.cs

@@ -46 +46 @@
       set { this.toolStripItem = value; }
     }
+
+    public virtual string Structure {
+      get { return string.Empty; }
+    }
+
+    public static readonly char structureSeparator = '/';
+    public char StructureSeparator {
+      get { return ToolStripMenuItemBase.structureSeparator; }
+    }
     #endregion
   }

trunk/sources/HeuristicLab.MainForm/3.2/ToolStripMenuItemBase.cs

@@ -31 +31 @@
       get { return Keys.None; }
     }
-    public virtual string MenuStructure {
-      get { return string.Empty; }
-    }
 
     public override ToolStripItemDisplayStyle DisplayStyle {
       get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
-
-    public static readonly char StructureSeparator = '/';
-    public char MenuStructureSeparator {
-      get { return ToolStripMenuItemBase.StructureSeparator; }
-    }
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/UserInterfaceItemBase.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;