Changeset 84542 in vbox for trunk/src

Timestamp:

May 26, 2020 3:53:40 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9743: VirtualBox Manager: Chooser pane: A possibility to move items to existing group with certain name; Not used for now, just interface implementation.

Location:

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

Files:

• UIVirtualBoxManager.cpp (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) (4 diffs)
• chooser/UIChooserModel.h (modified) (1 diff)

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

@@ -791 +791 @@
 void UIVirtualBoxManager::sltPerformMachineMoveToNewGroup()
 {
-    m_pWidget->moveMachineToNewGroup();
+    m_pWidget->moveMachineToGroup();
 }
 

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

@@ -131 +131 @@
 }
 
-void UIVirtualBoxManagerWidget::moveMachineToNewGroup()
-{
-    m_pPaneChooser->moveMachineToNewGroup();
+void UIVirtualBoxManagerWidget::moveMachineToGroup(const QString &strName /* = QString() */)
+{
+    m_pPaneChooser->moveMachineToGroup(strName);
 }
 

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

@@ -146 +146 @@
         /** Removes machine. */
         void removeMachine();
-        /** Moves machine to a new group. */
-        void moveMachineToNewGroup();
+        /** Moves machine to a group with certain @a strName. */
+        void moveMachineToGroup(const QString &strName = QString());
         /** Refreshes machine. */
         void refreshMachine();

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

@@ -131 +131 @@
 }
 
-void UIChooser::moveMachineToNewGroup()
-{
-    AssertPtrReturnVoid(model());
-    model()->moveSelectedMachineItemsToNewGroupItem();
+void UIChooser::moveMachineToGroup(const QString &strName)
+{
+    AssertPtrReturnVoid(model());
+    model()->moveSelectedMachineItemsToGroupItem(strName);
 }
 

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

@@ -140 +140 @@
         /** Removes machine. */
         void removeMachine();
-        /** Moves machine to a new group. */
-        void moveMachineToNewGroup();
+        /** Moves machine to a group with certain @a strName. */
+        void moveMachineToGroup(const QString &strName);
         /** Refreshes machine. */
         void refreshMachine();

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

@@ -735 +735 @@
 }
 
-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);
+void UIChooserModel::moveSelectedMachineItemsToGroupItem(const QString &strName /* = QString() */)
+{
+    /* Prepare target group pointers: */
+    UIChooserNodeGroup *pTargetGroupNode = 0;
+    UIChooserItemGroup *pTargetGroupItem = 0;
+    if (strName.isNull())
+    {
+        /* Create new group node in the current root: */
+        pTargetGroupNode = new UIChooserNodeGroup(invisibleRoot(),
+                                                  false /* favorite */,
+                                                  invisibleRoot()->nodes().size() /* position */,
+                                                  uniqueGroupName(invisibleRoot()),
+                                                  UIChooserNodeGroupType_Local,
+                                                  true /* opened */);
+        pTargetGroupItem = new UIChooserItemGroup(root(), pTargetGroupNode);
+    }
+    else
+    {
+        /* Search for existing group with certain name: */
+        UIChooserItem *pTargetItem = root()->searchForItem(strName,
+                                                           UIChooserItemSearchFlag_LocalGroup |
+                                                           UIChooserItemSearchFlag_ExactId);
+        AssertPtrReturnVoid(pTargetItem);
+        pTargetGroupItem = pTargetItem->toGroupItem();
+        UIChooserNode *pTargetNode = pTargetItem->node();
+        AssertPtrReturnVoid(pTargetNode);
+        pTargetGroupNode = pTargetNode->toGroupNode();
+    }
+    AssertPtrReturnVoid(pTargetGroupNode);
+    AssertPtrReturnVoid(pTargetGroupItem);
 
     /* For each of currently selected-items: */
@@ -762 +782 @@
                 busyGroupNames << pItem->name();
                 /* Copy or move group-item: */
-                UIChooserNodeGroup *pNewGroupSubNode = new UIChooserNodeGroup(pNewGroupNode,
+                UIChooserNodeGroup *pNewGroupSubNode = new UIChooserNodeGroup(pTargetGroupNode,
                                                                               pItem->node()->toGroupNode(),
-                                                                              pNewGroupNode->nodes().size());
-                new UIChooserItemGroup(pNewGroupItem, pNewGroupSubNode);
+                                                                              pTargetGroupNode->nodes().size());
+                new UIChooserItemGroup(pTargetGroupItem, pNewGroupSubNode);
                 delete pItem->node();
                 break;
@@ -777 +797 @@
                 busyMachineNames << pItem->name();
                 /* Copy or move machine-item: */
-                UIChooserNodeMachine *pNewMachineSubNode = new UIChooserNodeMachine(pNewGroupNode,
+                UIChooserNodeMachine *pNewMachineSubNode = new UIChooserNodeMachine(pTargetGroupNode,
                                                                                     pItem->node()->toMachineNode(),
-                                                                                    pNewGroupNode->nodes().size());
-                new UIChooserItemMachine(pNewGroupItem, pNewMachineSubNode);
+                                                                                    pTargetGroupNode->nodes().size());
+                new UIChooserItemMachine(pTargetGroupItem, pNewMachineSubNode);
                 delete pItem->node();
                 break;
@@ -790 +810 @@
     wipeOutEmptyGroups();
     updateTreeForMainRoot();
-    setSelectedItem(pNewGroupItem);
+    setSelectedItem(pTargetGroupItem);
     saveGroups();
 }

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

@@ -222 +222 @@
         /** Removes selected machine items. */
         void removeSelectedMachineItems();
-        /** Moves selected machine items to new group item. */
-        void moveSelectedMachineItemsToNewGroupItem();
+        /** Moves selected machine items to group item.
+          * @param  strName  Holds the group item name to move items to, if
+          *                  that name isn't specified, new top-level group
+          *                  item will be created. */
+        void moveSelectedMachineItemsToGroupItem(const QString &strName);
         /** Starts or shows selected items. */
         void startOrShowSelectedItems();