Changeset 107976 in vbox

Timestamp:

Jan 29, 2025 11:27:13 AM (3 weeks ago)

Author:

vboxsync

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

167239

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Small refactoring for tool item class; Required because there will be more tool item types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsItem.cpp (modified) (1 diff)
• UIToolsItem.h (modified) (1 diff)
• UIToolsModel.cpp (modified) (2 diffs)

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

@@ -186 +186 @@
 
 UIToolsItem::UIToolsItem(QGraphicsScene *pScene,
-                         UIToolClass enmClass, UIToolType enmType,
-                         const QString &strName, const QIcon &icon)
+                         const QString &strName, const QIcon &icon,
+                         UIToolClass enmClass, UIToolType enmType)
     : m_pScene(pScene)
     , m_enmClass(enmClass)

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

@@ -85 +85 @@
     /** Constructs item on the basis of passed arguments.
       * @param  pScene   Brings the scene reference to add item to.
+      * @param  strName  Brings the item name.
+      * @param  icon     Brings the item icon.
       * @param  enmClass Brings the item class.
-      * @param  enmType  Brings the item type.
-      * @param  strName  Brings the item name.
-      * @param  icon     Brings the item icon. */
+      * @param  enmType  Brings the item type. */
     UIToolsItem(QGraphicsScene *pScene,
-                UIToolClass enmClass, UIToolType enmType,
-                const QString &strName, const QIcon &icon);
+                const QString &strName, const QIcon &icon,
+                UIToolClass enmClass, UIToolType enmType);
     /** Destructs item. */
     virtual ~UIToolsItem() RT_OVERRIDE;

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

@@ -494 +494 @@
         {
             /* Welcome: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Welcome, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/welcome_screen_24px.png",
-                                                           ":/welcome_screen_24px.png"));
+                                                           ":/welcome_screen_24px.png"),
+                                       UIToolClass_Global, UIToolType_Welcome);
 
             /* Extensions: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Extensions, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/extension_pack_manager_24px.png",
-                                                           ":/extension_pack_manager_disabled_24px.png"));
+                                                           ":/extension_pack_manager_disabled_24px.png"),
+                                       UIToolClass_Global, UIToolType_Extensions);
 
             /* Media: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Media, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/media_manager_24px.png",
-                                                           ":/media_manager_disabled_24px.png"));
+                                                           ":/media_manager_disabled_24px.png"),
+                                       UIToolClass_Global, UIToolType_Media);
 
             /* Network: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Network, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/host_iface_manager_24px.png",
-                                                           ":/host_iface_manager_disabled_24px.png"));
+                                                           ":/host_iface_manager_disabled_24px.png"),
+                                       UIToolClass_Global, UIToolType_Network);
 
             /* Cloud: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/cloud_profile_manager_24px.png",
-                                                           ":/cloud_profile_manager_disabled_24px.png"));
+                                                           ":/cloud_profile_manager_disabled_24px.png"),
+                                       UIToolClass_Global, UIToolType_Cloud);
 
             /* Activities: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Activities, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/resources_monitor_24px.png",
-                                                           ":/resources_monitor_disabled_24px.png"));
+                                                           ":/resources_monitor_disabled_24px.png"),
+                                       UIToolClass_Global, UIToolType_Activities);
 
 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
             /* Machines: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Machines, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/machine_details_manager_24px.png",
-                                                           ":/machine_details_manager_disabled_24px.png"));
+                                                           ":/machine_details_manager_disabled_24px.png"),
+                                       UIToolClass_Global, UIToolType_Machines);
 #endif
 
@@ -535 +542 @@
         {
             /* Details: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Details, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/machine_details_manager_24px.png",
-                                                           ":/machine_details_manager_disabled_24px.png"));
+                                                           ":/machine_details_manager_disabled_24px.png"),
+                                       UIToolClass_Machine, UIToolType_Details);
 
             /* Snapshots: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Snapshots, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/snapshot_manager_24px.png",
-                                                           ":/snapshot_manager_disabled_24px.png"));
+                                                           ":/snapshot_manager_disabled_24px.png"),
+                                       UIToolClass_Machine, UIToolType_Snapshots);
 
             /* Logs: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Logs, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/vm_show_logs_24px.png",
-                                                           ":/vm_show_logs_disabled_24px.png"));
+                                                           ":/vm_show_logs_disabled_24px.png"),
+                                       UIToolClass_Machine, UIToolType_Logs);
 
             /* Activity: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_VMActivity, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/performance_monitor_24px.png",
-                                                           ":/performance_monitor_disabled_24px.png"));
+                                                           ":/performance_monitor_disabled_24px.png"),
+                                       UIToolClass_Machine, UIToolType_VMActivity);
 
             /* File Manager: */
-            m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_FileManager, QString(),
+            m_items << new UIToolsItem(scene(), QString(),
                                        UIIconPool::iconSet(":/file_manager_24px.png",
-                                                           ":/file_manager_disabled_24px.png"));
+                                                           ":/file_manager_disabled_24px.png"),
+                                       UIToolClass_Machine, UIToolType_FileManager);
 
             break;