Changeset 84435 in vbox

Timestamp:

May 21, 2020 3:39:16 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9743: VirtualBox Manager: Initial step of Move to Group functionality implementation; Adding Move to Group menu and moving existing Group action to this sub-menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (9 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)

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

@@ -623 +623 @@
 };
 
-/** Simple action extension, used as 'Perform Group Machines' action class. */
-class UIActionSimpleSelectorMachinePerformGroup : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionSimpleSelectorMachinePerformGroup(UIActionPool *pParent)
+/** 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)
+        : UIActionMenu(pParent, ":/vm_group_create_16px.png", ":/vm_group_create_disabled_16px.png")
+    {}
+
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Move to Gro&up"));
+    }
+};
+
+/** Simple action extension, used as 'Move to Group => New' action class. */
+class UIActionSimpleSelectorMachineMoveToGroupNew : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** 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")
     {}
@@ -646 +667 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "Gro&up"));
+        setName(QApplication::translate("UIActionPool", "&New"));
         setStatusTip(QApplication::translate("UIActionPool", "Add new group based on selected virtual machines"));
     }
@@ -2942 +2963 @@
     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_S_AddGroup] = new UIActionSimpleSelectorMachinePerformGroup(this);
+    m_pool[UIActionIndexST_M_Machine_M_MoveToGroup] = new UIActionMenuSelectorMachineMoveToGroup(this);
+    m_pool[UIActionIndexST_M_Machine_M_MoveToGroup_S_New] = new UIActionSimpleSelectorMachineMoveToGroupNew(this);
     m_pool[UIActionIndexST_M_Machine_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
     m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal] = new UIActionSimpleSelectorCommonPerformStartNormal(this);
@@ -3033 +3055 @@
     m_menuUpdateHandlers[UIActionIndexST_M_Group].ptfm =                 &UIActionPoolManager::updateMenuGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine].ptfm =               &UIActionPoolManager::updateMenuMachine;
+    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup].ptfm = &UIActionPoolManager::updateMenuMachineMoveToGroup;
     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_StartOrShow].ptfm =   &UIActionPoolManager::updateMenuGroupStartOrShow;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_StartOrShow].ptfm = &UIActionPoolManager::updateMenuMachineStartOrShow;
@@ -3095 +3118 @@
     updateMenuMachine();
 
+    /* 'Machine' / 'Move to Group' menu: */
+    updateMenuMachineMoveToGroup();
     /* 'Group' / 'Start or Show' menu: */
     updateMenuGroupStartOrShow();
@@ -3303 +3328 @@
     pMenu->addAction(action(UIActionIndexST_M_Machine_S_ExportToOCI));
     pMenu->addAction(action(UIActionIndexST_M_Machine_S_Remove));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_S_AddGroup));
+    pMenu->addAction(action(UIActionIndexST_M_Machine_M_MoveToGroup));
     pMenu->addSeparator();
     pMenu->addAction(action(UIActionIndexST_M_Machine_M_StartOrShow));
@@ -3324 +3349 @@
     /* Mark menu as valid: */
     m_invalidations.remove(UIActionIndexST_M_Machine);
+}
+
+void UIActionPoolManager::updateMenuMachineMoveToGroup()
+{
+    /* Get corresponding menu: */
+    UIMenu *pMenu = action(UIActionIndexST_M_Machine_M_MoveToGroup)->menu();
+    AssertPtrReturnVoid(pMenu);
+    /* Clear contents: */
+    pMenu->clear();
+
+    /* Populate 'Machine' / 'Move to Group' menu: */
+    pMenu->addAction(action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New));
+
+    /* Mark menu as valid (for now): */
+    m_invalidations.remove(UIActionIndexST_M_Machine_M_MoveToGroup);
 }
 
@@ -3693 +3733 @@
                     << action(UIActionIndexST_M_Machine_S_ExportToOCI)
                     << action(UIActionIndexST_M_Machine_S_Remove)
-                    << action(UIActionIndexST_M_Machine_S_AddGroup)
+                    << action(UIActionIndexST_M_Machine_M_MoveToGroup)
                     << action(UIActionIndexST_M_Machine_M_StartOrShow)
                     << action(UIActionIndexST_M_Machine_T_Pause)
@@ -3703 +3743 @@
                     << action(UIActionIndexST_M_Machine_S_CreateShortcut)
                     << action(UIActionIndexST_M_Machine_S_SortParent)
+                    << action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New)
                     << action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal)
                     << action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless)

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

@@ -94 +94 @@
     UIActionIndexST_M_Machine_S_ExportToOCI,
     UIActionIndexST_M_Machine_S_Remove,
-    UIActionIndexST_M_Machine_S_AddGroup,
+    UIActionIndexST_M_Machine_M_MoveToGroup,
+    UIActionIndexST_M_Machine_M_MoveToGroup_S_New,
     UIActionIndexST_M_Machine_M_StartOrShow,
     UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal,
@@ -204 +205 @@
     /** Updates 'Machine' menu. */
     void updateMenuMachine();
+    /** Updates 'Machine' / 'Move to Group' menu. */
+    void updateMenuMachineMoveToGroup();
     /** Updates 'Group' / 'Start or Show' menu. */
     void updateMenuGroupStartOrShow();

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

@@ -1889 +1889 @@
     actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_ExportToOCI, items));
     actionPool()->action(UIActionIndexST_M_Machine_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Remove, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_AddGroup, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_MoveToGroup, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_MoveToGroup_S_New, items));
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_T_Pause, items));
     actionPool()->action(UIActionIndexST_M_Machine_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Reset, items));
@@ -2097 +2098 @@
                    isAtLeastOneItemRemovable(items);
         }
-        case UIActionIndexST_M_Machine_S_AddGroup:
+        case UIActionIndexST_M_Machine_M_MoveToGroup:
+        case UIActionIndexST_M_Machine_M_MoveToGroup_S_New:
         {
             return !isGroupSavingInProgress() &&

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

@@ -976 +976 @@
 {
     /* Check if action is enabled: */
-    if (!actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup)->isEnabled())
+    if (!actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New)->isEnabled())
         return;
 
@@ -1355 +1355 @@
         m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI));
         m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Remove));
-        m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup));
+        m_pContextMenuMachine->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup)->menu());
         m_pContextMenuMachine->addSeparator();
         m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
@@ -1395 +1395 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
             this, &UIChooserModel::sltRemoveSelectedMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup), &UIAction::triggered,
+    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,