Changeset 77701 in vbox for trunk

Timestamp:

Mar 14, 2019 11:57:06 AM (6 years ago)

Author:

vboxsync

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

129342

Message:

FE/Qt: bugref:9378. Marking matched chooser pane machine items visually.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIImageTools.cpp (modified) (5 diffs)
• globals/UIImageTools.h (modified) (1 diff)
• manager/chooser/UIChooserItem.cpp (modified) (4 diffs)
• manager/chooser/UIChooserItem.h (modified) (4 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• manager/chooser/UIChooserNode.cpp (modified) (2 diffs)
• manager/chooser/UIChooserNode.h (modified) (2 diffs)
• manager/chooser/UIChooserNodeGlobal.cpp (modified) (1 diff)
• manager/chooser/UIChooserNodeGroup.cpp (modified) (3 diffs)
• manager/chooser/UIChooserNodeMachine.cpp (modified) (1 diff)

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

@@ -73 +73 @@
 }
 
-void UIImageTools::blurImage(const QImage &source, QImage &destinatiion, int iRadius)
+void UIImageTools::blurImage(const QImage &source, QImage &destination, int iRadius)
 {
     /* Blur in two steps, first horizontal and then vertical: */
     QImage tmpImage(source.size(), QImage::Format_ARGB32);
     blurImageHorizontal(source, tmpImage, iRadius);
-    blurImageVertical(tmpImage, destinatiion, iRadius);
-}
-
-void UIImageTools::blurImageHorizontal(const QImage &source, QImage &destinatiion, int iRadius)
+    blurImageVertical(tmpImage, destination, iRadius);
+}
+
+void UIImageTools::blurImageHorizontal(const QImage &source, QImage &destination, int iRadius)
 {
     QSize s = source.size();
@@ -95 +95 @@
          * method. Unfortunately this doesn't work in the vertical case. */
         QRgb *ssl = (QRgb*)source.scanLine(y);
-        QRgb *dsl = (QRgb*)destinatiion.scanLine(y);
+        QRgb *dsl = (QRgb*)destination.scanLine(y);
         /* First process the horizontal zero line at once: */
         int b = iRadius + 1;
@@ -143 +143 @@
 }
 
-void UIImageTools::blurImageVertical(const QImage &source, QImage &destinatiion, int iRadius)
+void UIImageTools::blurImageVertical(const QImage &source, QImage &destination, int iRadius)
 {
     QSize s = source.size();
+    destination = QImage(s, source.format());
     for (int x = 0; x < s.width(); ++x)
     {
@@ -164 +165 @@
         }
         /* Set the new weighted pixel: */
-        destinatiion.setPixel(x, 0, qRgba(rt / b, gt / b, bt / b, at / b));
+        destination.setPixel(x, 0, qRgba(rt / b, gt / b, bt / b, at / b));
 
         /* Now process the rest: */
@@ -193 +194 @@
             }
             /* Set the new weighted pixel: */
-            destinatiion.setPixel(x, y, qRgba(rt / b, gt / b, bt / b, at / b));
+            destination.setPixel(x, y, qRgba(rt / b, gt / b, bt / b, at / b));
         }
     }

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

@@ -39 +39 @@
 
     /** Blurs passed @a source image to @a destination cropping by certain @a iRadius. */
-    void blurImage(const QImage &source, QImage &destination, int iRadius);
+    SHARED_LIBRARY_STUFF void blurImage(const QImage &source, QImage &destination, int iRadius);
     /** Blurs passed @a source image horizontally to @a destination cropping by certain @a iRadius. */
-    void blurImageHorizontal(const QImage &source, QImage &destination, int iRadius);
+    SHARED_LIBRARY_STUFF void blurImageHorizontal(const QImage &source, QImage &destination, int iRadius);
     /** Blurs passed @a source image vertically to @a destination cropping by certain @a iRadius. */
-    void blurImageVertical(const QImage &source, QImage &destination, int iRadius);
+    SHARED_LIBRARY_STUFF void blurImageVertical(const QImage &source, QImage &destination, int iRadius);
 
     /** Applies BET-label of passed @a size. */

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

@@ -38 +38 @@
 #include "UIChooserModel.h"
 #include "UIChooserNode.h"
+#include "UIImageTools.h"
 
 /* Other VBox includes: */
 #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. */
@@ -211 +231 @@
     , m_iHoveredValue(iHoveredValue)
     , m_iAnimatedValue(m_iDefaultValue)
+    , m_pDisabledEffect(0)
     , m_iPreviousMinimumWidthHint(0)
     , m_enmDragTokenPlace(UIChooserItemDragToken_Off)
@@ -294 +315 @@
         }
     }
+    /* 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);
 }
 
@@ -405 +430 @@
     else
         emit sigHoverLeave();
+}
+
+void UIChooserItem::disableEnableItem(bool fDisabled)
+{
+    if (m_pDisabledEffect)
+        m_pDisabledEffect->setEnabled(fDisabled);
 }
 

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

@@ -23 +23 @@
 
 /* Qt includes: */
+#include <QGraphicsEffect>
 #include <QMimeData>
 #include <QRectF>
@@ -49 +50 @@
 class UIChooserNode;
 
+/** A simple QGraphicsEffect extension to mark disabled UIChooserItems. Applies blur and gray scale filters. */
+class UIChooserDisabledItemEffect : public QGraphicsEffect
+{
+    Q_OBJECT;
+
+public:
+
+    UIChooserDisabledItemEffect(int iBlurRadius, QObject *pParent = 0);
+
+protected:
+
+    virtual void draw(QPainter *painter);
+    int m_iBlurRadius;
+};
+
 
 /** QIGraphicsWidget extension used as interface
@@ -142 +158 @@
           * @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);
     /** @} */
 
@@ -318 +336 @@
         /** Holds the animated value. */
         int                 m_iAnimatedValue;
+        /** Holds the pointer to blur effect instance. */
+        UIChooserDisabledItemEffect *m_pDisabledEffect;
     /** @} */
 

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

@@ -454 +454 @@
 void UIChooserModel::performSearch(const QString &strSearchTerm, int iItemSearchFlags)
 {
-    if (!m_pInvisibleRootNode || strSearchTerm.isEmpty())
-        return;
-
-    QList<UIChooserNode*> matchedItems;
-    m_pInvisibleRootNode->searchForNodes(strSearchTerm, iItemSearchFlags, matchedItems);
+    if (!m_pInvisibleRootNode)
+        return;
+
+    /* Currently we perform the search only for machines. when this to be changed make sure the disabled flags
+       of the other item types are also managed correctly: */
+    QList<UIChooserNode*> allNodes;
+    /* Calling UIChooserNode::searchForNodes with an empty search string returns a list all nodes (of the whole treee) of the required type: */
+    m_pInvisibleRootNode->searchForNodes(QString(), iItemSearchFlags, allNodes);
+
+    /* Reset the disabled flag of the node items first. */
+    foreach (UIChooserNode* pNode, allNodes)
+    {
+        if (!pNode)
+            continue;
+        pNode->setDisabled(false);
+    }
+
+    if (strSearchTerm.isEmpty())
+        return;
+
+    QList<UIChooserNode*> matchedNodes;
+    m_pInvisibleRootNode->searchForNodes(strSearchTerm, iItemSearchFlags, matchedNodes);
+
+    foreach (UIChooserNode* pNode, allNodes)
+    {
+        if (!pNode)
+            continue;
+        pNode->setDisabled(!matchedNodes.contains(pNode));
+    }
 }
 

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

@@ -27 +27 @@
     , m_pParent(pParent)
     , m_fFavorite(fFavorite)
+    , m_fDisabled(false)
 {
 }
@@ -55 +56 @@
     return parentNode() ? parentNode()->positionOf(this) : 0;
 }
+
+bool UIChooserNode::isDisabled() const
+{
+    return m_fDisabled;
+}
+
+void UIChooserNode::setDisabled(bool fDisabled)
+{
+    if (fDisabled == m_fDisabled)
+        return;
+    m_fDisabled = fDisabled;
+    if (m_pItem)
+        m_pItem->disableEnableItem(m_fDisabled);
+}

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

@@ -107 +107 @@
     UIChooserItem *item() const { return m_pItem.data(); }
 
-    /** Performs search wrt. @a strSearchTerm and @a iItemSearchFlags and updates @a matchedItems. */
+    /** Performs search wrt. @a strSearchTerm and @a iItemSearchFlags and updates @a matchedItems. For an empty
+      * @a strSearchTerm all items are added wrt. node type from @a iItemSearchFlags. */
     virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) = 0;
+
+    /** Returns if node is disabled. */
+    bool isDisabled() const;
+    /** Sets the disabled flag. */
+    void setDisabled(bool fDisabled);
 
 protected:
@@ -122 +128 @@
     /** Holds item description. */
     QString  m_strDescription;
+
+    /** Holds the flag to indicate whether the node is disabled or not. */
+    bool m_fDisabled;
+
 };
 

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

@@ -119 +119 @@
     if (!(iItemSearchFlags & UIChooserItemSearchFlag_Global))
         return;
+
+    if (strSearchTerm.isEmpty())
+    {
+        matchedItems << this;
+        return;
+    }
+
     if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
     {

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

@@ -188 +188 @@
 }
 
-
 void UIChooserNodeGroup::searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems)
 {
@@ -194 +193 @@
     if (iItemSearchFlags & UIChooserItemSearchFlag_Group)
     {
-        if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+        /* if the search term is empty we just add the node to the matched list: */
+        if (strSearchTerm.isEmpty())
         {
-            if (name() == strSearchTerm)
-                matchedItems << this;
+            matchedItems << this;
         }
         else
         {
-            if (name().contains(strSearchTerm, Qt::CaseInsensitive))
-                matchedItems << this;
+            if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+            {
+                if (name() == strSearchTerm)
+                    matchedItems << this;
+            }
+            else
+            {
+                if (name().contains(strSearchTerm, Qt::CaseInsensitive))
+                    matchedItems << this;
+            }
         }
     }
@@ -214 +221 @@
     foreach (UIChooserNode* pNode, m_nodesMachine)
         pNode->searchForNodes(strSearchTerm, iItemSearchFlags, matchedItems);
-
 }
 

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

@@ -136 +136 @@
     if (!(iItemSearchFlags & UIChooserItemSearchFlag_Machine))
         return;
+
+    if (strSearchTerm.isEmpty())
+    {
+        matchedItems << this;
+        return;
+    }
+
     if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
     {