Changeset 6531 for trunk/sources

Timestamp:

07/07/11 11:03:22 (13 years ago)

Author:

mkommend

Message:

#1555: Corrected enabled state of add button.

File:

• trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs (modified) (3 diffs)

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

@@ -118 +118 @@
     }
 
-
-
     private void DeregisterNamedItemEvents(INamedItem namedItem) {
       namedItem.ToStringChanged -= new EventHandler(namedItem_ToStringChanged);
@@ -399 +397 @@
 
       addButton.Enabled = Content != null && !Locked && !ReadOnly &&
-        (treeView.SelectedNode == null || experiment != null || (batchRun != null && batchRun.Optimizer == null) || (algorithm != null && algorithm.Problem == null));
+        (treeView.SelectedNode == null || experiment != null || batchRun != null || algorithm != null);
       moveUpButton.Enabled = Content != null && !Locked && !ReadOnly &&
         treeView.SelectedNode != null && treeView.SelectedNode.PrevNode != null && parentExperiment != null;
@@ -647 +645 @@
 
     private void treeView_BeforeLabelEdit(object sender, NodeLabelEditEventArgs e) {
-      if (e.Node.Tag == null || !(e.Node.Tag is INamedItem)) {
-        e.CancelEdit = true;
-        return;
-      }
+      if (Locked) e.CancelEdit = true;
+      if (ReadOnly) e.CancelEdit = true;
+      if (e.Node.Tag == null) e.CancelEdit = true;
+      if (!(e.Node.Tag is NamedItem)) e.CancelEdit = true;
     }
     private void treeView_AfterLabelEdit(object sender, NodeLabelEditEventArgs e) {