Changeset 87513 in vbox

Timestamp:

Feb 1, 2021 3:59:46 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9917: Throwing UIToolType action property to corresponding place in Manager's action pool.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (6 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)

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

@@ -72 +72 @@
     UIActionSimpleManagerFileShowExtensionPackManager(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/extension_pack_manager_16px.png", ":/extension_pack_manager_disabled_16px.png")
-    {}
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Extensions));
+    }
 
 protected:
@@ -106 +108 @@
     UIActionSimpleManagerFileShowVirtualMediaManager(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/media_manager_16px.png", ":/media_manager_disabled_16px.png")
-    {}
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Media));
+    }
 
 protected:
@@ -140 +144 @@
     UIActionSimpleManagerFileShowHostNetworkManager(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/host_iface_manager_16px.png", ":/host_iface_manager_disabled_16px.png")
-    {}
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Network));
+    }
 
 protected:
@@ -174 +180 @@
     UIActionSimpleManagerFileShowCloudProfileManager(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/cloud_profile_manager_16px.png", ":/cloud_profile_manager_disabled_16px.png")
-    {}
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_Cloud));
+    }
 
 protected:
@@ -1613 +1621 @@
                          ":/cloud_machine_console_configure_external_terminal_16px.png",
                          ":/cloud_machine_console_configure_external_terminal_disabled_16px.png")
-    {}
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_CloudConsole));
+    }
 
 protected:
@@ -4118 +4128 @@
     pMenu->clear();
 
-    /* Populate Welcome menu: */
+    /* Populate 'Welcome' menu: */
     pMenu->addAction(action(UIActionIndexMN_M_Welcome_S_New));
     pMenu->addAction(action(UIActionIndexMN_M_Welcome_S_Add));

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

@@ -751 +751 @@
             UIAction *pAction = qobject_cast<UIAction*>(sender());
             AssertPtrReturnVoid(pAction);
-            enmType = pAction->property("toolType").value<UIToolType>();
+            enmType = pAction->property("UIToolType").value<UIToolType>();
         }
     }
@@ -2230 +2230 @@
     /* Setup menu-bar policy: */
     menuBar()->setContextMenuPolicy(Qt::CustomContextMenu);
-
-    /* Assign actions with corresponding tool types: */
-    actionPool()->action(UIActionIndexMN_M_File_S_ShowExtensionPackManager)->setProperty("toolType", QVariant::fromValue(UIToolType_Extensions));
-    actionPool()->action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager)->setProperty("toolType", QVariant::fromValue(UIToolType_Media));
-    actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager)->setProperty("toolType", QVariant::fromValue(UIToolType_Network));
-    actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager)->setProperty("toolType", QVariant::fromValue(UIToolType_Cloud));
-    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications)->setProperty("toolType", QVariant::fromValue(UIToolType_CloudConsole));
-    actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications)->setProperty("toolType", QVariant::fromValue(UIToolType_CloudConsole));
 }