Changeset 2546

Timestamp:

12/07/09 02:44:23 (15 years ago)

Author:

swagner

Message:

Continued work on Optimizer and on adapting all views to the new MainForm concept (#770)

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab 3.3/CopyAssemblies.cmd (modified) (1 diff)
• HeuristicLab.AdvancedOptimizationFrontend/3.3 (deleted)
• HeuristicLab.Common.Resources/3.2/HeuristicLab.Common.Resources-3.2.csproj (modified) (2 diffs)
• HeuristicLab.Common.Resources/3.2/Resources.Designer.cs (modified) (3 diffs)
• HeuristicLab.Common.Resources/3.2/Resources.resx (modified) (2 diffs)
• HeuristicLab.Common.Resources/3.2/Resources/HeuristicLab.png (added)
• HeuristicLab.Common.Resources/3.2/Resources/ShowDetails.png (added)
• HeuristicLab.Common.Resources/3.2/Resources/ShowLargeIcons.png (added)
• HeuristicLab.Common.Resources/3.2/Resources/ShowSmallIcons.png (added)
• HeuristicLab.Core.Views/3.3/EditorBase.Designer.cs (deleted)
• HeuristicLab.Core.Views/3.3/EditorBase.cs (deleted)
• HeuristicLab.Core.Views/3.3/EditorBase.resx (deleted)
• HeuristicLab.Core.Views/3.3/EngineBaseView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.Designer.cs) (1 diff)
• HeuristicLab.Core.Views/3.3/EngineBaseView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.cs) (2 diffs)
• HeuristicLab.Core.Views/3.3/EngineBaseView.resx (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.resx)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (6 diffs)
• HeuristicLab.Core.Views/3.3/IEditor.cs (deleted)
• HeuristicLab.Core.Views/3.3/IItemView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/IView.cs) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemBaseView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemViewBase.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ViewBase.Designer.cs) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemViewBase.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ViewBase.cs) (3 diffs)
• HeuristicLab.Core.Views/3.3/OperatorBaseDescriptionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorBaseVariableInfosView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorBaseVariablesView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorBaseView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorGraphView.cs (modified) (5 diffs)
• HeuristicLab.Core.Views/3.3/OperatorLibraryView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.Designer.cs) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorLibraryView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.cs) (6 diffs)
• HeuristicLab.Core.Views/3.3/OperatorLibraryView.resx (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.resx)
• HeuristicLab.Core.Views/3.3/ScopeView.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/VariableInfoView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/VariableView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/VariablesScopeView.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Attributes (added)
• HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs (added)
• HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs (added)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Core/3.3/HeuristicLabCorePlugin.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IEditable.cs (deleted)
• HeuristicLab.Core/3.3/Interfaces/IItem.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/ItemBase.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/OperatorLibrary.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/PersistenceManager.cs (modified) (2 diffs)
• HeuristicLab.Data/3.3/ArrayDataBaseView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/BoolDataView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/DoubleDataView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/IntDataView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/ItemDictionaryView_T.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/ItemListView_T.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/MatrixDataBaseView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/StringDataView.cs (modified) (1 diff)
• HeuristicLab.Logging/3.3/LinechartView.cs (modified) (1 diff)
• HeuristicLab.Logging/3.3/LogView.cs (modified) (1 diff)
• HeuristicLab.Logging/3.3/PointXYChartView.cs (modified) (1 diff)
• HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/CombinedOperatorView.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/Actions (deleted)
• HeuristicLab.Optimizer/3.3/FileManager.cs (added)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/ExitMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/NewMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/OpenMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/Separators.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/NewItemDialog.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Optimizer/3.3/NewDialog.Designer.cs) (6 diffs)
• HeuristicLab.Optimizer/3.3/NewItemDialog.cs (moved) (moved from trunk/sources/HeuristicLab.Optimizer/3.3/NewDialog.cs) (1 diff)
• HeuristicLab.Optimizer/3.3/NewItemDialog.resx (moved) (moved from trunk/sources/HeuristicLab.Optimizer/3.3/NewDialog.resx) (1 diff)
• HeuristicLab.Optimizer/3.3/Properties/Resources.Designer.cs (added)
• HeuristicLab.Optimizer/3.3/Properties/Resources.resx (added)
• HeuristicLab.Optimizer/3.3/ToolBarItems/NewToolBarItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/ToolBarItems/OpenToolBarItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/TSPInjectorView.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/TSPTourView.cs (modified) (1 diff)
• HeuristicLab.SGA/3.3/HeuristicLab.SGA-3.3.csproj (modified) (2 diffs)
• HeuristicLab.SGA/3.3/SGAView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.SGA/3.3/SGAEditor.Designer.cs) (1 diff)
• HeuristicLab.SGA/3.3/SGAView.cs (moved) (moved from trunk/sources/HeuristicLab.SGA/3.3/SGAEditor.cs) (5 diffs)
• HeuristicLab.SGA/3.3/SGAView.resx (moved) (moved from trunk/sources/HeuristicLab.SGA/3.3/SGAEditor.resx)
• HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngineView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngineEditor.Designer.cs) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngineView.cs (moved) (moved from trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngineEditor.cs) (3 diffs)
• HeuristicLab.TestFunctions/3.3/TestFunctionInjectorView.cs (modified) (1 diff)
• HeuristicLab.ThreadParallelEngine/3.3/HeuristicLab.ThreadParallelEngine-3.3.csproj (modified) (1 diff)
• HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngine.cs (modified) (1 diff)
• HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineEditor.Designer.cs) (1 diff)
• HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineView.cs (moved) (moved from trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineEditor.cs) (3 diffs)

trunk/sources/HeuristicLab 3.3.sln

@@ -38 +38 @@
     {EE2034D9-6E27-48A1-B855-42D45F69A4FC} = {EE2034D9-6E27-48A1-B855-42D45F69A4FC}
     {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C}
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609} = {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}
     {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}
     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
@@ -59 +58 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators-3.3", "HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj", "{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.AdvancedOptimizationFrontend-3.3", "HeuristicLab.AdvancedOptimizationFrontend\3.3\HeuristicLab.AdvancedOptimizationFrontend-3.3.csproj", "{D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SequentialEngine-3.3", "HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj", "{DC3D7072-7999-4719-B65D-3997744D5DC1}"
@@ -222 +219 @@
     {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}.Release|x86.ActiveCfg = Release|x86
     {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}.Release|x86.Build.0 = Release|x86
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Debug|x64.ActiveCfg = Debug|x64
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Debug|x64.Build.0 = Debug|x64
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Debug|x86.ActiveCfg = Debug|x86
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Debug|x86.Build.0 = Debug|x86
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Release|Any CPU.Build.0 = Release|Any CPU
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Release|x64.ActiveCfg = Release|x64
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Release|x64.Build.0 = Release|x64
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Release|x86.ActiveCfg = Release|x86
-    {D4E8C5EC-DB4A-4FF5-AE45-770A88B6D609}.Release|x86.Build.0 = Release|x86
     {DC3D7072-7999-4719-B65D-3997744D5DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {DC3D7072-7999-4719-B65D-3997744D5DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU

trunk/sources/HeuristicLab 3.3/CopyAssemblies.cmd

@@ -7 +7 @@
 mkdir plugins\backup
 
-copy "%SolutionDir%\HeuristicLab.AdvancedOptimizationFrontend\3.3\%Outdir%\HeuristicLab.AdvancedOptimizationFrontend-3.3.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Charting\3.3\%Outdir%\HeuristicLab.Charting-3.3.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Charting.Data\3.3\%Outdir%\HeuristicLab.Charting.Data-3.3.dll" .\plugins

trunk/sources/HeuristicLab.Common.Resources/3.2/HeuristicLab.Common.Resources-3.2.csproj

@@ -101 +101 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
@@ -171 +171 @@
   <ItemGroup>
     <None Include="Resources\RefreshDocument.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ShowDetails.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ShowLargeIcons.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ShowSmallIcons.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\HeuristicLab.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Common.Resources/3.2/Resources.Designer.cs

@@ -30 +30 @@
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public Resources() {
+        internal Resources() {
         }
         
@@ -124 +124 @@
         }
         
+        public static System.Drawing.Bitmap HeuristicLab {
+            get {
+                object obj = ResourceManager.GetObject("HeuristicLab", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         public static System.Drawing.Icon HeuristicLabIcon {
             get {
@@ -201 +208 @@
         }
         
+        public static System.Drawing.Bitmap ShowDetails {
+            get {
+                object obj = ResourceManager.GetObject("ShowDetails", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        public static System.Drawing.Bitmap ShowLargeIcons {
+            get {
+                object obj = ResourceManager.GetObject("ShowLargeIcons", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        public static System.Drawing.Bitmap ShowSmallIcons {
+            get {
+                object obj = ResourceManager.GetObject("ShowSmallIcons", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         public static System.Drawing.Bitmap UndoIcon {
             get {

trunk/sources/HeuristicLab.Common.Resources/3.2/Resources.resx

@@ -146 +146 @@
     <value>Resources\FunctionIcon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="HeuristicLab" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\HeuristicLab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="HeuristicLabIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\HeuristicLab.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -179 +182 @@
     <value>Resources\SaveIcon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ShowDetails" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\ShowDetails.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ShowLargeIcons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\ShowLargeIcons.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ShowSmallIcons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\ShowSmallIcons.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="UndoIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UndoIcon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Core.Views {
-  partial class EngineBaseEditor {
+  partial class EngineBaseView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(EngineBase), true)]
-  public partial class EngineBaseEditor : EditorBase {
+  public partial class EngineBaseView : ItemViewBase {
     private int executionTimeCounter;
 
@@ -51 +51 @@
     /// Initializes a new instance of <see cref="EngineBaseEditor"/>.
     /// </summary>
-    public EngineBaseEditor() {
+    public EngineBaseView() {
       InitializeComponent();
     }

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -70 +70 @@
       <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="EditorBase.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="EditorBase.Designer.cs">
-      <DependentUpon>EditorBase.cs</DependentUpon>
-    </Compile>
-    <Compile Include="EngineBaseEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="EngineBaseEditor.Designer.cs">
-      <DependentUpon>EngineBaseEditor.cs</DependentUpon>
+    <Compile Include="EngineBaseView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EngineBaseView.Designer.cs">
+      <DependentUpon>EngineBaseView.cs</DependentUpon>
     </Compile>
     <Compile Include="HeuristicLabCoreViewsPlugin.cs" />
-    <Compile Include="IEditor.cs" />
+    <Compile Include="IItemView.cs" />
     <Compile Include="ItemBaseView.cs">
       <SubType>UserControl</SubType>
@@ -90 +84 @@
       <DependentUpon>ItemBaseView.cs</DependentUpon>
     </Compile>
-    <Compile Include="IView.cs" />
+    <Compile Include="ItemViewBase.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ItemViewBase.Designer.cs">
+      <DependentUpon>ItemViewBase.cs</DependentUpon>
+    </Compile>
     <Compile Include="OperatorBaseDescriptionView.cs">
       <SubType>UserControl</SubType>
@@ -121 +120 @@
       <DependentUpon>OperatorGraphView.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperatorLibraryEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OperatorLibraryEditor.Designer.cs">
-      <DependentUpon>OperatorLibraryEditor.cs</DependentUpon>
+    <Compile Include="OperatorLibraryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OperatorLibraryView.Designer.cs">
+      <DependentUpon>OperatorLibraryView.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -151 +150 @@
     <Compile Include="VariableView.Designer.cs">
       <DependentUpon>VariableView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ViewBase.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ViewBase.Designer.cs">
-      <DependentUpon>ViewBase.cs</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -205 +198 @@
       <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="EditorBase.resx">
-      <DependentUpon>EditorBase.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EngineBaseEditor.resx">
-      <DependentUpon>EngineBaseEditor.cs</DependentUpon>
+    <EmbeddedResource Include="EngineBaseView.resx">
+      <DependentUpon>EngineBaseView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ItemBaseView.resx">
@@ -229 +219 @@
       <DependentUpon>OperatorGraphView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperatorLibraryEditor.resx">
-      <DependentUpon>OperatorLibraryEditor.cs</DependentUpon>
+    <EmbeddedResource Include="OperatorLibraryView.resx">
+      <DependentUpon>OperatorLibraryView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ScopeView.resx">

trunk/sources/HeuristicLab.Core.Views/3.3/IItemView.cs

@@ -24 +24 @@
 using System.Text;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Core.Views {
@@ -29 +30 @@
   /// An interface for all kinds visual representations of items (objects, operators...).
   /// </summary>
-  public interface IView : IControl, HeuristicLab.MainForm.IView{
+  public interface IItemView : IView {
     /// <summary>
     /// Gets the current item instance.

trunk/sources/HeuristicLab.Core.Views/3.3/ItemBaseView.cs

@@ -34 +34 @@
   /// </summary>
   [Content(typeof(ItemBase), true)]
-  public partial class ItemBaseView : ViewBase {
+  public partial class ItemBaseView : ItemViewBase {
     /// <summary>
     /// Initializes a new instance of <see cref="ItemBaseView"/>.

trunk/sources/HeuristicLab.Core.Views/3.3/ItemViewBase.Designer.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Core.Views {
-  partial class ViewBase {
+  partial class ItemViewBase {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Core.Views/3.3/ItemViewBase.cs

@@ -28 +28 @@
 using System.Xml;
 using System.Windows.Forms;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Core.Views {
@@ -33 +34 @@
   /// Base class for all visual representations.
   /// </summary>
-  public partial class ViewBase : HeuristicLab.MainForm.WindowsForms.ViewBase, IView {
+  public partial class ItemViewBase : ViewBase, IItemView {
     private IItem myItem;
     /// <summary>
@@ -73 +74 @@
     /// Initializes a new instance of <see cref="ViewBase"/> with the caption "View".
     /// </summary>
-    public ViewBase() {
+    public ItemViewBase() {
       InitializeComponent();
       Caption = "View";

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseDescriptionView.cs

@@ -32 +32 @@
   /// The visual representation of the description of operators.
   /// </summary>
-  public partial class OperatorBaseDescriptionView : ViewBase {
+  public partial class OperatorBaseDescriptionView : ItemViewBase {
     /// <summary>
     /// Gets or sets the operator whose description should be displayed.

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseVariableInfosView.cs

@@ -34 +34 @@
   /// The visual representation of the information of the variables of an operator.
   /// </summary>
-  public partial class OperatorBaseVariableInfosView : ViewBase {
+  public partial class OperatorBaseVariableInfosView : ItemViewBase {
     /// <summary>
     /// Gets or sets the operator whose variable infos should be represented visually.

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseVariablesView.cs

@@ -34 +34 @@
   /// The visual representation of the variables of an operator.
   /// </summary>
-  public partial class OperatorBaseVariablesView : ViewBase {
+  public partial class OperatorBaseVariablesView : ItemViewBase {
     private ChooseItemDialog chooseItemDialog;
 

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseView.cs

@@ -35 +35 @@
   /// </summary>
   [Content(typeof(OperatorBase), true)]
-  public partial class OperatorBaseView : ViewBase {
+  public partial class OperatorBaseView : ItemViewBase {
     /// <summary>
     /// Gets or sets the operator to represent visually. 

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(OperatorGraph), true)]
-  public partial class OperatorGraphView : ViewBase {
+  public partial class OperatorGraphView : ItemViewBase {
     private ChooseOperatorDialog chooseOperatorDialog;
     private Dictionary<IOperator, IList<TreeNode>> operatorNodeTable;
@@ -184 +184 @@
       if (operatorsListView.SelectedItems.Count == 1) {
         IOperator op = (IOperator)operatorsListView.SelectedItems[0].Tag;
-        IView view = (IView)MainFormManager.CreateDefaultView(op);
-        if (view != null)
-          PluginManager.ControlManager.ShowControl(view);
+        IView view = MainFormManager.CreateDefaultView(op);
+        if (view != null) MainFormManager.MainForm.ShowView(view);
       }
     }
@@ -376 +375 @@
       if (operatorsListView.SelectedItems.Count == 1) {
         IOperator op = (IOperator)operatorsListView.SelectedItems[0].Tag;
-        IView view = (IView)MainFormManager.CreateDefaultView(op);
+        IView view = MainFormManager.CreateDefaultView(op);
         if (view != null) {
           viewToolStripMenuItem.Enabled = true;
@@ -388 +387 @@
     }
     private void viewToolStripMenuItem_Click(object sender, EventArgs e) {
-      IView view = (IView)((ToolStripMenuItem)sender).Tag;
-      PluginManager.ControlManager.ShowControl(view);
+      IView view = ((ToolStripMenuItem)sender).Tag as IView;
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void initialOperatorToolStripMenuItem_Click(object sender, EventArgs e) {
@@ -408 +407 @@
       if (graphTreeView.SelectedNode != null) {
         IOperator op = (IOperator)graphTreeView.SelectedNode.Tag;
-        IView view = (IView)MainFormManager.CreateDefaultView(op);
+        IView view = MainFormManager.CreateDefaultView(op);
         if (view != null) {
           viewToolStripMenuItem1.Enabled = true;

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Core.Views {
-  partial class OperatorLibraryEditor {
+  partial class OperatorLibraryView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(OperatorLibrary), true)]
-  public partial class OperatorLibraryEditor : EditorBase {
+  public partial class OperatorLibraryView : ItemViewBase {
     private ChooseOperatorDialog chooseOperatorDialog;
 
@@ -52 +52 @@
     /// <c>Operator Library</c>.
     /// </summary>
-    public OperatorLibraryEditor() {
+    public OperatorLibraryView() {
       InitializeComponent();
       operatorsTreeView.TreeViewNodeSorter = new NodeSorter();
@@ -62 +62 @@
     /// </summary>
     /// <param name="operatorLibrary">The operator library to display.</param>
-    public OperatorLibraryEditor(IOperatorLibrary operatorLibrary)
+    public OperatorLibraryView(IOperatorLibrary operatorLibrary)
       : this() {
       OperatorLibrary = operatorLibrary;
@@ -204 +204 @@
         IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
         if (op != null) {
-          IView view = (IView)MainFormManager.CreateDefaultView(op);
-          if (view != null)
-            PluginManager.ControlManager.ShowControl(view);
+          IView view = MainFormManager.CreateDefaultView(op);
+          if (view != null) MainFormManager.MainForm.ShowView(view);
         }
       }
@@ -279 +278 @@
         IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
         if (op != null) {
-          IView view = (IView)MainFormManager.CreateDefaultView(op);
+          IItemView view = (IItemView)MainFormManager.CreateDefaultView(op);
           if (view != null) {
             viewToolStripMenuItem.Enabled = true;
@@ -288 +287 @@
     }
     private void viewToolStripMenuItem_Click(object sender, EventArgs e) {
-      IView view = (IView)viewToolStripMenuItem.Tag;
-      PluginManager.ControlManager.ShowControl(view);
+      IView view = viewToolStripMenuItem.Tag as IView;
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     #endregion

trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(Scope), true)]
-  public partial class ScopeView : ViewBase {
+  public partial class ScopeView : ItemViewBase {
     private Dictionary<IScope, TreeNode> scopeNodeTable;
     private Dictionary<IScope, bool> scopeExpandedTable;
@@ -133 +133 @@
       if(scopesTreeView.SelectedNode != null && scopesTreeView.SelectedNode.Tag != null) {
         IScope scope = (IScope)scopesTreeView.SelectedNode.Tag;
-        PluginManager.ControlManager.ShowControl(new VariablesScopeView(scope));
+        MainFormManager.MainForm.ShowView(new VariablesScopeView(scope));
       }
     }
@@ -201 +201 @@
     private void variablesToolStripMenuItem_Click(object sender, EventArgs e) {
       IScope scope = (IScope)scopesTreeView.SelectedNode.Tag;
-      PluginManager.ControlManager.ShowControl(new VariablesScopeView(scope));
+      MainFormManager.MainForm.ShowView(new VariablesScopeView(scope));
     }
     private void showViewToolStripMenuItem_Click(object sender, EventArgs e) {
       IItem item = (IItem)((ToolStripMenuItem)sender).Tag;
-      PluginManager.ControlManager.ShowControl((IControl)MainFormManager.CreateDefaultView(item));
+      IView view = MainFormManager.CreateDefaultView(item);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     #endregion

trunk/sources/HeuristicLab.Core.Views/3.3/VariableInfoView.cs

@@ -34 +34 @@
   /// </summary>
   [Content(typeof(VariableInfo), true)]
-  public partial class VariableInfoView : ViewBase {
+  public partial class VariableInfoView : ItemViewBase {
     /// <summary>
     /// Gets or sets the variable information to represent visually.

trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

@@ -34 +34 @@
   /// </summary>
   [Content(typeof(Variable), true)]
-  public partial class VariableView : ViewBase {
+  public partial class VariableView : ItemViewBase {
     private ChooseItemDialog chooseItemDialog;
 

trunk/sources/HeuristicLab.Core.Views/3.3/VariablesScopeView.cs

@@ -35 +35 @@
   /// </summary>
   [Content(typeof(Scope))]
-  public partial class VariablesScopeView : ViewBase {
+  public partial class VariablesScopeView : ItemViewBase {
     private ChooseItemDialog chooseItemDialog;
 

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -95 +95 @@
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AtomicOperation.cs" />
+    <Compile Include="Attributes\ItemAttribute.cs" />
     <Compile Include="CompositeOperation.cs" />
     <Compile Include="Cloner.cs" />
+    <Compile Include="Attributes\CreatableAttribute.cs" />
     <Compile Include="Interfaces\ICloner.cs" />
-    <Compile Include="Interfaces\IEditable.cs" />
     <Compile Include="Interfaces\IOperation.cs" />
     <Compile Include="Interfaces\IOperatorLibrary.cs" />
@@ -136 +138 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
       <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>

trunk/sources/HeuristicLab.Core/3.3/HeuristicLabCorePlugin.cs

@@ -32 +32 @@
   [PluginFile(Filename = "HeuristicLab.Core-3.3.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.Common-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
   public class HeuristicLabCorePlugin : PluginBase {

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IItem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Drawing;
 
 namespace HeuristicLab.Core {
@@ -29 +30 @@
   /// </summary>
   public interface IItem : ICloneable {
+    string Name { get; }
+    string Description { get; }
+    Image Image { get; }
+
     /// <summary>
     /// Creates a deep clone of this item.

trunk/sources/HeuristicLab.Core/3.3/ItemBase.cs

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
+using System.Drawing;
+using System.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Core {
@@ -30 +33 @@
   /// Represents the base class for all basic item types.
   /// </summary>
+  [Item("ItemBase", "Base class for all HeuristicLab items.")]
   [EmptyStorableClass]
   public abstract class ItemBase : IItem {
+    public virtual string Name {
+      get {
+        if (ItemAttribute.GetName(this.GetType()) != null)
+          return ItemAttribute.GetName(this.GetType());
+        else
+          return this.GetType().Name;
+      }
+    }
+    public virtual string Description {
+      get {
+        if (ItemAttribute.GetDescription(this.GetType()) != null)
+          return ItemAttribute.GetDescription(this.GetType());
+        else
+          return "No description available.";
+      }
+    }
+    public virtual Image Image {
+      get { return Resources.HeuristicLab; }
+    }
+
     /// <summary>
     /// Creates a deep clone of this instance.

trunk/sources/HeuristicLab.Core/3.3/OperatorLibrary.cs

@@ -30 +30 @@
   /// Represents a library of operators consisting of one <see cref="IOperatorGroup"/>.
   /// </summary>
+  [Creatable("Libraries")]
+  [Item("Operator Library", "A library that contains multiple operators.")]
   public class OperatorLibrary : ItemBase, IOperatorLibrary {
 

trunk/sources/HeuristicLab.Core/3.3/PersistenceManager.cs

@@ -36 +36 @@
   public static class PersistenceManager {
     /// <summary>
-    /// Saves the specified <paramref name="instance"/> in the specified file through creating an 
+    /// Saves the specified <paramref name="instance"/> in th specified file through creating an 
     /// <see cref="XmlDocument"/>.
     /// </summary>
@@ -78 +78 @@
       return (IItem)XmlParser.Deserialize(stream);
     }
-
-    /// <summary>
-    /// Builds a meaningful string for the given <paramref name="type"/> with the namespace information, 
-    /// all its arguments, the assembly name...
-    /// </summary>
-    /// <param name="type">The type for which a string should be created.</param>
-    /// <returns>A string value of this type containing different additional information.</returns>
-    public static string BuildTypeString(Type type) {
-      string assembly = type.Assembly.FullName;
-      assembly = assembly.Substring(0, assembly.IndexOf(", "));
-
-      StringBuilder builder = new StringBuilder();
-      builder.Append(type.Namespace);
-      builder.Append(".");
-      builder.Append(type.Name);
-      Type[] args = type.GetGenericArguments();
-      if (args.Length > 0) {
-        builder.Append("[[");
-        builder.Append(BuildTypeString(args[0]));
-        builder.Append("]");
-        for (int i = 1; i < args.Length; i++) {
-          builder.Append(",[");
-          builder.Append(BuildTypeString(args[i]));
-          builder.Append("]");
-        }
-        builder.Append("]");
-      }
-      builder.Append(", ");
-      builder.Append(assembly);
-      return builder.ToString();
-    }
   }
 }

trunk/sources/HeuristicLab.Data/3.3/ArrayDataBaseView.cs

@@ -34 +34 @@
   /// The visual representation of the class <see cref="ArrayDataBase"/>.
   /// </summary>
-  public partial class ArrayDataBaseView : ViewBase {
+  public partial class ArrayDataBaseView : ItemViewBase {
     /// <summary>
     /// Gets or sets the instance of the array to represent.

trunk/sources/HeuristicLab.Data/3.3/BoolDataView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(BoolData), true)]
-  public partial class BoolDataView : ViewBase {
+  public partial class BoolDataView : ItemViewBase {
     /// <summary>
     /// Gets or sets the boolean value to represent visually.

trunk/sources/HeuristicLab.Data/3.3/DoubleDataView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(DoubleData), true)]
-  public partial class DoubleDataView : ViewBase {
+  public partial class DoubleDataView : ItemViewBase {
     /// <summary>
     /// Gets or sets the double value to represent visually.

trunk/sources/HeuristicLab.Data/3.3/IntDataView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(IntData), true)]
-  public partial class IntDataView : ViewBase {
+  public partial class IntDataView : ItemViewBase {
     /// <summary>
     /// Gets or set the int value to represent visually.

trunk/sources/HeuristicLab.Data/3.3/ItemDictionaryView_T.cs

@@ -18 +18 @@
   /// <typeparam name="V">The type of the values of the dictionary.</typeparam>
   [Content(typeof(ItemDictionary<IItem, IItem>), true)]
-  public partial class ItemDictionaryView<K, V> : ViewBase
+  public partial class ItemDictionaryView<K, V> : ItemViewBase
     where K : IItem
     where V : IItem {

trunk/sources/HeuristicLab.Data/3.3/ItemListView_T.cs

@@ -37 +37 @@
   /// </summary>
   /// <typeparam name="T">The type of the items in the list.</typeparam>
-  public partial class ItemListView<T> : ViewBase where T : IItem {
+  public partial class ItemListView<T> : ItemViewBase where T : IItem {
     private ChooseItemDialog chooseItemDialog;
 

trunk/sources/HeuristicLab.Data/3.3/MatrixDataBaseView.cs

@@ -34 +34 @@
   /// The basic visual representation of a two-dimensional matrix.
   /// </summary>
-  public partial class MatrixDataBaseView : ViewBase {
+  public partial class MatrixDataBaseView : ItemViewBase {
 
     /// <summary>

trunk/sources/HeuristicLab.Data/3.3/StringDataView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(StringData), true)]
-  public partial class StringDataView : ViewBase {
+  public partial class StringDataView : ItemViewBase {
     /// <summary>
     /// Gets or sets the string value to represent visually.

trunk/sources/HeuristicLab.Logging/3.3/LinechartView.cs

@@ -40 +40 @@
   /// </summary>
   [Content(typeof(Linechart), true)]
-  public partial class LinechartView : ViewBase {
+  public partial class LinechartView : ItemViewBase {
     private double maxY = double.MinValue, minY = double.MaxValue;
     private static int[] colors = new int[] {

trunk/sources/HeuristicLab.Logging/3.3/LogView.cs

@@ -38 +38 @@
   /// </summary>
   [Content(typeof(Log), true)]
-  public partial class LogView : ViewBase {
+  public partial class LogView : ItemViewBase {
     /// <summary>
     /// Gets or sets the Log item to represent visually.

trunk/sources/HeuristicLab.Logging/3.3/PointXYChartView.cs

@@ -40 +40 @@
   /// </summary>
   [Content(typeof(PointXYChart), true)]
-  public partial class PointXYChartView : ViewBase {
+  public partial class PointXYChartView : ItemViewBase {
     private static int[] colors = new int[] {
       182,182,255, 

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs

@@ -34 +34 @@
 namespace HeuristicLab.Operators.Programmable {
   [Content(typeof(ProgrammableOperator), true)]
-  public partial class ProgrammableOperatorView : ViewBase {
+  public partial class ProgrammableOperatorView : ItemViewBase {
     public ProgrammableOperator ProgrammableOperator {
       get { return (ProgrammableOperator)Item; }

trunk/sources/HeuristicLab.Operators/3.3/CombinedOperatorView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(CombinedOperator), true)]
-  public partial class CombinedOperatorView : ViewBase {
+  public partial class CombinedOperatorView : ItemViewBase {
     /// <summary>
     /// Gets or sets the combined operator to display.

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -51 +51 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Actions\SaveAsAction.cs" />
-    <Compile Include="Actions\SaveAllAction.cs" />
-    <Compile Include="Actions\SaveAction.cs" />
-    <Compile Include="Actions\OpenAction.cs" />
-    <Compile Include="Actions\NewAction.cs" />
+    <Compile Include="FileManager.cs" />
     <Compile Include="MenuItems\CloseMenuItem.cs" />
     <Compile Include="MenuItems\CloseAllMenuItem.cs" />
@@ -68 +64 @@
     <Compile Include="MenuItems\NewMenuItem.cs" />
     <Compile Include="MenuItems\Separators.cs" />
-    <Compile Include="NewDialog.cs">
+    <Compile Include="NewItemDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="NewDialog.Designer.cs">
-      <DependentUpon>NewDialog.cs</DependentUpon>
+    <Compile Include="NewItemDialog.Designer.cs">
+      <DependentUpon>NewItemDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="ToolBarItems\SaveAllToolBarItem.cs" />
     <Compile Include="ToolBarItems\SaveToolBarItem.cs" />
@@ -89 +90 @@
       <Name>HeuristicLab.Common.Resources-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
+      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
+      <Name>HeuristicLab.Core.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
+      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
+      <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
@@ -97 +106 @@
       <Name>HeuristicLab.MainForm-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
@@ -103 +116 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="NewDialog.resx">
-      <DependentUpon>NewDialog.cs</DependentUpon>
+    <EmbeddedResource Include="NewItemDialog.resx">
+      <DependentUpon>NewItemDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs

@@ -31 +31 @@
 namespace HeuristicLab.Optimizer {
   [ClassInfo(Name = "Optimizer 3.3", Description="Next generation heuristic optimization environment.")]
-  class HeuristicLabOptimizerApplication : ApplicationBase {
+  internal class HeuristicLabOptimizerApplication : ApplicationBase {
     public override void Run() {
       DockingMainForm mainForm = new DockingMainForm(typeof(IOptimizerUserInterfaceItemProvider));

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.Optimizer-3.3")]
   [PluginFile(Filename = "HeuristicLab.Optimizer-3.3.dll", Filetype = PluginFileType.Assembly)]
+  [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
   [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
+  [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class CloseAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class CloseAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Clos&e All"; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1700; }
+    }
+
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class CloseMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class CloseMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Close"; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1600; }
+    }
+
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/ExitMenuItem.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class ExitMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class ExitMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override string Name {
       get { return "E&xit"; }
     }
-
     public override int Position {
       get { return 1999; }
     }
-
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.X; }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/NewMenuItem.cs

@@ -9 +9 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class NewMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class NewMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&New..."; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1100; }
     }
-
     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
       get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
-
     public override Image Image {
       get { return Resources.NewIcon; }
     }
-
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.N; }
@@ -35 +30 @@
 
     public override void Execute() {
-      Actions.NewAction.Execute();
+      FileManager.New();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OpenMenuItem.cs

@@ -9 +9 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class OpenMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class OpenMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Open..."; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1200; }
     }
-
     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
       get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
-
     public override Image Image {
       get { return Resources.OpenIcon; }
     }
-
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.O; }
@@ -35 +30 @@
 
     public override void Execute() {
-      Actions.OpenAction.Execute();
+      FileManager.Open();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs

@@ -5 +5 @@
 using System.Windows.Forms;
 using System.Drawing;
+using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class SaveAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveAllMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Save Al&l"; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1500; }
     }
-
     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
       get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
-
     public override Image Image {
       get { return Resources.SaveAllIcon; }
     }
 
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
+    }
+
     public override void Execute() {
-      Actions.SaveAllAction.Execute();
+      FileManager.SaveAll();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs

@@ -5 +5 @@
 using System.Windows.Forms;
 using System.Drawing;
+using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class SaveAsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveAsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Save &As..."; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1400; }
     }
-
     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
       get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
-
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.Shift | Keys.S; }
     }
 
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
+    }
+
     public override void Execute() {
-      Actions.SaveAsAction.Execute();
+      FileManager.SaveAs();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs

@@ -5 +5 @@
 using System.Windows.Forms;
 using System.Drawing;
+using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class SaveMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Save"; }
     }
-
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }
     }
-
     public override int Position {
       get { return 1300; }
     }
-
     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
       get { return ToolStripItemDisplayStyle.ImageAndText; }
     }
-
     public override Image Image {
       get { return Resources.SaveIcon; }
     }
-
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.S; }
     }
 
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
+    }
+
     public override void Execute() {
-      Actions.SaveAction.Execute();
+      FileManager.Save();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/Separators.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class SeparatorMenuItem : MenuSeparatorItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SeparatorMenuItem : MenuSeparatorItemBase, IOptimizerUserInterfaceItemProvider {
     public override IEnumerable<string> Structure {
       get { return new string[] { "&File" }; }

trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.Optimizer {
-  partial class NewDialog {
+  partial class NewItemDialog {
     /// <summary>
     /// Required designer variable.
@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewItemDialog));
       this.okButton = new System.Windows.Forms.Button();
       this.cancelButton = new System.Windows.Forms.Button();
+      this.itemsListView = new System.Windows.Forms.ListView();
+      this.nameColumnHeader = new System.Windows.Forms.ColumnHeader();
+      this.descriptioncolumnHeader = new System.Windows.Forms.ColumnHeader();
+      this.itemsLabel = new System.Windows.Forms.Label();
+      this.showIconsCheckBox = new System.Windows.Forms.CheckBox();
+      this.showDetailsCheckBox = new System.Windows.Forms.CheckBox();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.SuspendLayout();
       // 
@@ -33 +42 @@
       this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
       this.okButton.Enabled = false;
-      this.okButton.Location = new System.Drawing.Point(380, 315);
+      this.okButton.Location = new System.Drawing.Point(456, 409);
       this.okButton.Name = "okButton";
       this.okButton.Size = new System.Drawing.Size(75, 23);
-      this.okButton.TabIndex = 0;
+      this.okButton.TabIndex = 2;
       this.okButton.Text = "&OK";
       this.okButton.UseVisualStyleBackColor = true;
+      this.okButton.Click += new System.EventHandler(this.okButton_Click);
       // 
       // cancelButton
@@ -44 +54 @@
       this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-      this.cancelButton.Location = new System.Drawing.Point(461, 315);
+      this.cancelButton.Location = new System.Drawing.Point(537, 409);
       this.cancelButton.Name = "cancelButton";
       this.cancelButton.Size = new System.Drawing.Size(75, 23);
-      this.cancelButton.TabIndex = 0;
+      this.cancelButton.TabIndex = 3;
       this.cancelButton.Text = "&Cancel";
       this.cancelButton.UseVisualStyleBackColor = true;
       // 
-      // NewDialog
+      // itemsListView
+      // 
+      this.itemsListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.itemsListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.nameColumnHeader,
+            this.descriptioncolumnHeader});
+      this.itemsListView.HideSelection = false;
+      this.itemsListView.Location = new System.Drawing.Point(12, 33);
+      this.itemsListView.MultiSelect = false;
+      this.itemsListView.Name = "itemsListView";
+      this.itemsListView.Size = new System.Drawing.Size(600, 370);
+      this.itemsListView.TabIndex = 1;
+      this.itemsListView.UseCompatibleStateImageBehavior = false;
+      this.itemsListView.View = System.Windows.Forms.View.SmallIcon;
+      this.itemsListView.SelectedIndexChanged += new System.EventHandler(this.itemTypesListView_SelectedIndexChanged);
+      this.itemsListView.DoubleClick += new System.EventHandler(this.itemTypesListView_DoubleClick);
+      // 
+      // nameColumnHeader
+      // 
+      this.nameColumnHeader.Text = "Name";
+      // 
+      // descriptioncolumnHeader
+      // 
+      this.descriptioncolumnHeader.Text = "Description";
+      // 
+      // itemsLabel
+      // 
+      this.itemsLabel.AutoSize = true;
+      this.itemsLabel.Location = new System.Drawing.Point(12, 9);
+      this.itemsLabel.Name = "itemsLabel";
+      this.itemsLabel.Size = new System.Drawing.Size(35, 13);
+      this.itemsLabel.TabIndex = 0;
+      this.itemsLabel.Text = "&Items:";
+      // 
+      // showIconsCheckBox
+      // 
+      this.showIconsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.showIconsCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
+      this.showIconsCheckBox.Checked = true;
+      this.showIconsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.showIconsCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("showIconsCheckBox.Image")));
+      this.showIconsCheckBox.Location = new System.Drawing.Point(558, 3);
+      this.showIconsCheckBox.Name = "showIconsCheckBox";
+      this.showIconsCheckBox.Size = new System.Drawing.Size(24, 24);
+      this.showIconsCheckBox.TabIndex = 4;
+      this.toolTip.SetToolTip(this.showIconsCheckBox, "Show Icons");
+      this.showIconsCheckBox.UseVisualStyleBackColor = true;
+      this.showIconsCheckBox.Click += new System.EventHandler(this.showIconsCheckBox_Click);
+      // 
+      // showDetailsCheckBox
+      // 
+      this.showDetailsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.showDetailsCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
+      this.showDetailsCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("showDetailsCheckBox.Image")));
+      this.showDetailsCheckBox.Location = new System.Drawing.Point(588, 3);
+      this.showDetailsCheckBox.Name = "showDetailsCheckBox";
+      this.showDetailsCheckBox.Size = new System.Drawing.Size(24, 24);
+      this.showDetailsCheckBox.TabIndex = 5;
+      this.toolTip.SetToolTip(this.showDetailsCheckBox, "Show Details");
+      this.showDetailsCheckBox.UseVisualStyleBackColor = true;
+      this.showDetailsCheckBox.Click += new System.EventHandler(this.showDetailsCheckBox_Click);
+      // 
+      // NewItemDialog
       // 
       this.AcceptButton = this.okButton;
@@ -57 +131 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.CancelButton = this.cancelButton;
-      this.ClientSize = new System.Drawing.Size(548, 350);
+      this.ClientSize = new System.Drawing.Size(624, 444);
+      this.Controls.Add(this.showDetailsCheckBox);
+      this.Controls.Add(this.showIconsCheckBox);
+      this.Controls.Add(this.itemsLabel);
+      this.Controls.Add(this.itemsListView);
       this.Controls.Add(this.cancelButton);
       this.Controls.Add(this.okButton);
-      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
       this.MaximizeBox = false;
       this.MinimizeBox = false;
-      this.Name = "NewDialog";
+      this.Name = "NewItemDialog";
+      this.ShowIcon = false;
       this.ShowInTaskbar = false;
       this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
       this.Text = "New Item";
       this.TopMost = true;
+      this.Load += new System.EventHandler(this.NewItemDialog_Load);
+      this.Shown += new System.EventHandler(this.NewItemDialog_Shown);
       this.ResumeLayout(false);
+      this.PerformLayout();
 
     }
@@ -76 +157 @@
     private System.Windows.Forms.Button okButton;
     private System.Windows.Forms.Button cancelButton;
+    private System.Windows.Forms.ListView itemsListView;
+    private System.Windows.Forms.Label itemsLabel;
+    private System.Windows.Forms.CheckBox showIconsCheckBox;
+    private System.Windows.Forms.CheckBox showDetailsCheckBox;
+    private System.Windows.Forms.ToolTip toolTip;
+    private System.Windows.Forms.ColumnHeader nameColumnHeader;
+    private System.Windows.Forms.ColumnHeader descriptioncolumnHeader;
   }
 }

trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -7 +7 @@
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Optimizer {
-  public partial class NewDialog : Form {
-    private Type newItemType;
-    public Type NewItemType {
-      get { return newItemType; }
+  internal partial class NewItemDialog : Form {
+    private bool initialized;
+    private List<IItem> items;
+
+    private IItem item;
+    public IItem Item {
+      get { return item; }
     }
 
-    public NewDialog() {
+    public NewItemDialog() {
+      initialized = false;
+      items = new List<IItem>();
+      item = null;
       InitializeComponent();
-      newItemType = null;
+    }
+
+    private void NewItemDialog_Load(object sender, EventArgs e) {
+      if (!initialized) {
+        SetListViewDisplayStyleCheckBoxes();
+
+        DiscoveryService ds = new DiscoveryService();
+        var categories = from t in ds.GetTypes(typeof(IItem))
+                         where CreatableAttribute.IsCreatable(t)
+                         orderby CreatableAttribute.GetCategory(t), ItemAttribute.GetName(t) ascending
+                         group t by CreatableAttribute.GetCategory(t) into c
+                         select c;
+
+        itemsListView.SmallImageList = new ImageList();
+        foreach (var category in categories) {
+          ListViewGroup group = new ListViewGroup(category.Key);
+          itemsListView.Groups.Add(group);
+          foreach (var creatable in category) {
+            IItem i = (IItem)Activator.CreateInstance(creatable);
+            items.Add(i);
+            ListViewItem item = new ListViewItem(new string[] { i.Name, i.Description}, group);
+            itemsListView.SmallImageList.Images.Add(i.Image);
+            item.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
+            item.Tag = i;
+            itemsListView.Items.Add(item);
+          }
+        }
+        initialized = true;
+      }
+    }
+
+    private void NewItemDialog_Shown(object sender, EventArgs e) {
+      item = null;
+    }
+
+    private void itemTypesListView_SelectedIndexChanged(object sender, EventArgs e) {
+      okButton.Enabled = itemsListView.SelectedItems.Count == 1;
+    }
+
+    private void okButton_Click(object sender, EventArgs e) {
+      if (itemsListView.SelectedItems.Count == 1) {
+        item = (IItem)((IItem)itemsListView.SelectedItems[0].Tag).Clone();
+        DialogResult = DialogResult.OK;
+        Close();
+      }
+    }
+    private void itemTypesListView_DoubleClick(object sender, EventArgs e) {
+      if (itemsListView.SelectedItems.Count == 1) {
+        item = (IItem)((IItem)itemsListView.SelectedItems[0].Tag).Clone();
+        DialogResult = DialogResult.OK;
+        Close();
+      }
+    }
+
+    private void showIconsCheckBox_Click(object sender, EventArgs e) {
+      itemsListView.View = View.SmallIcon;
+      SetListViewDisplayStyleCheckBoxes();
+    }
+    private void showDetailsCheckBox_Click(object sender, EventArgs e) {
+      itemsListView.View = View.Details;
+      SetListViewDisplayStyleCheckBoxes();
+      for (int i = 0; i < itemsListView.Columns.Count; i++)
+        itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+    }
+    private void SetListViewDisplayStyleCheckBoxes() {
+      showIconsCheckBox.Checked = itemsListView.View == View.SmallIcon;
+      showDetailsCheckBox.Checked = itemsListView.View == View.Details;
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.resx

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="showIconsCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAHdJREFUOE9j/P//
+        PwOlAGQCJZjhP5dKFlkYajFFtoP9DwwG8gDcBTDtDAwNQBMhmBiA1QCQRmINwWkAzBBCLsPrBWRvwNjo
+        LsMwAJe/sRkGcSU4BhGxgJ6gsHkB1TA0A4gJeWQ1JHgBNbEhXEYtF1CUmUCBSQkGALV/aRnqsiFZAAAA
+        AElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="showDetailsCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAF5JREFUOE9j/P//
+        PwOlAGQCJZjhP5dKFlkYajFFtoP9DwwG8gDcBdi0I4cLSB6djyRGRRcwMDQAbSKMYS7G6wViQgXDAJDt
+        aKaD/U7fMBhYFxATcMhqqJOUQYmMEgwAizNpEwxYZgUAAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/NewToolBarItem.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer {
-  public class NewToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class NewToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "New..."; }
     }
-
     public override string ToolTipText {
       get { return "New Item (Ctrl + N)"; }
     }
-
     public override int Position {
       get { return 10; }
     }
-
     public override Image Image {
       get { return Resources.NewIcon; }
@@ -28 +25 @@
 
     public override void Execute() {
-      Actions.NewAction.Execute();
+      FileManager.New();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/OpenToolBarItem.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer {
-  public class OpenToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class OpenToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Open..."; }
     }
-
     public override string ToolTipText {
       get { return "Open File (Ctrl + O)"; }
     }
-
     public override int Position {
       get { return 20; }
     }
-
     public override Image Image {
       get { return Resources.OpenIcon; }
@@ -28 +25 @@
 
     public override void Execute() {
-      Actions.OpenAction.Execute();
+      FileManager.Open();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Optimizer {
-  public class SaveAllToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveAllToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Save All"; }
     }
-
     public override string ToolTipText {
       get { return "Save All Files"; }
     }
-
     public override int Position {
       get { return 40; }
     }
-
     public override Image Image {
       get { return Resources.SaveAllIcon; }
     }
 
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
+    }
+
     public override void Execute() {
-      Actions.SaveAllAction.Execute();
+      FileManager.SaveAll();
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs

@@ -8 +8 @@
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.Optimizer {
-  public class SaveToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
+  internal class SaveToolBarItem : HeuristicLab.MainForm.WindowsForms.ToolBarItemBase, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "Save"; }
     }
-
     public override string ToolTipText {
       get { return "Save File (Ctrl + S)"; }
     }
-
     public override int Position {
       get { return 30; }
     }
-
     public override Image Image {
       get { return Resources.SaveIcon; }
     }
 
+    public override void MainFormInitialized(object sender, EventArgs e) {
+      ToolStripItem.Enabled = false;
+    }
+    public override void ActiveViewChanged(object sender, EventArgs e) {
+      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
+    }
+
     public override void Execute() {
-      Actions.SaveAction.Execute();
+      FileManager.Save();
     }
   }

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPInjectorView.cs

@@ -38 +38 @@
   /// </summary>
   [Content(typeof(TSPInjector), true)]
-  public partial class TSPInjectorView : ViewBase {
+  public partial class TSPInjectorView : ItemViewBase {
     /// <summary>
     /// Gets or set the <see cref="TSPInjector"/> to represent visually.

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTourView.cs

@@ -39 +39 @@
   /// </summary>
   [Content(typeof(TSPTour), true)]
-  public partial class TSPTourView : ViewBase {
+  public partial class TSPTourView : ItemViewBase {
     /// <summary>
     /// Gets or sets the <see cref="TSPTour"/> to represent visually.

trunk/sources/HeuristicLab.SGA/3.3/HeuristicLab.SGA-3.3.csproj

@@ -87 +87 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SGA.cs" />
-    <Compile Include="SGAEditor.cs">
+    <Compile Include="SGAView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="SGAEditor.Designer.cs">
-      <DependentUpon>SGAEditor.cs</DependentUpon>
+    <Compile Include="SGAView.Designer.cs">
+      <DependentUpon>SGAView.cs</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -157 +157 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="SGAEditor.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>SGAEditor.cs</DependentUpon>
+    <EmbeddedResource Include="SGAView.resx">
+      <DependentUpon>SGAView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

trunk/sources/HeuristicLab.SGA/3.3/SGAView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.SGA {
-  partial class SGAEditor {
+  partial class SGAView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.SGA/3.3/SGAView.cs

@@ -38 +38 @@
   /// </summary>
   [Content(typeof(SGA), true)]
-  public partial class SGAEditor : EditorBase {
+  public partial class SGAView : ItemViewBase {
     private ChooseOperatorDialog chooseOperatorDialog;
 
@@ -54 +54 @@
     /// Initializes a new instance of <see cref="SGAEditor"/>.
     /// </summary>
-    public SGAEditor() {
+    public SGAView() {
       InitializeComponent();
     }
@@ -61 +61 @@
     /// </summary>
     /// <param name="sga">The simple genetic algorithm to represent visually.</param>
-    public SGAEditor(SGA sga)
+    public SGAView(SGA sga)
       : this() {
       SGA = sga;
@@ -118 +118 @@
     #region Button Events
     private void viewProblemInitializationButton_Click(object sender, EventArgs e) {
-      HeuristicLab.Core.Views.IView view = (HeuristicLab.Core.Views.IView)MainFormManager.CreateDefaultView(SGA.ProblemInjector);
-      if (view != null)
-        PluginManager.ControlManager.ShowControl(view);
+      IView view = MainFormManager.CreateDefaultView(SGA.ProblemInjector);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void viewSolutionGenerationButton_Click(object sender, EventArgs e) {
-      HeuristicLab.Core.Views.IView view = (HeuristicLab.Core.Views.IView)MainFormManager.CreateDefaultView(SGA.SolutionGenerator);
-      if (view != null)
-        PluginManager.ControlManager.ShowControl(view);
+      IView view = MainFormManager.CreateDefaultView(SGA.SolutionGenerator);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void viewSelectionButton_Click(object sender, EventArgs e) {
-      HeuristicLab.Core.Views.IView view = (HeuristicLab.Core.Views.IView)MainFormManager.CreateDefaultView(SGA.Selector);
-      if (view != null)
-        PluginManager.ControlManager.ShowControl(view);
+      IView view = MainFormManager.CreateDefaultView(SGA.Selector);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void viewCrossoverButton_Click(object sender, EventArgs e) {
-      HeuristicLab.Core.Views.IView view = (HeuristicLab.Core.Views.IView)MainFormManager.CreateDefaultView(SGA.Crossover);
-      if (view != null)
-        PluginManager.ControlManager.ShowControl(view);
+      IView view = MainFormManager.CreateDefaultView(SGA.Crossover);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void viewMutationButton_Click(object sender, EventArgs e) {
-      HeuristicLab.Core.Views.IView view = (HeuristicLab.Core.Views.IView)MainFormManager.CreateDefaultView(SGA.Mutator);
-      if (view != null)
-        PluginManager.ControlManager.ShowControl(view);
+      IView view = MainFormManager.CreateDefaultView(SGA.Mutator);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void viewEvaluationButton_Click(object sender, EventArgs e) {
-      HeuristicLab.Core.Views.IView view = (HeuristicLab.Core.Views.IView)MainFormManager.CreateDefaultView(SGA.Evaluator);
-      if (view != null)
-        PluginManager.ControlManager.ShowControl(view);
+      IView view = MainFormManager.CreateDefaultView(SGA.Evaluator);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void setProblemInitializationButton_Click(object sender, EventArgs e) {
@@ -202 +196 @@
     private void cloneEngineButton_Click(object sender, EventArgs e) {
       IEngine clone = (IEngine)SGA.Engine.Clone();
-      IEditor editor = (IEditor)MainFormManager.CreateDefaultView(clone);
-      PluginManager.ControlManager.ShowControl(editor);
+      IView view = MainFormManager.CreateDefaultView(clone);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     #endregion

trunk/sources/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj

@@ -86 +86 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SequentialEngine.cs" />
-    <Compile Include="SequentialEngineEditor.cs">
+    <Compile Include="SequentialEngineView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="SequentialEngineEditor.Designer.cs">
-      <DependentUpon>SequentialEngineEditor.cs</DependentUpon>
+    <Compile Include="SequentialEngineView.Designer.cs">
+      <DependentUpon>SequentialEngineView.cs</DependentUpon>
     </Compile>
   </ItemGroup>

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -33 +33 @@
   /// </summary>
   [EmptyStorableClass]
-  public class SequentialEngine : EngineBase, IEditable {
+  [Creatable("Engines")]
+  [Item("Sequential Engine", "Engine for sequential execution of algorithms.")]
+  public class SequentialEngine : EngineBase {
     private IOperator currentOperator;
 

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngineView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.SequentialEngine {
-  partial class SequentialEngineEditor {
+  partial class SequentialEngineView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngineView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(SequentialEngine), true)]
-  public partial class SequentialEngineEditor : EngineBaseEditor {
+  public partial class SequentialEngineView : EngineBaseView {
     /// <summary>
     /// Gets or set the engine to represent visually.
@@ -50 +50 @@
     /// Initializes a new instance of <see cref="SequentialEngineEditor"/>.
     /// </summary>
-    public SequentialEngineEditor() {
+    public SequentialEngineView() {
       InitializeComponent();
     }
@@ -58 +58 @@
     /// </summary>
     /// <param name="sequentialEngine">The engine to display.</param>
-    public SequentialEngineEditor(SequentialEngine sequentialEngine)
+    public SequentialEngineView(SequentialEngine sequentialEngine)
       : this() {
       SequentialEngine = sequentialEngine;

trunk/sources/HeuristicLab.TestFunctions/3.3/TestFunctionInjectorView.cs

@@ -38 +38 @@
   /// </summary>
   [Content(typeof(TestFunctionInjector), true)]
-  public partial class TestFunctionInjectorView : ViewBase {
+  public partial class TestFunctionInjectorView : ItemViewBase {
     /// <summary>
     /// Gets or sets the TestFunctionInjector to represent visually.

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/HeuristicLab.ThreadParallelEngine-3.3.csproj

@@ -86 +86 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ThreadParallelEngine.cs" />
-    <Compile Include="ThreadParallelEngineEditor.cs">
+    <Compile Include="ThreadParallelEngineView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="ThreadParallelEngineEditor.Designer.cs">
-      <DependentUpon>ThreadParallelEngineEditor.cs</DependentUpon>
+    <Compile Include="ThreadParallelEngineView.Designer.cs">
+      <DependentUpon>ThreadParallelEngineView.cs</DependentUpon>
     </Compile>
   </ItemGroup>

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngine.cs

@@ -32 +32 @@
   /// Implementation of an engine being able to run in parallel with threads.
   /// </summary>
+  [Creatable("Engines")]
+  [Item("Parallel Engine", "Engine for parallel execution of algorithms using multiple threads.")]
   public class ThreadParallelEngine : EngineBase {
     #region Inner Class Task

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.ThreadParallelEngine {
-  partial class ThreadParallelEngineEditor {
+  partial class ThreadParallelEngineView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineView.cs

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(ThreadParallelEngine), true)]
-  public partial class ThreadParallelEngineEditor : EngineBaseEditor {
+  public partial class ThreadParallelEngineView : EngineBaseView {
     /// <summary>
     /// Gets or sets the ThreadParallelEngine to display.
@@ -50 +50 @@
     /// Initializes a new instance of <see cref="ThreadParallelEngineEditor"/>.
     /// </summary>
-    public ThreadParallelEngineEditor() {
+    public ThreadParallelEngineView() {
       InitializeComponent();
     }
@@ -58 +58 @@
     /// </summary>
     /// <param name="threadParallelEngine">The engine to represent visually.</param>
-    public ThreadParallelEngineEditor(ThreadParallelEngine threadParallelEngine)
+    public ThreadParallelEngineView(ThreadParallelEngine threadParallelEngine)
       : this() {
       ThreadParallelEngine = threadParallelEngine;