Changeset 108286 in vbox

Timestamp:

Feb 19, 2025 10:54:23 AM (2 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167629

Message:

FE/Qt: bugref:10814: VBox Manager / Tool-pane: Handle undefined tool type for tool model; This will create a list of all tools, global and machine in the same toolbar.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp (modified) (1 diff)

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

@@ -437 +437 @@
 void UIToolsModel::prepareItems()
 {
-    /* Depending on tool class: */
-    switch (m_enmClass)
-    {
-        case UIToolClass_Global:
-        {
-            /* Home: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/welcome_screen_24px.png",
-                                                                    ":/welcome_screen_24px.png"),
-                                       UIToolClass_Global, UIToolType_Home);
-
-            /* Machines: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/machine_details_manager_24px.png",
-                                                                    ":/machine_details_manager_disabled_24px.png"),
-                                       UIToolClass_Global, UIToolType_Machines);
-
-            /* Extensions: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/extension_pack_manager_24px.png",
-                                                                    ":/extension_pack_manager_disabled_24px.png"),
-                                       UIToolClass_Global, UIToolType_Extensions);
-
-            /* Media: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/media_manager_24px.png",
-                                                                    ":/media_manager_disabled_24px.png"),
-                                       UIToolClass_Global, UIToolType_Media);
-
-            /* Network: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/host_iface_manager_24px.png",
-                                                                    ":/host_iface_manager_disabled_24px.png"),
-                                       UIToolClass_Global, UIToolType_Network);
-
-            /* Cloud: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/cloud_profile_manager_24px.png",
-                                                                    ":/cloud_profile_manager_disabled_24px.png"),
-                                       UIToolClass_Global, UIToolType_Cloud);
-
-            /* Activities: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/resources_monitor_24px.png",
-                                                                    ":/resources_monitor_disabled_24px.png"),
-                                       UIToolClass_Global, UIToolType_Activities);
-
-            /* Toggle: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/tools_menu_24px.png",
-                                                                    ":/tools_menu_24px.png"),
-                                       UIToolClass_Aux, UIToolType_Toggle);
-
-            break;
-        }
-        case UIToolClass_Machine:
-        {
-            /* Details: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/machine_details_manager_24px.png",
-                                                                    ":/machine_details_manager_disabled_24px.png"),
-                                       UIToolClass_Machine, UIToolType_Details);
-
-            /* Snapshots: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/snapshot_manager_24px.png",
-                                                                    ":/snapshot_manager_disabled_24px.png"),
-                                       UIToolClass_Machine, UIToolType_Snapshots);
-
-            /* Logs: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/vm_show_logs_24px.png",
-                                                                    ":/vm_show_logs_disabled_24px.png"),
-                                       UIToolClass_Machine, UIToolType_Logs);
-
-            /* Activity: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/performance_monitor_24px.png",
-                                                                    ":/performance_monitor_disabled_24px.png"),
-                                       UIToolClass_Machine, UIToolType_VMActivity);
-
-            /* File Manager: */
-            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/file_manager_24px.png",
-                                                                    ":/file_manager_disabled_24px.png"),
-                                       UIToolClass_Machine, UIToolType_FileManager);
-
-            break;
-        }
-        default:
-            break;
+    if (   m_enmClass == UIToolClass_Global
+        || m_enmClass == UIToolClass_Invalid)
+    {
+        /* Home: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/welcome_screen_24px.png",
+                                                                ":/welcome_screen_24px.png"),
+                                   UIToolClass_Global, UIToolType_Home);
+
+        /* Machines: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/machine_details_manager_24px.png",
+                                                                ":/machine_details_manager_disabled_24px.png"),
+                                   UIToolClass_Global, UIToolType_Machines);
+    }
+
+    if (   m_enmClass == UIToolClass_Machine
+        || m_enmClass == UIToolClass_Invalid)
+    {
+        /* Details: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/machine_details_manager_24px.png",
+                                                                ":/machine_details_manager_disabled_24px.png"),
+                                   UIToolClass_Machine, UIToolType_Details);
+
+        /* Snapshots: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/snapshot_manager_24px.png",
+                                                                ":/snapshot_manager_disabled_24px.png"),
+                                   UIToolClass_Machine, UIToolType_Snapshots);
+
+        /* Logs: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/vm_show_logs_24px.png",
+                                                                ":/vm_show_logs_disabled_24px.png"),
+                                   UIToolClass_Machine, UIToolType_Logs);
+
+        /* Activity: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/performance_monitor_24px.png",
+                                                                ":/performance_monitor_disabled_24px.png"),
+                                   UIToolClass_Machine, UIToolType_VMActivity);
+
+        /* File Manager: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/file_manager_24px.png",
+                                                                ":/file_manager_disabled_24px.png"),
+                                   UIToolClass_Machine, UIToolType_FileManager);
+    }
+
+    if (   m_enmClass == UIToolClass_Global
+        || m_enmClass == UIToolClass_Invalid)
+    {
+        /* Extensions: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/extension_pack_manager_24px.png",
+                                                                ":/extension_pack_manager_disabled_24px.png"),
+                                   UIToolClass_Global, UIToolType_Extensions);
+
+        /* Media: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/media_manager_24px.png",
+                                                                ":/media_manager_disabled_24px.png"),
+                                   UIToolClass_Global, UIToolType_Media);
+
+        /* Network: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/host_iface_manager_24px.png",
+                                                                ":/host_iface_manager_disabled_24px.png"),
+                                   UIToolClass_Global, UIToolType_Network);
+
+        /* Cloud: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/cloud_profile_manager_24px.png",
+                                                                ":/cloud_profile_manager_disabled_24px.png"),
+                                   UIToolClass_Global, UIToolType_Cloud);
+
+        /* Activities: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/resources_monitor_24px.png",
+                                                                ":/resources_monitor_disabled_24px.png"),
+                                   UIToolClass_Global, UIToolType_Activities);
+
+        /* Toggle: */
+        m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/tools_menu_24px.png",
+                                                                ":/tools_menu_24px.png"),
+                                   UIToolClass_Aux, UIToolType_Toggle);
     }
 }