Changeset 73715 in vbox for trunk/src

Timestamp:

Aug 16, 2018 3:35:27 PM (7 years ago)

Author:

vboxsync

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

124394

Message:

FE/Qt: UIActionPool: Merging polymorph action functionality to UIAction base-class, which allows to have names/icons cached/activated depending on defined action state.

Location:

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

Files:

• UIActionPool.cpp (modified) (4 diffs)
• UIActionPool.h (modified) (8 diffs)

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

@@ -111 +111 @@
     , m_pActionPool(pParent)
     , m_enmActionPoolType(pParent->type())
+    , m_iState(0)
     , m_fShortcutHidden(false)
 {
@@ -129 +130 @@
 }
 
-UIActionPolymorphic *UIAction::toActionPolymorphic()
-{
-    return qobject_cast<UIActionPolymorphic*>(this);
-}
-
 UIActionPolymorphicMenu *UIAction::toActionPolymorphicMenu()
 {
     return qobject_cast<UIActionPolymorphicMenu*>(this);
+}
+
+void UIAction::setIcon(int iState, const QIcon &icon)
+{
+    m_icons.resize(iState + 1);
+    m_icons[iState] = icon;
+    updateIcon();
+}
+
+void UIAction::setIcon(const QIcon &icon)
+{
+    setIcon(0, icon);
 }
 
@@ -189 +197 @@
     /* Nothing by default: */
     return QString();
+}
+
+void UIAction::updateIcon()
+{
+    QAction::setIcon(m_icons.value(m_iState));
 }
 
@@ -316 +329 @@
 {
     setCheckable(true);
-}
-
-
-/*********************************************************************************************************************************
-*   Class UIActionPolymorphic implementation.                                                                                    *
-*********************************************************************************************************************************/
-
-UIActionPolymorphic::UIActionPolymorphic(UIActionPool *pParent,
-                                         const QString &strIcon /* = QString() */, const QString &strIconDisabled /* = QString() */)
-    : UIAction(pParent, UIActionType_Polymorphic)
-    , m_iState(0)
-{
-    if (!strIcon.isNull())
-        setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
-}
-
-UIActionPolymorphic::UIActionPolymorphic(UIActionPool *pParent,
-                                         const QString &strIconNormal, const QString &strIconSmall,
-                                         const QString &strIconNormalDisabled, const QString &strIconSmallDisabled)
-    : UIAction(pParent, UIActionType_Polymorphic)
-    , m_iState(0)
-{
-    setIcon(UIIconPool::iconSetFull(strIconNormal, strIconSmall, strIconNormalDisabled, strIconSmallDisabled));
-}
-
-UIActionPolymorphic::UIActionPolymorphic(UIActionPool *pParent,
-                                         const QIcon& icon)
-    : UIAction(pParent, UIActionType_Polymorphic)
-    , m_iState(0)
-{
-    if (!icon.isNull())
-        setIcon(icon);
 }
 

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

@@ -22 +22 @@
 #include <QAction>
 #include <QMenu>
+#include <QVector>
 
 /* GUI includes: */
@@ -31 +32 @@
 class QKeySequence;
 class QString;
-class UIActionPolymorphic;
 class UIActionPolymorphicMenu;
 class UIActionPool;
@@ -170 +170 @@
     UIActionPool *actionPool() const { return m_pActionPool; }
 
-    /** Casts action to polymorphic-action. */
-    UIActionPolymorphic *toActionPolymorphic();
     /** Casts action to polymorphic-menu-action. */
     UIActionPolymorphicMenu *toActionPolymorphicMenu();
+
+    /** Returns current action state. */
+    int state() const { return m_iState; }
+    /** Defines current action @a iState. */
+    void setState(int iState) { m_iState = iState; updateIcon(); retranslateUi(); }
+
+    /** Defines @a icon for certain @a iState. */
+    void setIcon(int iState, const QIcon &icon);
+    /** Defines @a icon. */
+    void setIcon(const QIcon &icon);
 
     /** Returns current action name. */
@@ -201 +209 @@
     /** Retranslates action. */
     virtual void retranslateUi() = 0;
+    /** Destructs action. */
     virtual ~UIAction() /* override */ { delete menu(); }
 
@@ -211 +220 @@
     /** Returns current action name in menu. */
     QString nameInMenu() const;
+
+    /** Updates action icon. */
+    virtual void updateIcon();
 
     /** Updates action text accordingly. */
@@ -225 +237 @@
     UIActionPoolType  m_enmActionPoolType;
 
+    /** Holds current action state. */
+    int             m_iState;
+    /** Holds action icons. */
+    QVector<QIcon>  m_icons;
     /** Holds the action name. */
-    QString       m_strName;
+    QString         m_strName;
     /** Holds the action shortcut. */
-    QKeySequence  m_shortcut;
+    QKeySequence    m_shortcut;
     /** Holds whether action shortcut hidden. */
-    bool          m_fShortcutHidden;
+    bool            m_fShortcutHidden;
 };
 
@@ -289 +305 @@
       * @param  icon  Brings the icon. */
     UIActionSimple(UIActionPool *pParent,
-                   const QIcon& icon);
+                   const QIcon &icon);
 };
 
@@ -325 +341 @@
 
 
-/** Abstract UIAction extension for 'Polymorphic' action type. */
-class SHARED_LIBRARY_STUFF UIActionPolymorphic : public UIAction
-{
-    Q_OBJECT;
-
-public:
-
-    /** Returns current action state. */
-    int state() const { return m_iState; }
-    /** Defines current action state. */
-    void setState(int iState) { m_iState = iState; retranslateUi(); }
-
-protected:
-
-    /** Constructs polymorphic action passing @a pParent to the base-class.
-      * @param  strIcon          Brings the normal-icon name.
-      * @param  strIconDisabled  Brings the disabled-icon name. */
-    UIActionPolymorphic(UIActionPool *pParent,
-                        const QString &strIcon = QString(), const QString &strIconDisabled = QString());
-    /** Constructs polymorphic 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. */
-    UIActionPolymorphic(UIActionPool *pParent,
-                        const QString &strIconNormal, const QString &strIconSmall,
-                        const QString &strIconNormalDisabled, const QString &strIconSmallDisabled);
-    /** Constructs polymorphic action passing @a pParent to the base-class.
-      * @param  icon  Brings the icon. */
-    UIActionPolymorphic(UIActionPool *pParent,
-                        const QIcon& icon);
-
-private:
-
-    /** Holds current action state. */
-    int m_iState;
-};
-
-
 /** Abstract UIAction extension for 'Polymorphic Menu' action type. */
 class SHARED_LIBRARY_STUFF UIActionPolymorphicMenu : public UIAction