Changeset 2243

Timestamp:

08/05/09 19:24:49 (15 years ago)

Author:

mkommend

Message:

added HeuristicLab!.MainForm.Test project and demo implementation
adapted MainForm to new design (ticket #716)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.Test (added)
• HeuristicLab.MainForm.Test/3.2 (added)
• HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj (added)
• HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj.user (added)
• HeuristicLab.MainForm.Test/3.2/HeuristicLab.snk (copied) (copied from trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.snk)
• HeuristicLab.MainForm.Test/3.2/HeuristicLabMainFormTestApplication.cs (copied) (copied from trunk/sources/HeuristicLab.Grid/3.2/GridClientApplication.cs) (1 diff)
• HeuristicLab.MainForm.Test/3.2/HeuristicLabMainFormTestPlugin.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLabMainFormPlugin.cs) (1 diff)
• HeuristicLab.MainForm.Test/3.2/ITestUserInterfaceItemProvider.cs (added)
• HeuristicLab.MainForm.Test/3.2/OpenMenuItem.cs (added)
• HeuristicLab.MainForm.Test/3.2/Properties (added)
• HeuristicLab.MainForm.Test/3.2/Properties/AssemblyInfo.cs (added)
• HeuristicLab.MainForm.Test/3.2/Properties/AssemblyInfo.frame (added)
• HeuristicLab.MainForm.Test/3.2/Resource1.Designer.cs (added)
• HeuristicLab.MainForm.Test/3.2/Resource1.resx (added)
• HeuristicLab.MainForm.Test/3.2/Resources (added)
• HeuristicLab.MainForm.Test/3.2/Resources/openHS.png (added)
• HeuristicLab.MainForm.Test/3.2/Resources/saveHS.png (added)
• HeuristicLab.MainForm.Test/3.2/SaveMenuItem.cs (added)
• HeuristicLab.MainForm.Test/3.2/ViewsMenuItem.cs (added)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm.csproj (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/HeuristicLabMainFormPlugin.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IAction.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IToolStripButtonItem.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IToolStripItem.cs) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IToolStripItem.cs (moved) (moved from trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IUserInterfaceItem.cs) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IToolStripMenuItem.cs (moved) (moved from trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IMenuItem.cs) (1 diff)
• HeuristicLab.MainForm/3.2/MainFormBase.cs (modified) (3 diffs)
• HeuristicLab.MainForm/3.2/ToolStripButtonItemBase.cs (added)
• HeuristicLab.MainForm/3.2/ToolStripItemBase.cs (added)
• HeuristicLab.MainForm/3.2/ToolStripMenuItemBase.cs (added)
• HeuristicLab.MainForm/3.2/UserInterfaceItemBase.cs (added)
• HeuristicLab.sln (modified) (3 diffs)
• HeuristicLab/CopyAssemblies.cmd (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.Test/3.2/HeuristicLabMainFormTestApplication.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Grid {
-  [ClassInfo(Name = "Grid Client", Description="Client application for the distributed engine grid.", AutoRestart = true)]
+namespace HeuristicLab.MainForm.Test {
+  [ClassInfo(Name = "MainForm Test", Description="Test application for new mainform development.")]
   class GridClientApplication : ApplicationBase {
     public override void Run() {
-      Form mainForm = new ClientForm();
+      DockingMainForm mainForm = new DockingMainForm(typeof(ITestUserInterfaceItemProvider));
+      mainForm.Title = "Test new MAINFORM concept";
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.MainForm.Test/3.2/HeuristicLabMainFormTestPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Modeling.Database {
-  [ClassInfo(Name = "HeuristicLab.MainForm-3.2")]
-  [PluginFile(Filename = "HeuristicLab.MainForm-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "HeuristicLab.MainForm.Docking-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  public class HeuristicLabMainFormPlugin : PluginBase {
+  [ClassInfo(Name = "HeuristicLab.MainForm.Test-3.2")]
+  [PluginFile(Filename = "HeuristicLab.MainForm.Test-3.2.dll", Filetype = PluginFileType.Assembly)]  
+  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
+  public class HeuristicLabMainFormTestPlugin : PluginBase {
   }
 }

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

@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Interfaces\IUserInterfaceItem.cs" />
+    <Compile Include="ToolStripMenuItemBase.cs" />
+    <Compile Include="ToolStripButtonItemBase.cs" />
+    <Compile Include="ToolStripItemBase.cs" />
     <Compile Include="DockingMainForm.cs">
       <SubType>Form</SubType>
@@ -97 +101 @@
     <Compile Include="Interfaces\IAction.cs" />
     <Compile Include="Interfaces\IMainForm.cs" />
-    <Compile Include="Interfaces\IMenuItem.cs" />
+    <Compile Include="Interfaces\IToolStripMenuItem.cs" />
     <Compile Include="Interfaces\IModel.cs" />
+    <Compile Include="Interfaces\IToolStripButtonItem.cs" />
     <Compile Include="Interfaces\IToolStripItem.cs" />
-    <Compile Include="Interfaces\IUserInterfaceItem.cs" />
     <Compile Include="Interfaces\IView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserInterfaceItemBase.cs" />
     <Compile Include="ViewBase.cs">
       <SubType>UserControl</SubType>

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

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.MainForm-3.2")]
   [PluginFile(Filename = "HeuristicLab.MainForm-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "HeuristicLab.MainForm.Docking-3.2.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   public class HeuristicLabMainFormPlugin : PluginBase {

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

@@ -28 +28 @@
   public interface IAction {
     void Execute(IMainForm mainform);
-    bool Enabled(IMainForm mainform);
   }
 }

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

@@ -32 +32 @@
     Icon Icon { get; set; } 
 
-    IModel Model { get; }
     IView ActiveView { get; }
     IEnumerable<IView> OpenViews { get; }
 
     Type UserInterfaceItemType { get; }
-
     void ShowView(IView view);
   }

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

@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm {
-  public interface IToolStripItem {
+  public interface IToolStripButtonItem : IToolStripItem {
   }
 }

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

@@ -25 +25 @@
 using System.Text;
 using System.Drawing;
+using System.Windows.Forms;
 
-namespace HeuristicLab.MainForm.Interfaces {
-  public interface IUserInterfaceItem : IAction {
-    string Name { get; }
+namespace HeuristicLab.MainForm {
+  public interface IToolStripItem : IUserInterfaceItem {
     Image Image { get; }
-    string ImagePath { get; }
+    ToolStripItemDisplayStyle DisplayStyle { get; }
+    ToolStripItem ToolStripItem { get; set; }
   }
 }

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

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using System.Windows.Forms;
 
 namespace HeuristicLab.MainForm {
-  public interface IMenuItem {
+  public interface IToolStripMenuItem : IToolStripItem {
+    string MenuStructure { get; }
+    char MenuStructureSeparator { get; }
+    Keys ShortCutKeys { get; }
   }
 }

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

@@ -29 +29 @@
 using System.Windows.Forms;
 
+using HeuristicLab.PluginInfrastructure;
+
 namespace HeuristicLab.MainForm {
-  public partial class MainFormBase : Form, IMainForm {
-    public MainFormBase()
+  public abstract partial class MainFormBase : Form, IMainForm {
+    protected MainFormBase(Type userInterfaceItemType)
       : base() {
       InitializeComponent();
       openViews = new List<IView>();
-    }
-
-    public MainFormBase(Type userInterfaceItemType)
-      : this() {
       this.userInterfaceItemType = userInterfaceItemType;
+      CreateGUI();
     }
 
     #region IMainForm Members
     public string Title {
-      get { return this.Title; }
-      set { this.Title = value; }
+      get { return this.Text; }
+      set { this.Text = value; }
     }
 
@@ -56 +55 @@
     public Type UserInterfaceItemType {
       get { return this.userInterfaceItemType; }
-    }
-
-    protected IModel model;
-    public IModel Model {
-      get { return this.model; }
-      set { this.model = value; }
     }
 
@@ -79 +72 @@
       openViews.Add(view);
     }
+    #endregion
 
+    #region create menu and toolbar
+    private void CreateGUI() {
+      DiscoveryService ds = new DiscoveryService();
+      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);
+        }
+      }
+
+      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);
+        }
+      }
+    }
+
+    private void AddToolStripMenuItem(IToolStripMenuItem menuItem) {
+      ToolStripMenuItem item = new ToolStripMenuItem();
+      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;
+        }
+      }
+
+      if (parent == null)
+        menuStrip.Items.Add(item);
+      else
+        parent.DropDownItems.Add(item);
+    }
+
+    private void AddToolStripButtonItem(IToolStripButtonItem buttonItem) {
+      ToolStripButton item = new ToolStripButton();
+      SetToolStripItemProperties(item, buttonItem);
+      toolStrip.Items.Add(item);
+    }
+
+    private void SetToolStripItemProperties(ToolStripItem toolStripItem, IToolStripItem iToolStripItem) {
+      toolStripItem.Text = iToolStripItem.Name;
+      toolStripItem.Name = iToolStripItem.Name;
+      toolStripItem.Tag = iToolStripItem;
+      toolStripItem.Image = iToolStripItem.Image;
+      toolStripItem.DisplayStyle = iToolStripItem.DisplayStyle;
+      toolStripItem.Click += new EventHandler(ToolStripItemClicked);
+      iToolStripItem.ToolStripItem = toolStripItem;
+    }
+
+    private void ToolStripItemClicked(object sender, EventArgs e) {
+      System.Windows.Forms.ToolStripItem item = (System.Windows.Forms.ToolStripItem)sender;
+      ((IAction)item.Tag).Execute(this);
+    }
     #endregion
   }

trunk/sources/HeuristicLab.sln

@@ -243 +243 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm", "HeuristicLab.MainForm\3.2\HeuristicLab.MainForm.csproj", "{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.Test-3.2", "HeuristicLab.MainForm.Test\3.2\HeuristicLab.MainForm.Test-3.2.csproj", "{569E430B-B4CE-4B94-A44E-6246B6E4E3BC}"
 EndProject
 Global
@@ -3906 +3908 @@
     {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
     {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.CEDMA Debug|x64.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.ActiveCfg = Debug|x86
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.Build.0 = Debug|x86
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Modeling Debug|x64.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Modeling Debug|x86.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|Any CPU.Build.0 = Release|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x64.ActiveCfg = Release|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.ActiveCfg = Release|x86
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.Build.0 = Release|x86
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.v3.2 Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.v3.2 Debug|Any CPU.Build.0 = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.v3.2 Debug|x64.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.v3.2 Debug|x86.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -3996 +4024 @@
     {45D11FBD-A71B-48D3-8A94-8EB0DFE8E06A} = {410732DB-725A-4824-896B-C298978343C0}
     {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {410732DB-725A-4824-896B-C298978343C0}
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC} = {410732DB-725A-4824-896B-C298978343C0}
     {A9E282EA-180F-4233-B809-AEDF0787545C} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B}
     {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B}

trunk/sources/HeuristicLab/CopyAssemblies.cmd

@@ -71 +71 @@
 copy "%SolutionDir%\HeuristicLab.Logging\3.2\%Outdir%\HeuristicLab.Logging-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Logging\3.3\%Outdir%\HeuristicLab.Logging-3.3.dll" .\plugins
+copy "%SolutionDir%\HeuristicLab.MainForm\3.2\%Outdir%\HeuristicLab.MainForm-3.2.dll" .\plugins
+copy "%SolutionDir%\HeuristicLab.MainForm.Test\3.2\%Outdir%\HeuristicLab.MainForm.Test-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Modeling\3.2\%Outdir%\HeuristicLab.Modeling-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Modeling\3.3\%Outdir%\HeuristicLab.Modeling-3.3.dll" .\plugins