Changeset 13178

Timestamp:

11/16/15 15:22:13 (9 years ago)

Author:

mkommend

Message:

#2493: Merged r13143 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs (modified) (2 diffs)

stable/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs

@@ -51 +51 @@
       this.CollapseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.CollapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.EditNodeLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.optimizersGroupBox.SuspendLayout();
@@ -165 +164 @@
       this.treeView.ImageIndex = 0;
       this.treeView.ImageList = this.imageList;
-      this.treeView.LabelEdit = true;
+      this.treeView.LabelEdit = false;
       this.treeView.Location = new System.Drawing.Point(4, 34);
       this.treeView.Name = "optimizerTreeView";
@@ -220 +219 @@
       // 
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.EditNodeLabelToolStripMenuItem,
             this.ExpandToolStripMenuItem,
             this.ExpandAllToolStripMenuItem,
@@ -255 +253 @@
       this.CollapseAllToolStripMenuItem.Text = "Collapse All";
       this.CollapseAllToolStripMenuItem.Click += new System.EventHandler(this.CollapseAllToolStripMenuItem_Click);
-      //
-      // EditNodeLabelToolStripMenuItem
-      //
-      this.EditNodeLabelToolStripMenuItem.Name = "EditNodeLabelToolStripMenuItem";
-      this.EditNodeLabelToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
-      this.EditNodeLabelToolStripMenuItem.Text = "Edit Name";
-      this.EditNodeLabelToolStripMenuItem.Click += new System.EventHandler(this.EditNodeLabelToolStripMenuItem_Click);
 
       // 
@@ -300 +291 @@
     private System.Windows.Forms.ToolStripMenuItem CollapseToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem CollapseAllToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem EditNodeLabelToolStripMenuItem;
 
   }

stable/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs

@@ -664 +664 @@
         ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = !toolStripMenuNode.IsExpanded && toolStripMenuNode.Nodes.Count > 0;
         CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = toolStripMenuNode.IsExpanded;
-        EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = !Locked && !ReadOnly && toolStripMenuNode.Tag != null && toolStripMenuNode.Tag is INamedItem && ((INamedItem)toolStripMenuNode.Tag).CanChangeName;
       } else {
         ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = false;
         CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = false;
-        EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = false;
       }
       ExpandAllToolStripMenuItem.Enabled = ExpandAllToolStripMenuItem.Visible = !treeView.Nodes.OfType<TreeNode>().All(x => TreeNodeIsFullyExpanded(x));
@@ -687 +685 @@
     private void CollapseAllToolStripMenuItem_Click(object sender, EventArgs e) {
       treeView.CollapseAll();
-    }
-    private void EditNodeLabelToolStripMenuItem_Click(object sender, EventArgs e) {
-      if (toolStripMenuNode != null) {
-        if (!toolStripMenuNode.IsEditing) toolStripMenuNode.BeginEdit();
-      }
     }