Changeset 3716 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

05/08/10 04:28:19 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#947)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• AlgorithmView.cs (modified) (1 diff)
• BatchRunView.cs (modified) (1 diff)
• ExperimentView.cs (modified) (1 diff)
• RunCollectionView.Designer.cs (modified) (8 diffs)
• RunCollectionView.cs (modified) (7 diffs)

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

@@ -217 +217 @@
     }
     protected virtual void resetButton_Click(object sender, EventArgs e) {
-      if (Content.Runs.Count > 0) {
-        if (MessageBox.Show(this, "Clear all runs executed so far?", "Clear All Runs?", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
-          Content.Prepare(true);
-        else
-          Content.Prepare(false);
-      } else {
-        Content.Prepare();
-      }
+      Content.Prepare(false);
     }
     protected virtual void problemPanel_DragEnterOver(object sender, DragEventArgs e) {

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

@@ -198 +198 @@
     }
     private void resetButton_Click(object sender, EventArgs e) {
-      if (Content.Runs.Count > 0) {
-        if (MessageBox.Show(this, "Clear all runs executed so far?", "Clear All Runs?", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
-          Content.Prepare(true);
-        else
-          Content.Prepare(false);
-      } else {
-        Content.Prepare();
-      }
+      Content.Prepare(false);
     }
     private void algorithmPanel_DragEnterOver(object sender, DragEventArgs e) {

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

@@ -125 +125 @@
     }
     private void resetButton_Click(object sender, EventArgs e) {
-      if (Content.Runs.Count > 0) {
-        if (MessageBox.Show(this, "Clear all runs executed so far?", "Clear All Runs?", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
-          Content.Prepare(true);
-        else
-          Content.Prepare(false);
-      } else {
-        Content.Prepare();
-      }
+      Content.Prepare(false);
     }
     #endregion

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

@@ -54 +54 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RunCollectionView));
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.toolStrip = new System.Windows.Forms.ToolStrip();
@@ -70 +69 @@
       this.constraintPage = new System.Windows.Forms.TabPage();
       this.runCollectionConstraintCollectionView = new HeuristicLab.Core.Views.RunCollectionConstraintCollectionView();
+      this.clearButton = new System.Windows.Forms.Button();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
@@ -90 +90 @@
       // splitContainer.Panel1
       // 
+      this.splitContainer.Panel1.Controls.Add(this.clearButton);
       this.splitContainer.Panel1.Controls.Add(this.toolStrip);
       this.splitContainer.Panel1.Controls.Add(this.itemsListView);
@@ -113 +114 @@
       this.toolStrip.Location = new System.Drawing.Point(30, 3);
       this.toolStrip.Name = "toolStrip";
-      this.toolStrip.Size = new System.Drawing.Size(217, 24);
+      this.toolStrip.Size = new System.Drawing.Size(166, 24);
       this.toolStrip.TabIndex = 1;
       this.toolStrip.Text = "toolStrip1";
@@ -141 +142 @@
       this.itemsListView.Size = new System.Drawing.Size(244, 295);
       this.itemsListView.SmallImageList = this.imageList;
-      this.itemsListView.TabIndex = 1;
+      this.itemsListView.TabIndex = 3;
       this.itemsListView.UseCompatibleStateImageBehavior = false;
       this.itemsListView.View = System.Windows.Forms.View.Details;
@@ -218 +219 @@
       this.tabControl.SelectedIndex = 0;
       this.tabControl.Size = new System.Drawing.Size(532, 383);
-      this.tabControl.TabIndex = 1;
+      this.tabControl.TabIndex = 0;
       // 
       // runPage
@@ -252 +253 @@
       this.runCollectionConstraintCollectionView.Size = new System.Drawing.Size(518, 351);
       this.runCollectionConstraintCollectionView.TabIndex = 0;
+      // 
+      // clearButton
+      // 
+      this.clearButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.clearButton.Enabled = false;
+      this.clearButton.Location = new System.Drawing.Point(199, 3);
+      this.clearButton.Name = "clearButton";
+      this.clearButton.Size = new System.Drawing.Size(48, 24);
+      this.clearButton.TabIndex = 2;
+      this.clearButton.Text = "&Clear";
+      this.toolTip.SetToolTip(this.clearButton, "Remove All Runs");
+      this.clearButton.UseVisualStyleBackColor = true;
+      this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
       // 
       // RunCollectionView
@@ -286 +300 @@
     protected ToolStrip toolStrip;
     protected ToolStripDropDownButton analyzeRunsToolStripDropDownButton;
-    private TabControl tabControl;
-    private TabPage runPage;
-    private TabPage constraintPage;
-    private HeuristicLab.Core.Views.RunCollectionConstraintCollectionView runCollectionConstraintCollectionView;
+    protected TabControl tabControl;
+    protected TabPage runPage;
+    protected TabPage constraintPage;
+    protected HeuristicLab.Core.Views.RunCollectionConstraintCollectionView runCollectionConstraintCollectionView;
+    protected Button clearButton;
   }
 }

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

@@ -131 +131 @@
         viewHost.Enabled = false;
         removeButton.Enabled = false;
+        clearButton.Enabled = false;
       } else {
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
@@ -137 +138 @@
         detailsGroupBox.Enabled = true;
         removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly && !ReadOnly;
+        clearButton.Enabled = itemsListView.Items.Count > 0 && !Content.IsReadOnly && !ReadOnly;
         viewHost.Enabled = true;
       }
@@ -268 +270 @@
       }
     }
+    protected virtual void clearButton_Click(object sender, EventArgs e) {
+      Content.Clear();
+    }
     #endregion
 
@@ -279 +284 @@
           AddListViewItem(CreateListViewItem(item));
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        clearButton.Enabled = itemsListView.Items.Count > 0 && !Content.IsReadOnly && !ReadOnly;
         runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
       }
@@ -294 +300 @@
         }
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        clearButton.Enabled = itemsListView.Items.Count > 0 && !Content.IsReadOnly && !ReadOnly;
         runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
       }
@@ -312 +319 @@
           AddListViewItem(CreateListViewItem(item));
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        clearButton.Enabled = itemsListView.Items.Count > 0 && !Content.IsReadOnly && !ReadOnly;
         runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
       }
@@ -357 +365 @@
     }
     #endregion
+
   }
 }