Changeset 84583 in vbox

Timestamp:

May 28, 2020 11:43:07 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Cleanup/rework for search functionality; Make sure disabled items are disabled even if recreated; Do not create disabled effect for root item; Coding style cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItem.cpp (modified) (4 diffs)
• UIChooserItem.h (modified) (4 diffs)
• UIChooserNode.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp

@@ -42 +42 @@
 #include "iprt/assert.h"
 
-UIChooserDisabledItemEffect::UIChooserDisabledItemEffect(int iBlurRadius, QObject *pParent /* = 0 */)
-    :QGraphicsEffect(pParent)
-    , m_iBlurRadius(iBlurRadius)
-{
-}
-
-void UIChooserDisabledItemEffect::draw(QPainter *painter)
-{
-    QPoint offset;
-    QPixmap pixmap;
-    /* Get the original pixmap: */
-    pixmap = sourcePixmap( Qt::LogicalCoordinates, &offset );
-    QImage resultImage;
-    /* Apply our blur and grayscale filters to the original pixmap: */
-    UIImageTools::blurImage(pixmap.toImage(), resultImage, m_iBlurRadius);
-    pixmap.convertFromImage(UIImageTools::toGray(resultImage));
-    /* Use the filtered pixmap: */
-    painter->drawPixmap( offset, pixmap );
-}
 
 /** QAccessibleObject extension used as an accessibility interface for Chooser-view items. */
@@ -210 +191 @@
     UIChooserItem *item() const { return qobject_cast<UIChooserItem*>(object()); }
 };
+
+
+/*********************************************************************************************************************************
+*   Class UIChooserDisabledItemEffect implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UIChooserDisabledItemEffect::UIChooserDisabledItemEffect(int iBlurRadius, QObject *pParent /* = 0 */)
+    : QGraphicsEffect(pParent)
+    , m_iBlurRadius(iBlurRadius)
+{
+}
+
+void UIChooserDisabledItemEffect::draw(QPainter *pPainter)
+{
+    QPoint offset;
+    QPixmap pixmap;
+    /* Get the original pixmap: */
+    pixmap = sourcePixmap(Qt::LogicalCoordinates, &offset);
+    QImage resultImage;
+    /* Apply our blur and grayscale filters to the original pixmap: */
+    UIImageTools::blurImage(pixmap.toImage(), resultImage, m_iBlurRadius);
+    pixmap.convertFromImage(UIImageTools::toGray(resultImage));
+    /* Use the filtered pixmap: */
+    pPainter->drawPixmap(offset, pixmap);
+}
 
 
@@ -311 +317 @@
             m_pHoveringMachine->start();
         }
-    }
-    /* Allocate the effect instance which we use when the item is marked as disablec: */
-    m_pDisabledEffect = new UIChooserDisabledItemEffect(1 /* Blur Radius */);
-    setGraphicsEffect(m_pDisabledEffect);
-    m_pDisabledEffect->setEnabled(false);
+
+        /* Allocate the effect instance which we use when the item is marked as disabled: */
+        m_pDisabledEffect = new UIChooserDisabledItemEffect(1 /* Blur Radius */);
+        if (m_pDisabledEffect)
+        {
+            setGraphicsEffect(m_pDisabledEffect);
+            m_pDisabledEffect->setEnabled(node()->isDisabled());
+        }
+    }
 }
 
@@ -402 +412 @@
 }
 
-void UIChooserItem::disableEnableItem(bool fDisabled)
+void UIChooserItem::setDisabledEffect(bool fOn)
 {
     if (m_pDisabledEffect)
-        m_pDisabledEffect->setEnabled(fDisabled);
+        m_pDisabledEffect->setEnabled(fOn);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h

@@ -50 +50 @@
 class UIChooserNode;
 
-/** A simple QGraphicsEffect extension to mark disabled UIChooserItems. Applies blur and gray scale filters. */
+
+/** A simple QGraphicsEffect extension to mark disabled UIChooserItem.
+  * @note Applies blur and gray scale filters. */
 class UIChooserDisabledItemEffect : public QGraphicsEffect
 {
@@ -57 +59 @@
 public:
 
+    /** Constructs blur effect passing @a pParent to the base-class.
+      * @param  iBlurRadius  Brings the blur effect radius. */
     UIChooserDisabledItemEffect(int iBlurRadius, QObject *pParent = 0);
 
 protected:
 
-    virtual void draw(QPainter *painter);
+    /** Draws effect with passed @a pPainter. */
+    virtual void draw(QPainter *pPainter);
+
+private:
+
+    /** Holds the blur effect radius. */
     int m_iBlurRadius;
 };
@@ -145 +154 @@
           * @note  Base-class implementation does nothing. */
         virtual void installEventFilterHelper(QObject *pSource) { Q_UNUSED(pSource); }
-        /** Enables the visual effect for disabled item. */
-        void disableEnableItem(bool fDisabled);
+        /** Defines whether visual effect for disabled item is @a fOn. */
+        void setDisabledEffect(bool fOn);
     /** @} */
 
@@ -300 +309 @@
 
         /** Holds whether item is hovered. */
-        bool                m_fHovered;
+        bool                         m_fHovered;
         /** Holds the hovering animation machine instance. */
-        QStateMachine      *m_pHoveringMachine;
+        QStateMachine               *m_pHoveringMachine;
         /** Holds the forward hovering animation instance. */
-        QPropertyAnimation *m_pHoveringAnimationForward;
+        QPropertyAnimation          *m_pHoveringAnimationForward;
         /** Holds the backward hovering animation instance. */
-        QPropertyAnimation *m_pHoveringAnimationBackward;
+        QPropertyAnimation          *m_pHoveringAnimationBackward;
         /** Holds the animation duration. */
-        int                 m_iAnimationDuration;
+        int                          m_iAnimationDuration;
         /** Holds the default animation value. */
-        int                 m_iDefaultValue;
+        int                          m_iDefaultValue;
         /** Holds the hovered animation value. */
-        int                 m_iHoveredValue;
+        int                          m_iHoveredValue;
         /** Holds the animated value. */
-        int                 m_iAnimatedValue;
-        /** Holds the pointer to blur effect instance. */
+        int                          m_iAnimatedValue;
+        /** Holds the blur effect instance. */
         UIChooserDisabledItemEffect *m_pDisabledEffect;
     /** @} */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNode.cpp

@@ -82 +82 @@
     m_fDisabled = fDisabled;
     if (m_pItem)
-        m_pItem->disableEnableItem(m_fDisabled);
+        m_pItem->setDisabledEffect(m_fDisabled);
 }