Changeset 84545 in vbox for trunk/src

Timestamp:

May 26, 2020 4:17: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 using corresponding menu, based on r138272.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• manager/chooser/UIChooser.cpp (modified) (1 diff)
• manager/chooser/UIChooser.h (modified) (1 diff)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (2 diffs)
• manager/chooser/UIChooserAbstractModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -653 +653 @@
     /** Constructs action passing @a pParent to the base-class. */
     UIActionSimpleSelectorMachineMoveToGroupNew(UIActionPool *pParent)
-        : UIActionSimple(pParent, ":/vm_group_create_16px.png", ":/vm_group_create_disabled_16px.png")
+        : UIActionSimple(pParent)
     {}
 
@@ -667 +667 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&New"));
+        setName(QApplication::translate("UIActionPool", "[New]"));
         setStatusTip(QApplication::translate("UIActionPool", "Add new group based on selected virtual machines"));
     }
@@ -3369 +3369 @@
     pMenu->addAction(action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New));
 
-    /* Mark menu as valid (for now): */
-    m_invalidations.remove(UIActionIndexST_M_Machine_M_MoveToGroup);
+    /* This menu always remains invalid.. */
 }
 

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

@@ -794 +794 @@
 }
 
+void UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup()
+{
+    AssertPtrReturnVoid(sender());
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertPtrReturnVoid(pAction);
+    m_pWidget->moveMachineToGroup(pAction->text());
+}
+
 void UIVirtualBoxManager::sltPerformStartOrShowMachine()
 {
@@ -1469 +1477 @@
     /* Prepare menu update-handlers: */
     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close] = &UIVirtualBoxManager::updateMenuGroupClose;
+    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuMachineMoveToGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Close] = &UIVirtualBoxManager::updateMenuMachineClose;
 
@@ -1908 +1917 @@
 }
 
+void UIVirtualBoxManager::updateMenuMachineMoveToGroup(QMenu *pMenu)
+{
+    /* Get current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
+
+    const QStringList groups = m_pWidget->possibleGroupsForMachineToMove(pItem->id());
+    if (!groups.isEmpty())
+        pMenu->addSeparator();
+    foreach (const QString &strGroupName, groups)
+        pMenu->addAction(strGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
+}
+
 void UIVirtualBoxManager::updateMenuMachineClose(QMenu *)
 {
@@ -2218 +2240 @@
         {
             return !isGroupSavingInProgress() &&
-                   !isAllItemsOfOneGroupSelected() &&
                    isItemsLocal(items) &&
                    isItemsPoweredOff(items);

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

@@ -225 +225 @@
         /** Handles call to move machine to a new group. */
         void sltPerformMachineMoveToNewGroup();
+        /** Handles call to move machine to a specific group. */
+        void sltPerformMachineMoveToSpecificGroup();
 
         /** Handles call to start or show machine. */
@@ -345 +347 @@
         /** Updates 'Group' : 'Close' menu. */
         void updateMenuGroupClose(QMenu *pMenu);
+        /** Updates 'Machine' : 'Move to Group' menu. */
+        void updateMenuMachineMoveToGroup(QMenu *pMenu);
         /** Updates 'Machine' : 'Close' menu. */
         void updateMenuMachineClose(QMenu *pMenu);

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

@@ -134 +134 @@
 {
     m_pPaneChooser->moveMachineToGroup(strName);
+}
+
+QStringList UIVirtualBoxManagerWidget::possibleGroupsForMachineToMove(const QUuid &uId)
+{
+    return m_pPaneChooser->possibleGroupsForMachineToMove(uId);
 }
 

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

@@ -148 +148 @@
         /** Moves machine to a group with certain @a strName. */
         void moveMachineToGroup(const QString &strName = QString());
+        /** Returns possible groups for VM with passed @a uId to move to. */
+        QStringList possibleGroupsForMachineToMove(const QUuid &uId);
         /** Refreshes machine. */
         void refreshMachine();

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

@@ -135 +135 @@
     AssertPtrReturnVoid(model());
     model()->moveSelectedMachineItemsToGroupItem(strName);
+}
+
+QStringList UIChooser::possibleGroupsForMachineToMove(const QUuid &uId)
+{
+    AssertPtrReturn(model(), QStringList());
+    return model()->possibleGroupNodeNamesForMachineNodeToMove(uId);
 }
 

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

@@ -142 +142 @@
         /** Moves machine to a group with certain @a strName. */
         void moveMachineToGroup(const QString &strName);
+        /** Returns possible groups for VM with passed @a uId to move to. */
+        QStringList possibleGroupsForMachineToMove(const QUuid &uId);
         /** Refreshes machine. */
         void refreshMachine();

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

@@ -514 +514 @@
 {
     wipeOutEmptyGroupsStartingFrom(invisibleRoot());
+}
+
+QStringList UIChooserAbstractModel::possibleGroupNodeNamesForMachineNodeToMove(const QUuid &uId)
+{
+    /* Search for all the machine nodes with passed ID: */
+    QList<UIChooserNode*> machineNodes;
+    invisibleRoot()->searchForNodes(toOldStyleUuid(uId),
+                                    UIChooserItemSearchFlag_Machine | UIChooserItemSearchFlag_ExactId,
+                                    machineNodes);
+
+    /* Return group nodes starting from root one: */
+    return gatherPossibleGroupNodeNames(invisibleRoot(), machineNodes);
 }
 
@@ -1300 +1312 @@
 }
 
+QStringList UIChooserAbstractModel::gatherPossibleGroupNodeNames(UIChooserNode *pCurrentNode, QList<UIChooserNode*> exceptions) const
+{
+    /* Prepare result: */
+    QStringList result;
+
+    /* Walk through all the children and make sure there are no exceptions: */
+    bool fAddCurrent = true;
+    foreach (UIChooserNode *pChild, pCurrentNode->nodes(UIChooserNodeType_Any))
+    {
+        AssertPtrReturn(pChild, result);
+        if (exceptions.contains(pChild))
+            fAddCurrent = false;
+        else
+        {
+            if (pChild->type() == UIChooserNodeType_Group)
+            {
+                UIChooserNodeGroup *pChildGroup = pChild->toGroupNode();
+                AssertPtrReturn(pChildGroup, result);
+                if (pChildGroup->groupType() == UIChooserNodeGroupType_Local)
+                    result << gatherPossibleGroupNodeNames(pChild, exceptions);
+            }
+        }
+    }
+
+    /* Add current item if not overridden: */
+    if (fAddCurrent)
+        result.prepend(pCurrentNode->fullName());
+
+    /* Return result: */
+    return result;
+}
+
 void UIChooserAbstractModel::saveGroupSettings()
 {

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

@@ -79 +79 @@
         /** Wipes out empty groups. */
         void wipeOutEmptyGroups();
+
+        /** Returns possible group node names for VM node with passed @a uId to move to. */
+        QStringList possibleGroupNodeNamesForMachineNodeToMove(const QUuid &uId);
 
         /** Generates unique group name traversing recursively starting from @a pRoot. */
@@ -220 +223 @@
         /** Creates cloud machine node based on certain @a comMachine as a child of specified @a pParentNode. */
         void createCloudMachineNode(UIChooserNode *pParentNode, const CCloudMachine &comMachine);
+
+        /** Gathers a list of possible group node names for machine nodes listed in @a exceptions, starting from @a pCurrentNode. */
+        QStringList gatherPossibleGroupNodeNames(UIChooserNode *pCurrentNode, QList<UIChooserNode*> exceptions) const;
     /** @} */