Changeset 76776 in vbox

Timestamp:

Jan 11, 2019 1:21:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: Reworking VirtualBox Manager tools menu to have mutually exclusive togglable actions (s.a. r128074).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (10 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -1294 +1294 @@
 
 /** Simple action extension, used as 'Show Machine Details' action class. */
-class UIActionSimpleSelectorToolsMachineShowDetails : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionSimpleSelectorToolsMachineShowDetails(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/machine_details_manager_24px.png", ":/machine_details_manager_16px.png",
-                         ":/machine_details_manager_disabled_24px.png", ":/machine_details_manager_disabled_16px.png")
-    {}
+class UIActionToggleSelectorToolsMachineShowDetails : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleSelectorToolsMachineShowDetails(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Details));
+        /// @todo use icons with check-boxes
+        setIcon(UIIconPool::iconSetFull(":/machine_details_manager_24px.png", ":/machine_details_manager_16px.png",
+                                        ":/machine_details_manager_disabled_24px.png", ":/machine_details_manager_disabled_16px.png"));
+    }
 
 protected:
@@ -1324 +1327 @@
 
 /** Simple action extension, used as 'Show Machine Snapshots' action class. */
-class UIActionSimpleSelectorToolsMachineShowSnapshots : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionSimpleSelectorToolsMachineShowSnapshots(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/snapshot_manager_24px.png", ":/snapshot_manager_16px.png",
-                         ":/snapshot_manager_disabled_24px.png", ":/snapshot_manager_disabled_16px.png")
-    {}
+class UIActionToggleSelectorToolsMachineShowSnapshots : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleSelectorToolsMachineShowSnapshots(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Snapshots));
+        /// @todo use icons with check-boxes
+        setIcon(UIIconPool::iconSetFull(":/snapshot_manager_24px.png", ":/snapshot_manager_16px.png",
+                                        ":/snapshot_manager_disabled_24px.png", ":/snapshot_manager_disabled_16px.png"));
+    }
 
 protected:
@@ -1354 +1360 @@
 
 /** Simple action extension, used as 'Show Machine Logs' action class. */
-class UIActionSimpleSelectorToolsMachineShowLogs : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionSimpleSelectorToolsMachineShowLogs(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png",
-                         ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png")
-    {}
+class UIActionToggleSelectorToolsMachineShowLogs : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleSelectorToolsMachineShowLogs(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Logs));
+        /// @todo use icons with check-boxes
+        setIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png",
+                                        ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png"));
+    }
 
 protected:
@@ -2534 +2543 @@
     m_pool[UIActionIndexST_M_Group_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this);
     m_pool[UIActionIndexST_M_Group_M_Tools] = new UIActionMenuSelectorToolsMachine(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_S_Details] = new UIActionSimpleSelectorToolsMachineShowDetails(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_S_Snapshots] = new UIActionSimpleSelectorToolsMachineShowSnapshots(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_S_Logs] = new UIActionSimpleSelectorToolsMachineShowLogs(this);
+    m_pool[UIActionIndexST_M_Group_M_Tools_T_Details] = new UIActionToggleSelectorToolsMachineShowDetails(this);
+    m_pool[UIActionIndexST_M_Group_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
+    m_pool[UIActionIndexST_M_Group_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
     m_pool[UIActionIndexST_M_Group_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
     m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
@@ -2565 +2574 @@
     m_pool[UIActionIndexST_M_Machine_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this);
     m_pool[UIActionIndexST_M_Machine_M_Tools] = new UIActionMenuSelectorToolsMachine(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_S_Details] = new UIActionSimpleSelectorToolsMachineShowDetails(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_S_Snapshots] = new UIActionSimpleSelectorToolsMachineShowSnapshots(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_S_Logs] = new UIActionSimpleSelectorToolsMachineShowLogs(this);
+    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Details] = new UIActionToggleSelectorToolsMachineShowDetails(this);
+    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
+    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
     m_pool[UIActionIndexST_M_Machine_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
     m_pool[UIActionIndexST_M_Machine_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
@@ -2616 +2625 @@
     m_pool[UIActionIndexST_M_Cloud_T_Details] = new UIActionMenuSelectorCloudToggleProperties(this);
     m_pool[UIActionIndexST_M_Cloud_S_Help] = new UIActionMenuSelectorCloudShowHelp(this);
+
+    /* 'Group' action groups: */
+    m_groupPool[UIActionIndexST_M_Group_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexST_M_Group_M_Tools));
+    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Details));
+    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Snapshots));
+    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Logs));
+
+    /* 'Machine' action groups: */
+    m_groupPool[UIActionIndexST_M_Machine_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexST_M_Machine_M_Tools));
+    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Details));
+    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Snapshots));
+    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Logs));
 
     /* Prepare update-handlers for known menus: */
@@ -2983 +3004 @@
 
     /* Populate 'Group' / 'Tools' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_S_Details));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_S_Snapshots));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_S_Logs));
+    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Details));
+    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Snapshots));
+    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Logs));
 
     /* Mark menu as valid: */
@@ -3000 +3021 @@
 
     /* Populate 'Machine' / 'Tools' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_S_Details));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_S_Snapshots));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_S_Logs));
+    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Details));
+    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots));
+    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Logs));
 
     /* Mark menu as valid: */
@@ -3236 +3257 @@
                     << action(UIActionIndexST_M_Group_M_Close_S_Shutdown)
                     << action(UIActionIndexST_M_Group_M_Close_S_PowerOff)
-                    << action(UIActionIndexST_M_Group_M_Tools_S_Details)
-                    << action(UIActionIndexST_M_Group_M_Tools_S_Snapshots)
-                    << action(UIActionIndexST_M_Group_M_Tools_S_Logs);
+                    << action(UIActionIndexST_M_Group_M_Tools_T_Details)
+                    << action(UIActionIndexST_M_Group_M_Tools_T_Snapshots)
+                    << action(UIActionIndexST_M_Group_M_Tools_T_Logs);
             break;
         }
@@ -3267 +3288 @@
                     << action(UIActionIndexST_M_Machine_M_Close_S_Shutdown)
                     << action(UIActionIndexST_M_Machine_M_Close_S_PowerOff)
-                    << action(UIActionIndexST_M_Machine_M_Tools_S_Details)
-                    << action(UIActionIndexST_M_Machine_M_Tools_S_Snapshots)
-                    << action(UIActionIndexST_M_Machine_M_Tools_S_Logs);
+                    << action(UIActionIndexST_M_Machine_M_Tools_T_Details)
+                    << action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)
+                    << action(UIActionIndexST_M_Machine_M_Tools_T_Logs);
             break;
         }

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

@@ -74 +74 @@
     UIActionIndexST_M_Group_M_Close_S_PowerOff,
     UIActionIndexST_M_Group_M_Tools,
-    UIActionIndexST_M_Group_M_Tools_S_Details,
-    UIActionIndexST_M_Group_M_Tools_S_Snapshots,
-    UIActionIndexST_M_Group_M_Tools_S_Logs,
+    UIActionIndexST_M_Group_M_Tools_T_Details,
+    UIActionIndexST_M_Group_M_Tools_T_Snapshots,
+    UIActionIndexST_M_Group_M_Tools_T_Logs,
     UIActionIndexST_M_Group_S_Discard,
     UIActionIndexST_M_Group_S_ShowLogDialog,
@@ -105 +105 @@
     UIActionIndexST_M_Machine_M_Close_S_PowerOff,
     UIActionIndexST_M_Machine_M_Tools,
-    UIActionIndexST_M_Machine_M_Tools_S_Details,
-    UIActionIndexST_M_Machine_M_Tools_S_Snapshots,
-    UIActionIndexST_M_Machine_M_Tools_S_Logs,
+    UIActionIndexST_M_Machine_M_Tools_T_Details,
+    UIActionIndexST_M_Machine_M_Tools_T_Snapshots,
+    UIActionIndexST_M_Machine_M_Tools_T_Logs,
     UIActionIndexST_M_Machine_S_Discard,
     UIActionIndexST_M_Machine_S_ShowLogDialog,

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

@@ -1048 +1048 @@
 }
 
-void UIVirtualBoxManager::sltPerformShowMachineToolDetails()
-{
-    m_pWidget->setToolsType(UIToolType_Details);
-}
-
-void UIVirtualBoxManager::sltPerformShowMachineToolSnapshots()
-{
-    m_pWidget->setToolsType(UIToolType_Snapshots);
-}
-
-void UIVirtualBoxManager::sltPerformShowMachineToolLogs()
-{
-    m_pWidget->setToolsType(UIToolType_Logs);
+void UIVirtualBoxManager::sltPerformShowMachineTool(QAction *pAction)
+{
+    AssertPtrReturnVoid(pAction);
+    AssertPtrReturnVoid(m_pWidget);
+    m_pWidget->setToolsType(pAction->property("UIToolType").value<UIToolType>());
 }
 
@@ -1461 +1453 @@
 
     /* 'Group/Tools' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Tools_S_Details), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltPerformShowMachineToolDetails);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Tools_S_Snapshots), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltPerformShowMachineToolSnapshots);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Tools_S_Logs), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltPerformShowMachineToolLogs);
+    connect(actionPool()->actionGroup(UIActionIndexST_M_Group_M_Tools), &QActionGroup::triggered,
+            this, &UIVirtualBoxManager::sltPerformShowMachineTool);
 
     /* 'Machine/Tools' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Tools_S_Details), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltPerformShowMachineToolDetails);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Tools_S_Snapshots), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltPerformShowMachineToolSnapshots);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Tools_S_Logs), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltPerformShowMachineToolLogs);
+    connect(actionPool()->actionGroup(UIActionIndexST_M_Machine_M_Tools), &QActionGroup::triggered,
+            this, &UIVirtualBoxManager::sltPerformShowMachineTool);
 }
 
@@ -1758 +1742 @@
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->retranslateUi();
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->blockSignals(false);
+
+    /* Update action toggle states: */
+    if (m_pWidget)
+    {
+        switch (m_pWidget->currentMachineTool())
+        {
+            case UIToolType_Details:
+            {
+                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Details)->setChecked(true);
+                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Details)->setChecked(true);
+                break;
+            }
+            case UIToolType_Snapshots:
+            {
+                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Snapshots)->setChecked(true);
+                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)->setChecked(true);
+                break;
+            }
+            case UIToolType_Logs:
+            {
+                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Logs)->setChecked(true);
+                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Logs)->setChecked(true);
+                break;
+            }
+            default:
+                break;
+        }
+    }
 }
 

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

@@ -223 +223 @@
         void sltPerformPowerOffMachine();
 
-        /** Handles call to show machine Details tool. */
-        void sltPerformShowMachineToolDetails();
-        /** Handles call to show machine Snapshots tool. */
-        void sltPerformShowMachineToolSnapshots();
-        /** Handles call to show machine Logs tool. */
-        void sltPerformShowMachineToolLogs();
+        /** Handles call to show machine tool corresponding to passed @a pAction. */
+        void sltPerformShowMachineTool(QAction *pAction);
 
         /** Handles call to open machine Log Viewer window. */