Changeset 84513 in vbox for trunk/src

Timestamp:

May 25, 2020 3:56:53 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane cleanup: Move group VMs action trigger handling to proper place in UIVirtualBoxManager class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserModel.cpp (modified) (3 diffs)
• chooser/UIChooserModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -777 +777 @@
 }
 
+void UIVirtualBoxManager::sltPerformMachineMoveToNewGroup()
+{
+    m_pWidget->moveMachineToNewGroup();
+}
+
 void UIVirtualBoxManager::sltPerformStartOrShowMachine()
 {
@@ -1600 +1605 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenExportApplianceWizard);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltPerformMachineMoveToNewGroup);
     connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartOrShowMachine);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -210 +210 @@
         /** Handles call to move machine. */
         void sltPerformMachineMove();
+
+        /** Handles call to move machine to a new group. */
+        void sltPerformMachineMoveToNewGroup();
 
         /** Handles call to start or show machine. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -124 +124 @@
 {
     m_pPaneChooser->disbandGroup();
+}
+
+void UIVirtualBoxManagerWidget::moveMachineToNewGroup()
+{
+    m_pPaneChooser->moveMachineToNewGroup();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -142 +142 @@
         /** Disbands group. */
         void disbandGroup();
+        /** Moves machine to a new group. */
+        void moveMachineToNewGroup();
         /** Sorts group. */
         void sortGroup();

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -123 +123 @@
     AssertPtrReturnVoid(model());
     model()->disbandSelectedGroupItem();
+}
+
+void UIChooser::moveMachineToNewGroup()
+{
+    AssertPtrReturnVoid(model());
+    model()->moveSelectedMachineItemsToNewGroupItem();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -136 +136 @@
         /** Disbands group. */
         void disbandGroup();
+        /** Moves machine to a new group. */
+        void moveMachineToNewGroup();
         /** Sorts group. */
         void sortGroup();

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -663 +663 @@
 }
 
+void UIChooserModel::moveSelectedMachineItemsToNewGroupItem()
+{
+    /* Create new group node in the current root: */
+    UIChooserNodeGroup *pNewGroupNode = new UIChooserNodeGroup(invisibleRoot(),
+                                                               false /* favorite */,
+                                                               invisibleRoot()->nodes().size() /* position */,
+                                                               uniqueGroupName(invisibleRoot()),
+                                                               UIChooserNodeGroupType_Local,
+                                                               true /* opened */);
+    UIChooserItemGroup *pNewGroupItem = new UIChooserItemGroup(root(), pNewGroupNode);
+
+    /* For each of currently selected-items: */
+    QStringList busyGroupNames;
+    QStringList busyMachineNames;
+    foreach (UIChooserItem *pItem, selectedItems())
+    {
+        /* For each of known types: */
+        switch (pItem->type())
+        {
+            case UIChooserNodeType_Group:
+            {
+                /* Avoid name collisions: */
+                if (busyGroupNames.contains(pItem->name()))
+                    break;
+                /* Add name to busy: */
+                busyGroupNames << pItem->name();
+                /* Copy or move group-item: */
+                UIChooserNodeGroup *pNewGroupSubNode = new UIChooserNodeGroup(pNewGroupNode,
+                                                                              pItem->node()->toGroupNode(),
+                                                                              pNewGroupNode->nodes().size());
+                new UIChooserItemGroup(pNewGroupItem, pNewGroupSubNode);
+                delete pItem->node();
+                break;
+            }
+            case UIChooserNodeType_Machine:
+            {
+                /* Avoid name collisions: */
+                if (busyMachineNames.contains(pItem->name()))
+                    break;
+                /* Add name to busy: */
+                busyMachineNames << pItem->name();
+                /* Copy or move machine-item: */
+                UIChooserNodeMachine *pNewMachineSubNode = new UIChooserNodeMachine(pNewGroupNode,
+                                                                                    pItem->node()->toMachineNode(),
+                                                                                    pNewGroupNode->nodes().size());
+                new UIChooserItemMachine(pNewGroupItem, pNewMachineSubNode);
+                delete pItem->node();
+                break;
+            }
+        }
+    }
+
+    /* Update model: */
+    wipeOutEmptyGroups();
+    updateTreeForMainRoot();
+    setSelectedItem(pNewGroupItem);
+    saveGroups();
+}
+
 void UIChooserModel::startOrShowSelectedItems()
 {
@@ -917 +976 @@
 }
 
-void UIChooserModel::sltGroupSelectedMachines()
-{
-    /* Check if action is enabled: */
-    if (!actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New)->isEnabled())
-        return;
-
-    /* Create new group node in the current root: */
-    UIChooserNodeGroup *pNewGroupNode = new UIChooserNodeGroup(invisibleRoot(),
-                                                               false /* favorite */,
-                                                               invisibleRoot()->nodes().size() /* position */,
-                                                               uniqueGroupName(invisibleRoot()),
-                                                               UIChooserNodeGroupType_Local,
-                                                               true /* opened */);
-    UIChooserItemGroup *pNewGroupItem = new UIChooserItemGroup(root(), pNewGroupNode);
-
-    /* Enumerate all the currently selected-items: */
-    QStringList busyGroupNames;
-    QStringList busyMachineNames;
-    foreach (UIChooserItem *pItem, selectedItems())
-    {
-        /* For each of known types: */
-        switch (pItem->type())
-        {
-            case UIChooserNodeType_Group:
-            {
-                /* Avoid name collisions: */
-                if (busyGroupNames.contains(pItem->name()))
-                    break;
-                /* Add name to busy: */
-                busyGroupNames << pItem->name();
-                /* Copy or move group-item: */
-                UIChooserNodeGroup *pNewGroupSubNode = new UIChooserNodeGroup(pNewGroupNode,
-                                                                              pItem->node()->toGroupNode(),
-                                                                              pNewGroupNode->nodes().size());
-                new UIChooserItemGroup(pNewGroupItem, pNewGroupSubNode);
-                delete pItem->node();
-                break;
-            }
-            case UIChooserNodeType_Machine:
-            {
-                /* Avoid name collisions: */
-                if (busyMachineNames.contains(pItem->name()))
-                    break;
-                /* Add name to busy: */
-                busyMachineNames << pItem->name();
-                /* Copy or move machine-item: */
-                UIChooserNodeMachine *pNewMachineSubNode = new UIChooserNodeMachine(pNewGroupNode,
-                                                                                    pItem->node()->toMachineNode(),
-                                                                                    pNewGroupNode->nodes().size());
-                new UIChooserItemMachine(pNewGroupItem, pNewMachineSubNode);
-                delete pItem->node();
-                break;
-            }
-        }
-    }
-
-    /* Update model: */
-    wipeOutEmptyGroups();
-    updateTreeForMainRoot();
-    setSelectedItem(pNewGroupItem);
-    saveGroups();
-}
-
 void UIChooserModel::sltPerformRefreshAction()
 {
@@ -1313 +1309 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
             this, &UIChooserModel::sltRemoveSelectedMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New), &UIAction::triggered,
-            this, &UIChooserModel::sltGroupSelectedMachines);
     connect(actionPool()->action(UIActionIndexST_M_Group_S_Refresh), &UIAction::triggered,
             this, &UIChooserModel::sltPerformRefreshAction);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -220 +220 @@
         /** Disbands selected group item. */
         void disbandSelectedGroupItem();
+        /** Moves selected machine items to new group item. */
+        void moveSelectedMachineItemsToNewGroupItem();
         /** Starts or shows selected items. */
         void startOrShowSelectedItems();
@@ -295 +297 @@
     /** @name Children stuff.
       * @{ */
-        /** Handles group selected machines request. */
-        void sltGroupSelectedMachines();
         /** Handles refresh request. */
         void sltPerformRefreshAction();