Changeset 13178


Ignore:
Timestamp:
11/16/15 15:22:13 (4 years ago)
Author:
mkommend
Message:

#2493: Merged r13143 into stable.

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimization.Views

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

    r12009 r13178  
    5151      this.CollapseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5252      this.CollapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    53       this.EditNodeLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5453      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5554      this.optimizersGroupBox.SuspendLayout();
     
    165164      this.treeView.ImageIndex = 0;
    166165      this.treeView.ImageList = this.imageList;
    167       this.treeView.LabelEdit = true;
     166      this.treeView.LabelEdit = false;
    168167      this.treeView.Location = new System.Drawing.Point(4, 34);
    169168      this.treeView.Name = "optimizerTreeView";
     
    220219      //
    221220      this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    222             this.EditNodeLabelToolStripMenuItem,
    223221            this.ExpandToolStripMenuItem,
    224222            this.ExpandAllToolStripMenuItem,
     
    255253      this.CollapseAllToolStripMenuItem.Text = "Collapse All";
    256254      this.CollapseAllToolStripMenuItem.Click += new System.EventHandler(this.CollapseAllToolStripMenuItem_Click);
    257       //
    258       // EditNodeLabelToolStripMenuItem
    259       //
    260       this.EditNodeLabelToolStripMenuItem.Name = "EditNodeLabelToolStripMenuItem";
    261       this.EditNodeLabelToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
    262       this.EditNodeLabelToolStripMenuItem.Text = "Edit Name";
    263       this.EditNodeLabelToolStripMenuItem.Click += new System.EventHandler(this.EditNodeLabelToolStripMenuItem_Click);
    264255
    265256      //
     
    300291    private System.Windows.Forms.ToolStripMenuItem CollapseToolStripMenuItem;
    301292    private System.Windows.Forms.ToolStripMenuItem CollapseAllToolStripMenuItem;
    302     private System.Windows.Forms.ToolStripMenuItem EditNodeLabelToolStripMenuItem;
    303293
    304294  }
  • stable/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs

    r12009 r13178  
    664664        ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = !toolStripMenuNode.IsExpanded && toolStripMenuNode.Nodes.Count > 0;
    665665        CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = toolStripMenuNode.IsExpanded;
    666         EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = !Locked && !ReadOnly && toolStripMenuNode.Tag != null && toolStripMenuNode.Tag is INamedItem && ((INamedItem)toolStripMenuNode.Tag).CanChangeName;
    667666      } else {
    668667        ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = false;
    669668        CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = false;
    670         EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = false;
    671669      }
    672670      ExpandAllToolStripMenuItem.Enabled = ExpandAllToolStripMenuItem.Visible = !treeView.Nodes.OfType<TreeNode>().All(x => TreeNodeIsFullyExpanded(x));
     
    687685    private void CollapseAllToolStripMenuItem_Click(object sender, EventArgs e) {
    688686      treeView.CollapseAll();
    689     }
    690     private void EditNodeLabelToolStripMenuItem_Click(object sender, EventArgs e) {
    691       if (toolStripMenuNode != null) {
    692         if (!toolStripMenuNode.IsEditing) toolStripMenuNode.BeginEdit();
    693       }
    694687    }
    695688
Note: See TracChangeset for help on using the changeset viewer.