Changeset 2247 for trunk/sources/HeuristicLab.MainForm

Timestamp:

08/06/09 12:32:27 (16 years ago)

Author:

mkommend

Message:

adapted HeuristicLab.MainForm.Test to use HL.Common.Resources (ticket #716)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• Interfaces/IToolStripItem.cs (modified) (1 diff)
• MainFormBase.cs (modified) (1 diff)
• ToolStripItemBase.cs (modified) (1 diff)
• ToolStripMenuItemBase.cs (modified) (1 diff)

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

@@ -29 +29 @@
 namespace HeuristicLab.MainForm {
   public interface IToolStripItem : IUserInterfaceItem {
+    int Position { get; }
     Image Image { get; }
     ToolStripItemDisplayStyle DisplayStyle { get; }

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

@@ -79 +79 @@
       Type[] userInterfaceTypes = ds.GetTypes(userInterfaceItemType);
 
-      foreach (Type t in userInterfaceTypes.Where(t=> typeof(IToolStripMenuItem).IsAssignableFrom(t))) {
-        if (!t.IsAbstract && !t.IsInterface && !t.HasElementType) {
-          IToolStripMenuItem item = (IToolStripMenuItem) Activator.CreateInstance(t);
-          AddToolStripMenuItem(item);
-        }
+      object[] items = ds.GetInstances(userInterfaceItemType);
+      IEnumerable<IToolStripItem> toolStripItems = items.Where(mi => mi as IToolStripMenuItem != null).Cast<IToolStripItem>();
+      toolStripItems = toolStripItems.OrderBy(x => x.Position);
+      foreach (IToolStripMenuItem menuItem in toolStripItems) {
+        AddToolStripMenuItem(menuItem);
       }
 
-      foreach (Type t in userInterfaceTypes.Where(t => typeof(IToolStripButtonItem).IsAssignableFrom(t))) {
-        if (!t.IsAbstract && !t.IsInterface && !t.HasElementType) {
-          IToolStripButtonItem item = (IToolStripButtonItem)Activator.CreateInstance(t);
-          AddToolStripButtonItem(item);
-        }
+      items = ds.GetInstances(userInterfaceItemType);
+      toolStripItems = items.Where(mi => mi as IToolStripButtonItem != null).Cast<IToolStripItem>();
+      toolStripItems = toolStripItems.OrderBy(x => x.Position);
+      foreach (IToolStripButtonItem toolStripButtonItem in toolStripItems) {
+        AddToolStripButtonItem(toolStripButtonItem);
       }
     }

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

@@ -32 +32 @@
   public abstract class ToolStripItemBase : UserInterfaceItemBase, IToolStripItem {
     #region IToolStripItem Members
+    public abstract int Position { get; }
+    public virtual ToolStripItemDisplayStyle DisplayStyle {
+      get { return ToolStripItemDisplayStyle.ImageAndText; }
+    }
+
     public virtual System.Drawing.Image Image {
       get { return null; }
-    }
-
-    public virtual ToolStripItemDisplayStyle DisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
 

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

@@ -28 +28 @@
 namespace HeuristicLab.MainForm {
   public abstract class ToolStripMenuItemBase : ToolStripItemBase, IToolStripMenuItem {
-    public virtual Keys ShortCutKeys { 
-      get { return Keys.None; } 
+    public virtual Keys ShortCutKeys {
+      get { return Keys.None; }
     }
     public virtual string MenuStructure {
       get { return string.Empty; }
+    }
+
+    public override ToolStripItemDisplayStyle DisplayStyle {
+      get { return ToolStripItemDisplayStyle.ImageAndText; }
     }