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

Timestamp:

Dec 18, 2024 1:13:22 PM (4 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Continue with the code intentionally missing in r166364; Machines global tool is now shown for the advanced widget architecture.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (4 diffs)
• globals/UIActionPoolManager.h (modified) (1 diff)
• manager/tools/UIToolsModel.cpp (modified) (3 diffs)
• manager/tools/UIToolsModel.h (modified) (1 diff)

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

@@ -394 +394 @@
 };
 
+/** Simple action extension, used as 'Machine Manager' action class. */
+class UIActionToggleManagerToolsGlobalShowMachineManager : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleManagerToolsGlobalShowMachineManager(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Machines));
+        /// @todo use icons with check-boxes
+        setIcon(UIIconPool::iconSetFull(":/machine_24px.png", ":/machine_16px.png""));
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("ToolsGlobalMachineManager");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "&Machine Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the Machine Manager"));
+    }
+};
+
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 /** Simple action extension, used as 'Show Extra-data Manager' action class. */
@@ -3501 +3533 @@
     m_pool[UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager] = new UIActionToggleManagerToolsGlobalShowCloudProfileManager(this);
     m_pool[UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview] = new UIActionToggleManagerToolsGlobalShowVMActivityOverview(this);
+    m_pool[UIActionIndexMN_M_File_M_Tools_T_MachineManager] = new UIActionToggleManagerToolsGlobalShowMachineManager(this);
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     m_pool[UIActionIndexMN_M_File_S_ShowExtraDataManager] = new UIActionSimpleManagerFileShowExtraDataManager(this);
@@ -3660 +3693 @@
     m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager));
     m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview));
+    m_groupPool[UIActionIndexMN_M_File_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_File_M_Tools_T_MachineManager));
 
     /* 'Group' action groups: */
@@ -4030 +4064 @@
     pMenu->addAction(action(UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager));
     pMenu->addAction(action(UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview));
+    //pMenu->addAction(action(UIActionIndexMN_M_File_M_Tools_T_MachineManager));
 
     /* Mark menu as valid: */

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

@@ -56 +56 @@
     UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager,
     UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview,
+    UIActionIndexMN_M_File_M_Tools_T_MachineManager,
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     UIActionIndexMN_M_File_S_ShowExtraDataManager,

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -234 +234 @@
     actions[UIToolType_Cloud] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager);
     actions[UIToolType_Activities] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview);
+#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
+    actions[UIToolType_Machines] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_MachineManager);
+#endif
     if (actions.contains(enmType))
         actions.value(enmType)->setChecked(true);
@@ -427 +430 @@
             case UIToolType_Cloud:       pItem->reconfigure(tr("Cloud")); break;
             case UIToolType_Activities:  pItem->reconfigure(tr("Activities")); break;
+#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
+            case UIToolType_Machines:    pItem->reconfigure(tr("Machines")); break;
+#endif
             case UIToolType_Details:     pItem->reconfigure(tr("Details")); break;
             case UIToolType_Snapshots:   pItem->reconfigure(tr("Snapshots")); break;
@@ -499 +505 @@
                                        UIIconPool::iconSet(":/resources_monitor_24px.png",
                                                            ":/resources_monitor_disabled_24px.png"));
+
+#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
+            /* Machines: */
+            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Machines, QString(),
+                                       UIIconPool::iconSet(":/machine_details_manager_24px.png",
+                                                           ":/machine_details_manager_disabled_24px.png"));
+#endif
 
             break;

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -39 +39 @@
 
 /* GUI includes: */
+#include "UIManagerDefs.h"
 #include "UIToolsItem.h"