Changeset 62143 in vbox for trunk/src

Timestamp:

Jul 8, 2016 4:04:06 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Small rework/cleanup for QIArrowButtonSwitch class: Replacing button state with bool flag, extending an API.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIArrowButtonSwitch.cpp (modified) (6 diffs)
• extensions/QIArrowButtonSwitch.h (modified) (4 diffs)
• extensions/QIArrowSplitter.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 QIArrowButtonSwitch::QIArrowButtonSwitch(QWidget *pParent /* = 0 */)
     : QIRichToolButton(pParent)
-    , m_buttonState(ButtonState_Collapsed)
+    , m_fExpanded(false)
 {
     /* Update icon: */
@@ -37 +37 @@
 }
 
-void QIArrowButtonSwitch::setIconForButtonState(QIArrowButtonSwitch::ButtonState buttonState, const QIcon &icon)
+void QIArrowButtonSwitch::setIcons(const QIcon &iconCollapsed, const QIcon &iconExpanded)
 {
-    /* Assign icon: */
-    m_icons[buttonState] = icon;
+    /* Assign icons: */
+    m_iconCollapsed = iconCollapsed;
+    m_iconExpanded = iconExpanded;
+    /* Update icon: */
+    updateIcon();
+}
+
+void QIArrowButtonSwitch::setExpanded(bool fExpanded)
+{
+    /* Set button state: */
+    m_fExpanded = fExpanded;
     /* Update icon: */
     updateIcon();
@@ -47 +56 @@
 void QIArrowButtonSwitch::sltButtonClicked()
 {
-    /* Toggle button-state: */
-    m_buttonState = m_buttonState == ButtonState_Collapsed ?
-                    ButtonState_Expanded : ButtonState_Collapsed;
+    /* Toggle button state: */
+    m_fExpanded = !m_fExpanded;
     /* Update icon: */
     updateIcon();
@@ -60 +68 @@
     {
         /* Animate-click for the Space key: */
-        case Qt::Key_Minus: if (m_buttonState == ButtonState_Expanded) return animateClick(); break;
-        case Qt::Key_Plus: if (m_buttonState == ButtonState_Collapsed) return animateClick(); break;
+        case Qt::Key_Minus: if (m_fExpanded) return animateClick(); break;
+        case Qt::Key_Plus: if (!m_fExpanded) return animateClick(); break;
         default: break;
     }
@@ -68 +76 @@
 }
 
-void QIArrowButtonSwitch::updateIcon()
-{
-    setIcon(m_icons.value(m_buttonState));
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 
 /* Qt includes: */
-#include <QMap>
 #include <QIcon>
 
@@ -35 +34 @@
 public:
 
-    /** Button states. */
-    enum ButtonState { ButtonState_Collapsed, ButtonState_Expanded };
-
     /** Constructor, passes @a pParent to the QIRichToolButton constructor. */
     QIArrowButtonSwitch(QWidget *pParent = 0);
 
-    /** Defines the @a icon for the @a buttonState. */
-    void setIconForButtonState(ButtonState buttonState, const QIcon &icon);
+    /** Defines the @a iconCollapsed and the @a iconExpanded. */
+    void setIcons(const QIcon &iconCollapsed, const QIcon &iconExpanded);
 
-    /** Returns whether button-state is ButtonState_Expanded. */
-    bool isExpanded() const { return m_buttonState == ButtonState_Expanded; }
+    /** Defines whether the button is @a fExpanded. */
+    void setExpanded(bool fExpanded);
+    /** Returns whether the button is expanded. */
+    bool isExpanded() const { return m_fExpanded; }
 
 protected slots:
@@ -60 +58 @@
 
     /** Updates icon according button-state. */
-    void updateIcon();
+    void updateIcon() { setIcon(m_fExpanded ? m_iconExpanded : m_iconCollapsed); }
 
-    /** Holds the button-state. */
-    ButtonState m_buttonState;
-    /** Holds icons for button-states. */
-    QMap<ButtonState, QIcon> m_icons;
+    /** Holds whether the button is expanded. */
+    bool m_fExpanded;
+
+    /** Holds the icon for collapsed button. */
+    QIcon m_iconCollapsed;
+    /** Holds the icon for expanded button. */
+    QIcon m_iconExpanded;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

@@ -253 +253 @@
                 /* Configure switch-button: */
                 m_pSwitchButton->setIconSize(QSize(iIconMetric, iIconMetric));
-                m_pSwitchButton->setIconForButtonState(QIArrowButtonSwitch::ButtonState_Collapsed,
-                                                       UIIconPool::iconSet(":/arrow_right_10px.png"));
-                m_pSwitchButton->setIconForButtonState(QIArrowButtonSwitch::ButtonState_Expanded,
-                                                       UIIconPool::iconSet(":/arrow_down_10px.png"));
+                m_pSwitchButton->setIcons(UIIconPool::iconSet(":/arrow_right_10px.png"),
+                                          UIIconPool::iconSet(":/arrow_down_10px.png"));
                 connect(m_pSwitchButton, SIGNAL(sigClicked()), this, SLOT(sltUpdateNavigationButtonsVisibility()));
                 connect(m_pSwitchButton, SIGNAL(sigClicked()), this, SLOT(sltUpdateDetailsBrowserVisibility()));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -71 +71 @@
     m_pMACButton->setIcon(UIIconPool::iconSet(":/refresh_16px.png"));
     m_pAdvancedArrow->setIconSize(QSize(iIconMetric, iIconMetric));
-    m_pAdvancedArrow->setIconForButtonState(QIArrowButtonSwitch::ButtonState_Collapsed,
-                                            UIIconPool::iconSet(":/arrow_right_10px.png"));
-    m_pAdvancedArrow->setIconForButtonState(QIArrowButtonSwitch::ButtonState_Expanded,
-                                            UIIconPool::iconSet(":/arrow_down_10px.png"));
+    m_pAdvancedArrow->setIcons(UIIconPool::iconSet(":/arrow_right_10px.png"),
+                               UIIconPool::iconSet(":/arrow_down_10px.png"));
 
     /* Setup connections: */