Changeset 2247 for trunk

Timestamp:

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

Author:

mkommend

Message:

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

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj (modified) (4 diffs)
• HeuristicLab.MainForm.Test/3.2/HeuristicLabMainFormTestPlugin.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/OpenMenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/Properties/AssemblyInfo.cs (modified) (4 diffs)
• HeuristicLab.MainForm.Test/3.2/Resource1.Designer.cs (deleted)
• HeuristicLab.MainForm.Test/3.2/Resource1.resx (deleted)
• HeuristicLab.MainForm.Test/3.2/Resources (deleted)
• HeuristicLab.MainForm.Test/3.2/SaveMenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/ViewsMenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IToolStripItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MainFormBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/ToolStripItemBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/ToolStripMenuItemBase.cs (modified) (1 diff)
• HeuristicLab.sln (modified) (5 diffs)
• HeuristicLab/CopyAssemblies.cmd (modified) (1 diff)

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

@@ -49 +49 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -67 +83 @@
   <ItemGroup>
     <Compile Include="OpenMenuItem.cs" />
-    <Compile Include="Resource1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resource1.resx</DependentUpon>
-    </Compile>
     <Compile Include="SaveMenuItem.cs" />
     <Compile Include="HeuristicLabMainFormTestApplication.cs" />
@@ -85 +96 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm.csproj">
       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
@@ -95 +110 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resource1.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\saveHS.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Properties\AssemblyInfo.frame" />
-    <None Include="Resources\openHS.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -29 +29 @@
   [PluginFile(Filename = "HeuristicLab.MainForm.Test-3.2.dll", Filetype = PluginFileType.Assembly)]  
   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
   public class HeuristicLabMainFormTestPlugin : PluginBase {
   }

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
-
+using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.MainForm.Test {
-  public class OpenMenuItem : ToolStripMenuItemBase, IToolStripButtonItem, ITestUserInterfaceItemProvider {
+  public class OpenMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
+    public override string Name {
+      get { return "Open"; }
+    }   
+
     public override string MenuStructure {
       get { return "File"; }
     }
 
-    public override string Name {
-      get { return "Open"; }
+    public override int Position {
+      get { return 1100; }
     }
 
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.O; }
+    }
+
+    public override System.Drawing.Image Image {
+      get { return Resources.OpenIcon; }
     }
 

trunk/sources/HeuristicLab.MainForm.Test/3.2/Properties/AssemblyInfo.cs

@@ -1 @@
-using System.Reflection;
+#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.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -8 +29 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("HeuristicLab.MainForm.Test")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("HeuristicLab mainform  test application")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("HeuristicLab.MainForm.Test")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HeuristicLab")]
+[assembly: AssemblyCopyright("(c) 2002-2008 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -22 +43 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a80799b9-1882-4c61-bc7e-bca44b61c067")]
+[assembly: Guid("f9718239-4d37-4410-84d7-9c3468b01cbf")]
 
 // Version information for an assembly consists of the following four values:
@@ -31 +52 @@
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyBuildDate("2009/08/04 18:20:50")]
-
+[assembly: AssemblyVersion("3.2.0.2243")]
+[assembly: AssemblyFileVersion("3.2.0.2243")]
+[assembly: AssemblyBuildDate("2009/08/06 12:20:28")]

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Windows.Forms;
 
 using HeuristicLab.MainForm;
-using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.MainForm.Test {
   public class SaveMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
-    public override string MenuStructure {
-      get { return "TEST/Test/Test/Test"; }
+    public override string Name {
+      get { return "Save"; }
     }
 
-    public override string Name {
-      get { return "Save"; }
+    public override string MenuStructure {
+      get { return "File"; }
+    }
+
+    public override int Position {
+      get { return 1200; }
+    }
+
+    public override Keys ShortCutKeys {
+      get { return Keys.Control | Keys.S; }
+    }
+
+    public override System.Drawing.Image Image {
+      get { return Resources.SaveIcon; }
     }
 

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

@@ -8 +8 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public class ViewsMenuItem : ToolStripMenuItemBase, IToolStripButtonItem, ITestUserInterfaceItemProvider {
-    public override string MenuStructure {
-      get { return "File"; }
-    }
-
+  public class ViewsMenuItem : ToolStripMenuItemBase, ITestUserInterfaceItemProvider {
     public override string Name {
       get { return "Views"; }
     }
 
+    public override int Position {
+      get { return 2000; }
+    }
+
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.V; }
-    }
-
-    public override System.Drawing.Image Image {
-      get { return Resource1.openHS; }
     }
 

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; }
     }
 

trunk/sources/HeuristicLab.sln

@@ -245 +245 @@
 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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Common.Resources", "HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources.csproj", "{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}"
 EndProject
 Global
@@ -3914 +3916 @@
     {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|x64.ActiveCfg = Debug|x64
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x64.Build.0 = Debug|x64
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.ActiveCfg = Debug|x86
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.Build.0 = Debug|x86
@@ -3923 +3926 @@
     {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|x64.ActiveCfg = Release|x64
+    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x64.Build.0 = Release|x64
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.ActiveCfg = Release|x86
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.Build.0 = Release|x86
@@ -3934 +3938 @@
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.CEDMA Debug|x64.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Debug|x64.ActiveCfg = Debug|x64
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Debug|x64.Build.0 = Debug|x64
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Debug|x86.ActiveCfg = Debug|x86
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Debug|x86.Build.0 = Debug|x86
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Modeling Debug|x64.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Modeling Debug|x86.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x64.ActiveCfg = Release|x64
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x64.Build.0 = Release|x64
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x86.ActiveCfg = Release|x86
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x86.Build.0 = Release|x86
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.v3.2 Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.v3.2 Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.v3.2 Debug|x64.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.v3.2 Debug|x86.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -4025 +4057 @@
     {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {410732DB-725A-4824-896B-C298978343C0}
     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC} = {410732DB-725A-4824-896B-C298978343C0}
+    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {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

@@ -20 +20 @@
 copy "%SolutionDir%\HeuristicLab.Charting.Data\3.2\%Outdir%\HeuristicLab.Charting.Data-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Charting.Data\3.3\%Outdir%\HeuristicLab.Charting.Data-3.3.dll" .\plugins
+copy "%SolutionDir%\HeuristicLab.Common.Resources\3.2\%Outdir%\HeuristicLab.Common.Resources-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Communication.Data\3.2\%Outdir%\HeuristicLab.Communication.Data-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Communication.Operators\3.2\%Outdir%\HeuristicLab.Communication.Operators-3.2.dll" .\plugins