Changeset 6827 for trunk/sources/HeuristicLab.Optimizer

Timestamp:

09/25/11 21:02:58 (13 years ago)

Author:

ascheibe

Message:

#1652

• added MainForms for Single and Multiple Documents to Optimizer
• moved cursor handling code up to MainForm
• added a configuration dialog for switching between different MainForms

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• FileManager.cs (modified) (6 diffs)
• HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• HeuristicLabOptimizerPlugin.cs.frame (modified) (2 diffs)
• MainFormTypeSelectionDialog.Designer.cs (added)
• MainFormTypeSelectionDialog.cs (added)
• MainFormTypeSelectionDialog.resx (added)
• MenuItems/ChangeMainFormTypeMenuItem.cs (added)
• MenuItems/ChangeMainFormTypeSeperator.cs (added)
• MenuItems/ClipboardMenuItem.cs (modified) (1 diff)
• MenuItems/CopyToClipboardMenuItem.cs (modified) (1 diff)
• OptimizerDockingMainForm.Designer.cs (added)
• OptimizerDockingMainForm.cs (added)
• OptimizerDockingMainForm.resx (added)
• OptimizerMainForm.Designer.cs (deleted)
• OptimizerMainForm.cs (deleted)
• OptimizerMultipleDocumentMainForm.Designer.cs (added)
• OptimizerMultipleDocumentMainForm.cs (added)
• OptimizerSingleDocumentMainForm.Designer.cs (added)
• OptimizerSingleDocumentMainForm.cs (added)
• Properties/Settings.Designer.cs (modified) (2 diffs)
• Properties/Settings.settings (modified) (1 diff)
• app.config (modified) (1 diff)

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

@@ -60 +60 @@
       if (openFileDialog.ShowDialog() == DialogResult.OK) {
         foreach (string filename in openFileDialog.FileNames) {
-          ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
+          ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).SetAppStartingCursor();
           ContentManager.LoadAsync(filename, LoadingCompleted);
         }
@@ -76 +76 @@
       }
       finally {
-        ((OptimizerMainForm)MainFormManager.MainForm).ResetAppStartingCursor();
+        ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).ResetAppStartingCursor();
       }
     }
@@ -92 +92 @@
           SaveAs(view);
         else {
-          ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
+          ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).SetAppStartingCursor();
           SetEnabledStateOfContentViews(content, false);
           ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
@@ -117 +117 @@
 
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {
-          ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
+          ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).SetAppStartingCursor();
           SetEnabledStateOfContentViews(content, false);
           if (saveFileDialog.FilterIndex == 1) {
@@ -131 +131 @@
         SetEnabledStateOfContentViews(content, true);
         if (error != null) throw error;
-        MainFormManager.GetMainForm<OptimizerMainForm>().UpdateTitle();
+        MainFormManager.GetMainForm<OptimizerDockingMainForm>().UpdateTitle();
       }
       catch (Exception ex) {
@@ -137 +137 @@
       }
       finally {
-        ((OptimizerMainForm)MainFormManager.MainForm).ResetAppStartingCursor();
+        ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).ResetAppStartingCursor();
       }
     }
 
     private static void SetEnabledStateOfContentViews(IStorableContent content, bool enabled) {
-      OptimizerMainForm mainForm = MainFormManager.GetMainForm<OptimizerMainForm>();
+      OptimizerDockingMainForm mainForm = MainFormManager.GetMainForm<OptimizerDockingMainForm>();
       if (mainForm.InvokeRequired)
         mainForm.Invoke((Action<IStorableContent, bool>)SetEnabledStateOfContentViews, content, enabled);

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

@@ -117 +117 @@
     <EmbeddedResource Include="Documents\VNS_TSP.hl" />
     <EmbeddedResource Include="Documents\PSO_Schwefel.hl" />
+    <EmbeddedResource Include="MainFormTypeSelectionDialog.resx">
+      <DependentUpon>MainFormTypeSelectionDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="OptimizerDockingMainForm.resx">
+      <DependentUpon>OptimizerDockingMainForm.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="HeuristicLabOptimizerPlugin.cs.frame" />
+    <Compile Include="OptimizerSingleDocumentMainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OptimizerSingleDocumentMainForm.Designer.cs">
+      <DependentUpon>OptimizerSingleDocumentMainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainFormTypeSelectionDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainFormTypeSelectionDialog.Designer.cs">
+      <DependentUpon>MainFormTypeSelectionDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MenuItems\ChangeMainFormTypeMenuItem.cs" />
+    <Compile Include="MenuItems\ChangeMainFormTypeSeperator.cs" />
+    <Compile Include="OptimizerMultipleDocumentMainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OptimizerMultipleDocumentMainForm.Designer.cs">
+      <DependentUpon>OptimizerMultipleDocumentMainForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="CreateExperimentDialog.cs">
       <SubType>Form</SubType>
@@ -160 +186 @@
       <DependentUpon>NewItemDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="OptimizerMainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="OptimizerMainForm.Designer.cs">
-      <DependentUpon>OptimizerMainForm.cs</DependentUpon>
+    <Compile Include="OptimizerDockingMainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OptimizerDockingMainForm.Designer.cs">
+      <DependentUpon>OptimizerDockingMainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -21 +21 @@
 
 using System.Windows.Forms;
+using HeuristicLab.Optimizer.Properties;
 using HeuristicLab.PluginInfrastructure;
 
@@ -42 +43 @@
   internal class HeuristicLabOptimizerApplication : ApplicationBase {
     public override void Run() {
-      OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
-      mainForm.ShowContentInViewHost = true;
-      Application.Run(mainForm);
+     HeuristicLab.MainForm.WindowsForms.MainForm mainForm = null;
+
+      if (Settings.Default.MainFormType == OptimizerMainFormTypes.DockingMainForm) {
+        mainForm = new OptimizerDockingMainForm(typeof(IOptimizerUserInterfaceItemProvider));
+      } else if (Settings.Default.MainFormType == OptimizerMainFormTypes.MultipleDocumentMainForm) {
+        mainForm = new OptimizerMultipleDocumentMainForm(typeof(IOptimizerUserInterfaceItemProvider));
+      } else if (Settings.Default.MainFormType == OptimizerMainFormTypes.SingleDocumentMainForm) {
+        mainForm = new OptimizerSingleDocumentMainForm(typeof(IOptimizerUserInterfaceItemProvider));
+      }
+
+      if (mainForm != null) {
+        mainForm.ShowContentInViewHost = true;
+        Application.Run(mainForm);
+      } else {
+        MessageBox.Show("Error loading setting for the MainForm Type. Please check your configuration file!", "HeuristicLab", MessageBoxButtons.OK, MessageBoxIcon.Error);
+      }
     }
   }

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

@@ -68 +68 @@
 
     public override void Execute() {
-      IView clipboard = ((OptimizerMainForm)MainFormManager.MainForm).Clipboard;
-      if (clipboard.IsShown) {
-        clipboard.Hide();
-      } else {
-        clipboard.Show();
+      IView clipboard = null;
+      if (MainFormManager.MainForm is OptimizerDockingMainForm) {
+        clipboard = ((OptimizerDockingMainForm)MainFormManager.MainForm).Clipboard;
+      } else if (MainFormManager.MainForm is OptimizerMultipleDocumentMainForm) {
+        clipboard = ((OptimizerMultipleDocumentMainForm)MainFormManager.MainForm).Clipboard;
+      } else if (MainFormManager.MainForm is OptimizerSingleDocumentMainForm) {
+        clipboard = ((OptimizerSingleDocumentMainForm)MainFormManager.MainForm).Clipboard;
+      }
+
+      if (clipboard != null) {
+        if (clipboard.IsShown) {
+          clipboard.Hide();
+        } else {
+          clipboard.Show();
+        }
       }
     }

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

@@ -51 +51 @@
 
     public override void Execute() {
+      Clipboard<IItem> clipboard = null;
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
+
       if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IItem) && !activeView.Locked) {
-        Clipboard<IItem> clipboard = ((OptimizerMainForm)MainFormManager.MainForm).Clipboard;
-        IItem content = (IItem)activeView.Content;
-        clipboard.AddItem((IItem)content.Clone());
+        if (MainFormManager.MainForm is OptimizerDockingMainForm) {
+          clipboard = ((OptimizerDockingMainForm)MainFormManager.MainForm).Clipboard;
+        } else if (MainFormManager.MainForm is OptimizerMultipleDocumentMainForm) {
+          clipboard = ((OptimizerMultipleDocumentMainForm)MainFormManager.MainForm).Clipboard;
+        } else if (MainFormManager.MainForm is OptimizerSingleDocumentMainForm) {
+          clipboard = ((OptimizerSingleDocumentMainForm)MainFormManager.MainForm).Clipboard;
+        }
+
+        if (clipboard != null) {
+          IItem content = (IItem)activeView.Content;
+          clipboard.AddItem((IItem)content.Clone());
+        }
       }
     }

trunk/sources/HeuristicLab.Optimizer/3.3/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.237
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -95 +95 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("DockingMainForm")]
+        public global::HeuristicLab.Optimizer.OptimizerMainFormTypes MainFormType {
+            get {
+                return ((global::HeuristicLab.Optimizer.OptimizerMainFormTypes)(this["MainFormType"]));
+            }
+            set {
+                this["MainFormType"] = value;
+            }
+        }
     }
 }

trunk/sources/HeuristicLab.Optimizer/3.3/Properties/Settings.settings

@@ -21 +21 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="MainFormType" Type="HeuristicLab.Optimizer.OptimizerMainFormTypes" Scope="User">
+      <Value Profile="(Default)">DockingMainForm</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

trunk/sources/HeuristicLab.Optimizer/3.3/app.config

@@ -26 +26 @@
                 <value>False</value>
             </setting>
+            <setting name="MainFormType" serializeAs="String">
+                <value>DockingMainForm</value>
+            </setting>
         </HeuristicLab.Optimizer.Properties.Settings>
     </userSettings>