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

Timestamp:

Jan 29, 2025 12:00:56 PM (3 months ago)

Author:

vboxsync

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

167242

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: More refactoring for item class as name isn't required at all, it's determined by the tool item class/type, s.a. r167239.

Location:

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

Files:

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

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

@@ -185 +185 @@
 *********************************************************************************************************************************/
 
-UIToolsItem::UIToolsItem(QGraphicsScene *pScene,
-                         const QString &strName, const QIcon &icon,
+UIToolsItem::UIToolsItem(QGraphicsScene *pScene, const QIcon &icon,
                          UIToolClass enmClass, UIToolType enmType)
     : m_pScene(pScene)
@@ -192 +191 @@
     , m_enmType(enmType)
     , m_icon(icon)
-    , m_strName(strName)
     , m_fHovered(false)
     , m_pHoveringMachine(0)

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. */
-    UIToolsItem(QGraphicsScene *pScene,
-                const QString &strName, const QIcon &icon,
+    UIToolsItem(QGraphicsScene *pScene, const QIcon &icon,
                 UIToolClass enmClass, UIToolType enmType);
     /** Destructs item. */

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

@@ -494 +494 @@
         {
             /* Welcome: */
-            m_items << new UIToolsItem(scene(), QString(),
-                                       UIIconPool::iconSet(":/welcome_screen_24px.png",
-                                                           ":/welcome_screen_24px.png"),
+            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/welcome_screen_24px.png",
+                                                                    ":/welcome_screen_24px.png"),
                                        UIToolClass_Global, UIToolType_Welcome);
 
             /* Extensions: */
-            m_items << new UIToolsItem(scene(), QString(),
-                                       UIIconPool::iconSet(":/extension_pack_manager_24px.png",
-                                                           ":/extension_pack_manager_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/media_manager_24px.png",
-                                                           ":/media_manager_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/host_iface_manager_24px.png",
-                                                           ":/host_iface_manager_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/cloud_profile_manager_24px.png",
-                                                           ":/cloud_profile_manager_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/resources_monitor_24px.png",
-                                                           ":/resources_monitor_disabled_24px.png"),
+            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/resources_monitor_24px.png",
+                                                                    ":/resources_monitor_disabled_24px.png"),
                                        UIToolClass_Global, UIToolType_Activities);
 
 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
             /* Machines: */
-            m_items << new UIToolsItem(scene(), QString(),
-                                       UIIconPool::iconSet(":/machine_details_manager_24px.png",
-                                                           ":/machine_details_manager_disabled_24px.png"),
+            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/machine_details_manager_24px.png",
+                                                                    ":/machine_details_manager_disabled_24px.png"),
                                        UIToolClass_Global, UIToolType_Machines);
 #endif
@@ -542 +535 @@
         {
             /* Details: */
-            m_items << new UIToolsItem(scene(), QString(),
-                                       UIIconPool::iconSet(":/machine_details_manager_24px.png",
-                                                           ":/machine_details_manager_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/snapshot_manager_24px.png",
-                                                           ":/snapshot_manager_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/vm_show_logs_24px.png",
-                                                           ":/vm_show_logs_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/performance_monitor_24px.png",
-                                                           ":/performance_monitor_disabled_24px.png"),
+            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(), QString(),
-                                       UIIconPool::iconSet(":/file_manager_24px.png",
-                                                           ":/file_manager_disabled_24px.png"),
+            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/file_manager_24px.png",
+                                                                    ":/file_manager_disabled_24px.png"),
                                        UIToolClass_Machine, UIToolType_FileManager);