Changeset 84558 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 27, 2020 12:01:54 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9743: VirtualBox Manager: Chooser pane: A possibility to move group items to existing group with certain name using corresponding menu, based on r138287.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (7 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)

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

@@ -624 +624 @@
 
 /** Menu action extension, used as 'Move to Group' menu class. */
-class UIActionMenuSelectorMachineMoveToGroup : public UIActionMenu
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorMachineMoveToGroup(UIActionPool *pParent)
+class UIActionMenuSelectorCommonMoveToGroup : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCommonMoveToGroup(UIActionPool *pParent)
         : UIActionMenu(pParent, ":/vm_group_create_16px.png", ":/vm_group_create_disabled_16px.png")
     {}
@@ -2939 +2939 @@
     m_pool[UIActionIndexST_M_Group_S_Rename] = new UIActionSimpleSelectorGroupPerformRename(this);
     m_pool[UIActionIndexST_M_Group_S_Remove] = new UIActionSimpleSelectorGroupPerformRemove(this);
+    m_pool[UIActionIndexST_M_Group_M_MoveToGroup] = new UIActionMenuSelectorCommonMoveToGroup(this);
     m_pool[UIActionIndexST_M_Group_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
     m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal] = new UIActionSimpleSelectorCommonPerformStartNormal(this);
@@ -2970 +2971 @@
     m_pool[UIActionIndexST_M_Machine_S_ExportToOCI] = new UIActionSimpleSelectorMachinePerformExportToOCI(this);
     m_pool[UIActionIndexST_M_Machine_S_Remove] = new UIActionSimpleSelectorMachinePerformRemove(this);
-    m_pool[UIActionIndexST_M_Machine_M_MoveToGroup] = new UIActionMenuSelectorMachineMoveToGroup(this);
+    m_pool[UIActionIndexST_M_Machine_M_MoveToGroup] = new UIActionMenuSelectorCommonMoveToGroup(this);
     m_pool[UIActionIndexST_M_Machine_M_MoveToGroup_S_New] = new UIActionSimpleSelectorMachineMoveToGroupNew(this);
     m_pool[UIActionIndexST_M_Machine_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
@@ -3062 +3063 @@
     m_menuUpdateHandlers[UIActionIndexST_M_Group].ptfm =                 &UIActionPoolManager::updateMenuGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine].ptfm =               &UIActionPoolManager::updateMenuMachine;
+    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_MoveToGroup].ptfm =   &UIActionPoolManager::updateMenuGroupMoveToGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup].ptfm = &UIActionPoolManager::updateMenuMachineMoveToGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_StartOrShow].ptfm =   &UIActionPoolManager::updateMenuGroupStartOrShow;
@@ -3297 +3299 @@
     pMenu->addAction(action(UIActionIndexST_M_Group_S_Rename));
     pMenu->addAction(action(UIActionIndexST_M_Group_S_Remove));
+    pMenu->addAction(action(UIActionIndexST_M_Group_M_MoveToGroup));
     pMenu->addSeparator();
     pMenu->addAction(action(UIActionIndexST_M_Group_M_StartOrShow));
@@ -3358 +3361 @@
 }
 
+void UIActionPoolManager::updateMenuGroupMoveToGroup()
+{
+    /* Get corresponding menu: */
+    UIMenu *pMenu = action(UIActionIndexST_M_Group_M_MoveToGroup)->menu();
+    AssertPtrReturnVoid(pMenu);
+    /* Clear contents: */
+    pMenu->clear();
+
+    /* This menu always remains invalid.. */
+}
+
 void UIActionPoolManager::updateMenuMachineMoveToGroup()
 {
@@ -3709 +3723 @@
                     << action(UIActionIndexST_M_Group_S_Rename)
                     << action(UIActionIndexST_M_Group_S_Remove)
+                    << action(UIActionIndexST_M_Group_M_MoveToGroup)
                     << action(UIActionIndexST_M_Group_M_StartOrShow)
                     << action(UIActionIndexST_M_Group_T_Pause)

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

@@ -63 +63 @@
     UIActionIndexST_M_Group_S_Rename,
     UIActionIndexST_M_Group_S_Remove,
+    UIActionIndexST_M_Group_M_MoveToGroup,
     UIActionIndexST_M_Group_M_StartOrShow,
     UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal,
@@ -205 +206 @@
     /** Updates 'Machine' menu. */
     void updateMenuMachine();
+    /** Updates 'Group' / 'Move to Group' menu. */
+    void updateMenuGroupMoveToGroup();
     /** Updates 'Machine' / 'Move to Group' menu. */
     void updateMenuMachineMoveToGroup();

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

@@ -1476 +1476 @@
 
     /* Prepare menu update-handlers: */
+    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuGroupMoveToGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close] = &UIVirtualBoxManager::updateMenuGroupClose;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuMachineMoveToGroup;
@@ -1908 +1909 @@
 }
 
+void UIVirtualBoxManager::updateMenuGroupMoveToGroup(QMenu *pMenu)
+{
+    const QStringList groups = m_pWidget->possibleGroupsForGroupToMove(m_pWidget->fullGroupName());
+    if (!groups.isEmpty())
+        pMenu->addSeparator();
+    foreach (const QString &strGroupName, groups)
+        pMenu->addAction(strGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
+}
+
 void UIVirtualBoxManager::updateMenuGroupClose(QMenu *)
 {
@@ -2009 +2019 @@
     actionPool()->action(UIActionIndexST_M_Group_S_Rename)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Rename, items));
     actionPool()->action(UIActionIndexST_M_Group_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Remove, items));
+    actionPool()->action(UIActionIndexST_M_Group_M_MoveToGroup)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_MoveToGroup, items));
     actionPool()->action(UIActionIndexST_M_Group_T_Pause)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_T_Pause, items));
     actionPool()->action(UIActionIndexST_M_Group_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Reset, items));
@@ -2236 +2247 @@
                    isAtLeastOneItemRemovable(items);
         }
+        case UIActionIndexST_M_Group_M_MoveToGroup:
         case UIActionIndexST_M_Machine_M_MoveToGroup:
         case UIActionIndexST_M_Machine_M_MoveToGroup_S_New:

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

@@ -345 +345 @@
     /** @name Action update stuff.
       * @{ */
+        /** Updates 'Group' : 'Move to Group' menu. */
+        void updateMenuGroupMoveToGroup(QMenu *pMenu);
         /** Updates 'Group' : 'Close' menu. */
         void updateMenuGroupClose(QMenu *pMenu);

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

@@ -1280 +1280 @@
         m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Rename));
         m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Remove));
+        m_pContextMenuGroup->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_MoveToGroup)->menu());
         m_pContextMenuGroup->addSeparator();
         m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));