Changeset 42872 in vbox for trunk/src

Timestamp:

Aug 18, 2012 12:54:44 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Color palette fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics

Files:

• chooser/UIGChooserItem.cpp (modified) (3 diffs)
• chooser/UIGChooserItem.h (modified) (3 diffs)
• chooser/UIGChooserItemGroup.cpp (modified) (8 diffs)
• chooser/UIGChooserItemMachine.cpp (modified) (4 diffs)
• chooser/UIGChooserView.cpp (modified) (1 diff)
• details/UIGDetailsElement.cpp (modified) (5 diffs)
• details/UIGDetailsElement.h (modified) (3 diffs)
• details/UIGDetailsView.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.cpp

@@ -46 +46 @@
     , m_iAnimationDuration(400)
     , m_iDefaultDarkness(103)
+    , m_iBlackoutDarkness(110)
     , m_iHighlightDarkness(90)
-    , m_iGradient(m_iDefaultDarkness)
+    , m_iStrokeDarkness(130)
+    , m_iAnimationDarkness(m_iDefaultDarkness)
 {
     /* Basic item setup: */
@@ -67 +69 @@
 
         /* Forward animation: */
-        m_pForwardAnimation = new QPropertyAnimation(this, "gradient", this);
+        m_pForwardAnimation = new QPropertyAnimation(this, "animationDarkness", this);
         m_pForwardAnimation->setDuration(m_iAnimationDuration);
         m_pForwardAnimation->setStartValue(m_iDefaultDarkness);
@@ -73 +75 @@
 
         /* Backward animation: */
-        m_pBackwardAnimation = new QPropertyAnimation(this, "gradient", this);
+        m_pBackwardAnimation = new QPropertyAnimation(this, "animationDarkness", this);
         m_pBackwardAnimation->setDuration(m_iAnimationDuration);
         m_pBackwardAnimation->setStartValue(m_iHighlightDarkness);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.h

@@ -52 +52 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(int gradient READ gradient WRITE setGradient);
+    Q_PROPERTY(int animationDarkness READ animationDarkness WRITE setAnimationDarkness);
 
 signals:
@@ -140 +140 @@
 
     /* Hover stuff: */
-    int gradient() const { return m_iGradient; }
-    void setGradient(int iGradient) { m_iGradient = iGradient; update(); }
+    void setAnimationDarkness(int iAnimationDarkness) { m_iAnimationDarkness = iAnimationDarkness; update(); }
+
+    /* Color stuff: */
+    int defaultDarkness() const { return m_iDefaultDarkness; }
+    int blackoutDarkness() const { return m_iBlackoutDarkness; }
+    int highlightDarkness() const { return m_iHighlightDarkness; }
+    int strokeDarkness() const { return m_iStrokeDarkness; }
+    int animationDarkness() const { return m_iAnimationDarkness; }
+    int dragTokenDarkness() const { return m_iDragTokenDarkness; }
 
     /* Helpers: Text compression stuff: */
@@ -162 +169 @@
     int m_iAnimationDuration;
     int m_iDefaultDarkness;
+    int m_iBlackoutDarkness;
     int m_iHighlightDarkness;
-    int m_iGradient;
+    int m_iStrokeDarkness;
+    int m_iAnimationDarkness;
+    int m_iDragTokenDarkness;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -703 +703 @@
 
         /* Prepare body indent: */
-        iPreviousVerticalIndent = 2 * iVerticalMargin + iFullHeaderHeight;
+        iPreviousVerticalIndent = 3 * iVerticalMargin + iFullHeaderHeight;
     }
 
@@ -790 +790 @@
     if (!fClosedGroup)
     {
-        /* We should take into account: */
+        /* We should take into account vertical indent: */
+        iProposedHeight += iVerticalMargin;
+        /* And every item height: */
         QList<UIGChooserItem*> allItems = items();
         for (int i = 0; i < allItems.size(); ++i)
         {
-            /* Every item height: */
             UIGChooserItem *pItem = allItems[i];
             iProposedHeight += (pItem->minimumHeightHint() + iMinorSpacing);
@@ -1080 +1081 @@
     /* Prepare color: */
     QPalette pal = palette();
-    QColor base = pal.color(QPalette::Active, model()->selectionList().contains(this) ?
-                            QPalette::Highlight : QPalette::Window);
+    QColor windowColor = pal.color(QPalette::Active, model()->selectionList().contains(this) ?
+                                   QPalette::Highlight : QPalette::Window);
+    QColor base(Qt::white);
 
     /* Root item: */
@@ -1090 +1092 @@
         {
             /* Simple and clear: */
-            pPainter->fillRect(rect, base);
+            pPainter->fillRect(rect, base.darker(106));
         }
         else
@@ -1113 +1115 @@
             /* Fill background: */
             QLinearGradient headerGradient(backgroundRect.bottomLeft(), backgroundRect.topLeft());
-            headerGradient.setColorAt(0, base.darker(gradient()));
-            headerGradient.setColorAt(1, base.darker(110));
+            headerGradient.setColorAt(1, windowColor.darker(blackoutDarkness()));
+            headerGradient.setColorAt(0, windowColor.darker(animationDarkness()));
             pPainter->fillRect(backgroundRect, headerGradient);
 
             /* Stroke path: */
             pPainter->setClipping(false);
-            pPainter->strokePath(path, base.darker(130));
+            pPainter->strokePath(path, windowColor.darker(strokeDarkness()));
         }
     }
@@ -1149 +1151 @@
         /* Prepare top gradient: */
         QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
-        tGradient.setColorAt(0, base.darker(110));
-        tGradient.setColorAt(1, base.darker(gradient()));
+        tGradient.setColorAt(1, windowColor.darker(animationDarkness()));
+        tGradient.setColorAt(0, windowColor.darker(blackoutDarkness()));
         /* Fill top rectangle: */
         pPainter->fillRect(tRect, tGradient);
@@ -1159 +1161 @@
             QRect midRect = QRect(tRect.bottomLeft(), rect.bottomRight());
             /* Paint all the stuff: */
-            pPainter->fillRect(midRect, base.darker(110));
+            pPainter->fillRect(midRect, base.darker(defaultDarkness()));
         }
 
          /* Stroke path: */
         pPainter->setClipping(false);
-        pPainter->strokePath(path, base.darker(130));
+        pPainter->strokePath(path, windowColor.darker(strokeDarkness()));
         pPainter->setClipPath(path);
 
@@ -1184 +1186 @@
                 dragTokenGradient.setFinalStop(dragTokenRect.bottomLeft());
             }
-            dragTokenGradient.setColorAt(0, base.darker(110));
-            dragTokenGradient.setColorAt(1, base.darker(150));
+            dragTokenGradient.setColorAt(0, windowColor.darker(blackoutDarkness()));
+            dragTokenGradient.setColorAt(1, windowColor.darker(dragTokenDarkness()));
             pPainter->fillRect(dragTokenRect, dragTokenGradient);
         }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -556 +556 @@
         /* Prepare top gradient: */
         QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
-        tGradient.setColorAt(0, highlight.darker(103));
-        tGradient.setColorAt(1, highlight.darker(110));
+        tGradient.setColorAt(1, highlight.darker(blackoutDarkness()));
+        tGradient.setColorAt(0, highlight.darker(defaultDarkness()));
         /* Prepare bottom gradient: */
         QLinearGradient bGradient(bRect.topLeft(), bRect.bottomLeft());
-        bGradient.setColorAt(0, highlight.darker(103));
-        bGradient.setColorAt(1, highlight.darker(110));
+        bGradient.setColorAt(0, highlight.darker(defaultDarkness()));
+        bGradient.setColorAt(1, highlight.darker(blackoutDarkness()));
 
         /* Paint all the stuff: */
-        pPainter->fillRect(midRect, highlight.darker(103));
+        pPainter->fillRect(midRect, highlight.darker(defaultDarkness()));
         pPainter->fillRect(tRect, tGradient);
         pPainter->fillRect(bRect, bGradient);
@@ -573 +573 @@
     {
         /* Choose color: */
-        QColor baseLight = pal.color(QPalette::Active, model()->selectionList().contains(this) ||
-                                                       model()->selectionList().contains(parentItem()) ?
-                                                       QPalette::Highlight : QPalette::Window);
-        QColor blurBase = pal.color(QPalette::Active, model()->selectionList().contains(this) ||
-                                                      model()->selectionList().contains(parentItem()) ?
-                                                      QPalette::Highlight : QPalette::Window);
-        if (!parentItem()->isRoot())
-            blurBase = blurBase.darker(110);
+        QColor baseLight = model()->selectionList().contains(this) ? pal.color(QPalette::Active, QPalette::Highlight) :
+                                                                     QColor(Qt::white);
+        QColor blurBase = model()->selectionList().contains(this) ? pal.color(QPalette::Active, QPalette::Highlight) :
+                                                                    QColor(Qt::white);
+        if (!model()->selectionList().contains(this) && !parentItem()->isRoot())
+            blurBase = blurBase.darker(defaultDarkness());
         blurBase.setAlpha(0);
 
@@ -589 +587 @@
         /* Add blur itself: */
         QPainter blurPainter(&background);
-        blurPainter.setBrush(baseLight.darker(gradient()));
+        blurPainter.setBrush(baseLight.darker(animationDarkness()));
         blurPainter.setPen(Qt::NoPen);
         blurPainter.drawRoundedRect(rect.adjusted(5, 5, -5, -5), 5, 5);
@@ -620 +618 @@
             dragTokenGradient.setFinalStop(dragTokenRect.bottomLeft());
         }
-        dragTokenGradient.setColorAt(0, base.darker(110));
-        dragTokenGradient.setColorAt(1, base.darker(150));
+        dragTokenGradient.setColorAt(0, base.darker(blackoutDarkness()));
+        dragTokenGradient.setColorAt(1, base.darker(dragTokenDarkness()));
         pPainter->fillRect(dragTokenRect, dragTokenGradient);
     }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserView.cpp

@@ -30 +30 @@
     /* Fix palette: */
     QPalette pal = palette();
-    pal.setColor(QPalette::Base, pal.color(QPalette::Window));
+    pal.setColor(QPalette::Base, QColor(Qt::white).darker(106));
     setPalette(pal);
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -54 +54 @@
     , m_iDefaultDarkness(103)
     , m_iHighlightDarkness(90)
-    , m_iGradient(m_iDefaultDarkness)
+    , m_iAnimationDarkness(m_iDefaultDarkness)
 {
     /* Prepare element: */
@@ -416 +416 @@
 
     /* Forward animation: */
-    m_pForwardAnimation = new QPropertyAnimation(this, "gradient", this);
+    m_pForwardAnimation = new QPropertyAnimation(this, "animationDarkness", this);
     m_pForwardAnimation->setDuration(m_iAnimationDuration);
     m_pForwardAnimation->setStartValue(m_iDefaultDarkness);
@@ -422 +422 @@
 
     /* Backward animation: */
-    m_pBackwardAnimation = new QPropertyAnimation(this, "gradient", this);
+    m_pBackwardAnimation = new QPropertyAnimation(this, "animationDarkness", this);
     m_pBackwardAnimation->setDuration(m_iAnimationDuration);
     m_pBackwardAnimation->setStartValue(m_iHighlightDarkness);
@@ -691 +691 @@
     QPalette pal = QApplication::palette();
     QColor windowColor = pal.color(QPalette::Active, QPalette::Window);
+    QColor base(Qt::white);
+    base = base.darker(m_iDefaultDarkness);
 
     /* Add clipping: */
@@ -715 +717 @@
     QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
     tGradient.setColorAt(0, windowColor.darker(110));
-    tGradient.setColorAt(1, windowColor.darker(gradient()));
+    tGradient.setColorAt(1, windowColor.darker(animationDarkness()));
 
     /* Paint all the stuff: */
     pPainter->fillRect(tRect, tGradient);
-    pPainter->fillRect(bRect, windowColor.darker(97));
+    pPainter->fillRect(bRect, base);
 
     /* Stroke path: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h

@@ -45 +45 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(int gradient READ gradient WRITE setGradient);
+    Q_PROPERTY(int animationDarkness READ animationDarkness WRITE setAnimationDarkness);
     Q_PROPERTY(int additionalHeight READ additionalHeight WRITE setAdditionalHeight);
 
@@ -144 +144 @@
 
     /* Helpers: Hover stuff: */
-    int gradient() const { return m_iGradient; }
-    void setGradient(int iGradient) { m_iGradient = iGradient; update(); }
+    int animationDarkness() const { return m_iAnimationDarkness; }
+    void setAnimationDarkness(int iAnimationDarkness) { m_iAnimationDarkness = iAnimationDarkness; update(); }
 
     /* Helpers: Animation stuff: */
@@ -215 +215 @@
     int m_iDefaultDarkness;
     int m_iHighlightDarkness;
-    int m_iGradient;
+    int m_iAnimationDarkness;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp

@@ -30 +30 @@
     /* Fix palette: */
     QPalette pal = palette();
-    pal.setColor(QPalette::Base, pal.color(QPalette::Window));
+    pal.setColor(QPalette::Base, QColor(Qt::white).darker(106));
     setPalette(pal);