Changeset 11474

Timestamp:

10/16/14 18:34:17 (10 years ago)

Author:

jkarder

Message:

#2262: applied some of the changes suggested by mkommend in comment:10:ticket:2262

• renaming is now only possible if one variable is selected; the variable does not have to be focused
• avoided manual creation of cloner
• changed drag-and-drop logic; existing variable names are now taken into account when cloning INamedItems

File:

• trunk/sources/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -202 +202 @@
           break;
         case Keys.F2:
-          var focusedItem = variableListView.FocusedItem;
-          if (variableListView.LabelEdit && focusedItem.Selected)
-            focusedItem.BeginEdit();
+          if (variableListView.SelectedItems.Count != 1) return;
+          var selectedItem = variableListView.SelectedItems[0];
+          if (variableListView.LabelEdit)
+            selectedItem.BeginEdit();
           break;
         case Keys.A:
@@ -249 +250 @@
       if (e.Effect == DragDropEffects.Copy) {
         object item = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
-        var cloner = new Cloner();
         var dc = item as IDeepCloneable;
-        if (dc != null) item = cloner.Clone(dc);
-        var namedItem = item as INamedItem;
-        bool nameValid = namedItem != null && !string.IsNullOrEmpty(namedItem.Name);
-        string name = nameValid ? GenerateNewVariableName(namedItem.Name, false) : GenerateNewVariableName();
+        if (dc != null) item = dc.Clone();
+
+        string name;
+        bool editLabel;
+        if (sender == variableListView) {
+          name = GenerateNewVariableName(variableListView.FocusedItem.Text, false);
+          editLabel = true;
+        } else {
+          var namedItem = item as INamedItem;
+          editLabel = namedItem == null || string.IsNullOrEmpty(namedItem.Name);
+          name = editLabel ? GenerateNewVariableName() : GenerateNewVariableName(namedItem.Name, false);
+        }
+
         Content.Add(name, item);
         var listViewItem = variableListView.FindItemWithText(name);
-        if (!nameValid) listViewItem.BeginEdit();
+        variableListView.SelectedItems.Clear();
+        if (editLabel) listViewItem.BeginEdit();
       }
     }
@@ -280 +290 @@
     protected virtual void addButton_Click(object sender, EventArgs e) {
       object newVar = CreateItem();
-      if (newVar != null) {
-        string name = GenerateNewVariableName();
-        Content.Add(name, newVar);
-        var item = variableListView.FindItemWithText(name);
-        item.BeginEdit();
-      }
+      if (newVar == null) return;
+
+      var namedItem = newVar as INamedItem;
+      bool editLabel = namedItem == null || string.IsNullOrEmpty(namedItem.Name);
+      string name = editLabel ? GenerateNewVariableName() : GenerateNewVariableName(namedItem.Name, false);
+      Content.Add(name, newVar);
+
+      var item = variableListView.FindItemWithText(name);
+      item.BeginEdit();
     }
     protected virtual void sortAscendingButton_Click(object sender, EventArgs e) {