Changeset 3759

Timestamp:

05/11/10 05:01:42 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/ConvertIntoUserDefinedAlgorithmMenuItem.cs (added)
• HeuristicLab.Optimizer/3.3/MenuItems/CopyToClipboardMenuItem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.engineLabel = new System.Windows.Forms.Label();
-      this.createUserDefinedAlgorithmButton = new System.Windows.Forms.Button();
       this.engineComboBox = new System.Windows.Forms.ComboBox();
       this.engineTabPage = new System.Windows.Forms.TabPage();
@@ -119 +118 @@
       // 
       this.executionTimeLabel.Location = new System.Drawing.Point(487, 532);
-      this.executionTimeLabel.TabIndex = 10;
+      this.executionTimeLabel.TabIndex = 9;
       // 
       // executionTimeTextBox
       // 
       this.executionTimeTextBox.Location = new System.Drawing.Point(576, 529);
-      this.executionTimeTextBox.TabIndex = 11;
+      this.executionTimeTextBox.TabIndex = 10;
       // 
       // resultsTabPage
@@ -169 +168 @@
       this.engineLabel.TabIndex = 0;
       this.engineLabel.Text = "&Engine:";
-      // 
-      // createUserDefinedAlgorithmButton
-      // 
-      this.createUserDefinedAlgorithmButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.createUserDefinedAlgorithmButton.Location = new System.Drawing.Point(150, 525);
-      this.createUserDefinedAlgorithmButton.Name = "createUserDefinedAlgorithmButton";
-      this.createUserDefinedAlgorithmButton.Size = new System.Drawing.Size(254, 24);
-      this.createUserDefinedAlgorithmButton.TabIndex = 9;
-      this.createUserDefinedAlgorithmButton.Text = "&Create User Defined Algorithm";
-      this.toolTip.SetToolTip(this.createUserDefinedAlgorithmButton, "Create User Defined Algorithm from this Algorithm");
-      this.createUserDefinedAlgorithmButton.UseVisualStyleBackColor = true;
-      this.createUserDefinedAlgorithmButton.Click += new System.EventHandler(this.createUserDefinedAlgorithmButton_Click);
       // 
       // engineComboBox
@@ -273 +260 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.createUserDefinedAlgorithmButton);
       this.Name = "EngineAlgorithmView";
       this.Size = new System.Drawing.Size(713, 549);
       this.Controls.SetChildIndex(this.stopButton, 0);
-      this.Controls.SetChildIndex(this.createUserDefinedAlgorithmButton, 0);
       this.Controls.SetChildIndex(this.resetButton, 0);
       this.Controls.SetChildIndex(this.pauseButton, 0);
@@ -306 +291 @@
 
     protected System.Windows.Forms.Label engineLabel;
-    protected System.Windows.Forms.Button createUserDefinedAlgorithmButton;
     protected System.Windows.Forms.ComboBox engineComboBox;
     protected System.Windows.Forms.TabPage engineTabPage;

trunk/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs

@@ -108 +108 @@
       operatorGraphViewHost.ReadOnly = true;
       engineComboBox.Enabled = Content != null && !ReadOnly;
-      createUserDefinedAlgorithmButton.Enabled = Content != null && !Locked;
     }
 
@@ -143 +142 @@
       }
     }
-
-    protected virtual void createUserDefinedAlgorithmButton_Click(object sender, EventArgs e) {
-      IContentView view = MainFormManager.MainForm.ShowContent(Content.CreateUserDefinedAlgorithm());
-      if (view != null) {
-        view.ReadOnly = this.ReadOnly;
-        view.Locked = this.Locked;
-      }
-    }
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

@@ -58 +58 @@
       this.globalScopeTabPage.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // createUserDefinedAlgorithmButton
-      // 
-      this.createUserDefinedAlgorithmButton.Enabled = false;
-      this.toolTip.SetToolTip(this.createUserDefinedAlgorithmButton, "Create User Defined Algorithm from this Algorithm");
-      this.createUserDefinedAlgorithmButton.Visible = false;
       // 
       // engineComboBox

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

@@ -89 +89 @@
     <Compile Include="MenuItems\ClipboardMenuItem.cs" />
     <Compile Include="MenuItems\AboutMenuItem.cs" />
+    <Compile Include="MenuItems\ConvertIntoUserDefinedAlgorithmMenuItem.cs" />
     <Compile Include="MenuItems\CopyToClipboardMenuItem.cs" />
     <Compile Include="MenuItems\StartPageMenuItem.cs" />
@@ -169 +170 @@
       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
       <Name>HeuristicLab.MainForm-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">

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

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   public class HeuristicLabOptimizerPlugin : PluginBase {
   }

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

@@ -39 +39 @@
     }
     public override int Position {
-      get { return 4100; }
+      get { return 9100; }
     }
 
@@ -45 +45 @@
       if (aboutDialog == null)
         aboutDialog = new AboutDialog();
-      aboutDialog.ShowDialog();
+      aboutDialog.ShowDialog((IWin32Window)MainFormManager.MainForm);
     }
   }

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

@@ -39 +39 @@
       get { return 2100; }
     }
+    public override string ToolTipText {
+      get { return "Copy the shown content into the HeuristicLab Optimizer clipboard"; }
+    }
 
     protected override void OnToolStripItemSet(EventArgs e) {