Changeset 3163 for trunk/sources

Timestamp:

03/22/10 05:38:01 (15 years ago)

Author:

swagner

Message:

Implemented (yet empty) start page in optimizer (#936).

Location:

trunk/sources

Files:

• HeuristicLab 3.3/MergeConfigs.cmd (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorsSidebar.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorsSidebar.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs (modified) (3 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/StartPageMenuItem.cs (added)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/Properties/Settings.Designer.cs (added)
• HeuristicLab.Optimizer/3.3/Properties/Settings.settings (added)
• HeuristicLab.Optimizer/3.3/StartPage.Designer.cs (added)
• HeuristicLab.Optimizer/3.3/StartPage.cs (added)
• HeuristicLab.Optimizer/3.3/app.config (added)

trunk/sources/HeuristicLab 3.3/MergeConfigs.cmd

@@ -1 +1 @@
 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\%Outdir%\HeuristicLab.PluginInfrastructure.dll.config" "HeuristicLab.exe.config"
+ConfigMerger "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll.config" "HeuristicLab.exe.config"

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

@@ -65 +65 @@
       this.Name = "OperatorsSidebar";
       this.Size = new System.Drawing.Size(316, 296);
-      this.Load += new System.EventHandler(this.OperatorsSidebar_Load);
       this.ResumeLayout(false);
 

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

@@ -31 +31 @@
     }
 
-    protected virtual void OperatorsSidebar_Load(object sender, EventArgs e) {
+    protected override void OnInitialized(EventArgs e) {
+      base.OnInitialized(e);
       typeSelector.Configure(typeof(IOperator), false, false);
     }
-
     protected override void OnClosing(FormClosingEventArgs e) {
       base.OnClosing(e);

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

@@ -87 +87 @@
     <None Include="HeuristicLabOptimizerPlugin.cs.frame" />
     <Compile Include="FileManager.cs" />
+    <Compile Include="MenuItems\StartPageMenuItem.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="StartPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="StartPage.Designer.cs">
+      <DependentUpon>StartPage.cs</DependentUpon>
+    </Compile>
     <Compile Include="MenuItems\CloseMenuItem.cs" />
     <Compile Include="MenuItems\CloseAllMenuItem.cs" />
@@ -123 +135 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>

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

@@ -38 +38 @@
     }
     public override int Position {
-      get { return 2100; }
+      get { return 2200; }
     }
 
@@ -46 +46 @@
 
       menuItem = ToolStripItem as ToolStripMenuItem;
-      if (menuItem != null)
+      if (menuItem != null) {
         menuItem.CheckOnClick = true;
+        menuItem.Checked = true;
+      }
     }
 
@@ -60 +62 @@
 
     public override void Execute() {
-      var view = (from v in MainFormManager.MainForm.Views
-                 where v is OperatorsSidebar
-                 select v as OperatorsSidebar).FirstOrDefault();
+      var view = MainFormManager.MainForm.Views.OfType<OperatorsSidebar>().FirstOrDefault();
       if (view.IsShown)
         view.Hide();

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

@@ -50 +50 @@
       operatorsSidebar.Dock = DockStyle.Left;
       operatorsSidebar.Show();
+      if (Properties.Settings.Default.ShowStartPage) {
+        StartPage startPage = new StartPage();
+        startPage.Show();
+      }
     }
   }