Changeset 42850 in vbox for trunk/src

Timestamp:

Aug 16, 2012 4:36:21 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Rework "Group" action logic to move grouped items into the new group instead of just copying them.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UIActionPoolSelector.cpp (modified) (1 diff)
• graphics/chooser/UIGChooserModel.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -377 +377 @@
     void retranslateUi()
     {
-        setText(QApplication::translate("UIActionPool", "&Add Group..."));
+        setText(QApplication::translate("UIActionPool", "Gro&up"));
         setStatusTip(QApplication::translate("UIActionPool", "Add a new group based on the items selected"));
     }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -776 +776 @@
     QStringList busyGroupNames;
     QStringList busyMachineNames;
-    foreach (UIGChooserItem *pItem, selectionList())
+    QList<UIGChooserItem*> selectedItems = selectionList();
+    foreach (UIGChooserItem *pItem, selectedItems)
     {
         /* For each of known types: */
@@ -786 +787 @@
                 if (busyGroupNames.contains(pItem->name()))
                     break;
-                /* Copy group item: */
+                /* Add name to busy: */
+                busyGroupNames << pItem->name();
+                /* Copy or move group item: */
                 new UIGChooserItemGroup(pNewGroupItem, pItem->toGroupItem());
-                busyGroupNames << pItem->name();
+                delete pItem;
                 break;
             }
@@ -796 +799 @@
                 if (busyMachineNames.contains(pItem->name()))
                     break;
-                /* Copy machine item: */
+                /* Add name to busy: */
+                busyMachineNames << pItem->name();
+                /* Copy or move machine item: */
                 new UIGChooserItemMachine(pNewGroupItem, pItem->toMachineItem());
-                busyMachineNames << pItem->name();
+                delete pItem;
                 break;
             }
@@ -804 +809 @@
     }
     /* Update model: */
+    updateGroupTree();
     updateNavigation();
     updateLayout();