Changeset 85610 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 5, 2020 10:14:37 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9609: Few action-pool fixes: Extending menu-actions with possibility to be constructed with full icon; Check for a null passed icon or names in missed places.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPool.cpp (modified) (6 diffs)
• UIActionPool.h (modified) (1 diff)

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

@@ -244 +244 @@
 
 UIActionMenu::UIActionMenu(UIActionPool *pParent,
+                           const QString &strIconNormal, const QString &strIconSmall,
+                           const QString &strIconNormalDisabled, const QString &strIconSmallDisabled)
+    : UIAction(pParent, UIActionType_Menu)
+{
+    if (!strIconNormal.isNull())
+        setIcon(UIIconPool::iconSetFull(strIconNormal, strIconSmall, strIconNormalDisabled, strIconSmallDisabled));
+    prepare();
+}
+
+UIActionMenu::UIActionMenu(UIActionPool *pParent,
                            const QIcon &icon)
     : UIAction(pParent, UIActionType_Menu)
@@ -290 +300 @@
     : UIAction(pParent, UIActionType_Simple, fMachineMenuAction)
 {
-    setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
+    if (!strIcon.isNull())
+        setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
 }
 
@@ -299 +310 @@
     : UIAction(pParent, UIActionType_Simple, fMachineMenuAction)
 {
-    setIcon(UIIconPool::iconSetFull(strIconNormal, strIconSmall, strIconNormalDisabled, strIconSmallDisabled));
+    if (!strIconNormal.isNull())
+        setIcon(UIIconPool::iconSetFull(strIconNormal, strIconSmall, strIconNormalDisabled, strIconSmallDisabled));
 }
 
@@ -307 +319 @@
     : UIAction(pParent, UIActionType_Simple, fMachineMenuAction)
 {
-    setIcon(icon);
+    if (!icon.isNull())
+        setIcon(icon);
 }
 
@@ -327 +340 @@
     : UIAction(pParent, UIActionType_Toggle, fMachineMenuAction)
 {
-    setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
+    if (!strIcon.isNull())
+        setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
     prepare();
 }
@@ -337 +351 @@
     : UIAction(pParent, UIActionType_Toggle, fMachineMenuAction)
 {
-    setIcon(UIIconPool::iconSetOnOff(strIconOn, strIconOff, strIconOnDisabled, strIconOffDisabled));
+    if (!strIconOn.isNull())
+        setIcon(UIIconPool::iconSetOnOff(strIconOn, strIconOff, strIconOnDisabled, strIconOffDisabled));
     prepare();
 }

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

@@ -324 +324 @@
                  const QString &strIconDisabled = QString());
     /** Constructs menu action passing @a pParent to the base-class.
+      * @param  strIconNormal          Brings the normal-icon name.
+      * @param  strIconSmall           Brings the small-icon name.
+      * @param  strIconNormalDisabled  Brings the normal-disabled-icon name.
+      * @param  strIconSmallDisabled   Brings the small-disabled-icon name. */
+    UIActionMenu(UIActionPool *pParent,
+                 const QString &strIconNormal, const QString &strIconSmall,
+                 const QString &strIconNormalDisabled, const QString &strIconSmallDisabled);
+    /** Constructs menu action passing @a pParent to the base-class.
       * @param  icon  Brings the icon. */
     UIActionMenu(UIActionPool *pParent,