Changeset 42689 in vbox for trunk

Timestamp:

Aug 8, 2012 6:14:23 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Add hovering animation to details-view elements.

Location:

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

Files:

• chooser/UIGChooserItem.cpp (modified) (3 diffs)
• details/UIGDetailsElement.cpp (modified) (8 diffs)
• details/UIGDetailsElement.h (modified) (5 diffs)
• details/UIGDetailsItem.cpp (modified) (1 diff)
• details/UIGDetailsItem.h (modified) (1 diff)

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

@@ -43 +43 @@
     , m_pForwardAnimation(0)
     , m_pBackwardAnimation(0)
-    , m_iAnimationDuration(300)
+    , m_iAnimationDuration(400)
     , m_iDefaultDarkness(103)
     , m_iHighlightDarkness(90)
@@ -186 +186 @@
 void UIGChooserItem::hoverMoveEvent(QGraphicsSceneHoverEvent*)
 {
-    if (m_fHovered != true)
+    if (!m_fHovered)
     {
         m_fHovered = true;
@@ -195 +195 @@
 void UIGChooserItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)
 {
-    if (m_fHovered != false)
+    if (m_fHovered)
     {
         m_fHovered = false;

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

@@ -23 +23 @@
 #include <QTextLayout>
 #include <QGraphicsSceneMouseEvent>
+#include <QStateMachine>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
 
 /* GUI includes: */
@@ -45 +48 @@
     , m_fNameHoveringAccessible(false)
     , m_fNameHovered(false)
+    , m_pHighlightMachine(0)
+    , m_pForwardAnimation(0)
+    , m_pBackwardAnimation(0)
+    , m_iAnimationDuration(400)
+    , m_iDefaultDarkness(103)
+    , m_iHighlightDarkness(90)
+    , m_iGradient(m_iDefaultDarkness)
 {
     /* Prepare element: */
@@ -350 +360 @@
 void UIGDetailsElement::prepareElement()
 {
+    /* Create highlight machine: */
+    m_pHighlightMachine = new QStateMachine(this);
+    /* Create 'default' state: */
+    QState *pStateDefault = new QState(m_pHighlightMachine);
+    /* Create 'highlighted' state: */
+    QState *pStateHighlighted = new QState(m_pHighlightMachine);
+
+    /* Forward animation: */
+    m_pForwardAnimation = new QPropertyAnimation(this, "gradient", this);
+    m_pForwardAnimation->setDuration(m_iAnimationDuration);
+    m_pForwardAnimation->setStartValue(m_iDefaultDarkness);
+    m_pForwardAnimation->setEndValue(m_iHighlightDarkness);
+
+    /* Backward animation: */
+    m_pBackwardAnimation = new QPropertyAnimation(this, "gradient", this);
+    m_pBackwardAnimation->setDuration(m_iAnimationDuration);
+    m_pBackwardAnimation->setStartValue(m_iHighlightDarkness);
+    m_pBackwardAnimation->setEndValue(m_iDefaultDarkness);
+
+    /* Add state transitions: */
+    QSignalTransition *pDefaultToHighlighted = pStateDefault->addTransition(this, SIGNAL(sigHoverEnter()), pStateHighlighted);
+    pDefaultToHighlighted->addAnimation(m_pForwardAnimation);
+    QSignalTransition *pHighlightedToDefault = pStateHighlighted->addTransition(this, SIGNAL(sigHoverLeave()), pStateDefault);
+    pHighlightedToDefault->addAnimation(m_pBackwardAnimation);
+
+    /* Initial state is 'default': */
+    m_pHighlightMachine->setInitialState(pStateDefault);
+    /* Start state-machine: */
+    m_pHighlightMachine->start();
+
     connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)), this, SLOT(sltMachineStateChange(QString)));
     connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)), this, SLOT(sltShouldWeUpdateAppearance(QString)));
@@ -480 +520 @@
                     /* Header height: */
                     2 * data(ElementData_Margin).toInt() +
-                    data(ElementData_HeaderSize).toSize().height());
+                    data(ElementData_HeaderSize).toSize().height(),
+                    /* Gradient color: */
+                    gradient());
 }
 
@@ -587 +629 @@
 
 /* static */
-void UIGDetailsElement::paintBackground(QPainter *pPainter, const QRect &rect, int iRadius, int iHeaderHeight)
+void UIGDetailsElement::paintBackground(QPainter *pPainter, const QRect &rect,
+                                        int iRadius, int iHeaderHeight, int iGradient)
 {
     /* Save painter: */
@@ -622 +665 @@
     QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
     tGradient.setColorAt(0, windowColor.darker(110));
-    tGradient.setColorAt(1, windowColor.darker(103));
+    tGradient.setColorAt(1, windowColor.darker(iGradient));
 
     /* Paint all the stuff: */
@@ -642 +685 @@
     {
         m_fHovered = true;
-        update();
+        emit sigHoverEnter();
     }
 
@@ -655 +698 @@
     {
         m_fHovered = false;
-        update();
+        emit sigHoverLeave();
     }
 

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

@@ -32 +32 @@
 class UIGraphicsRotatorButton;
 class QTextLayout;
+class QStateMachine;
+class QPropertyAnimation;
 
 /* Typedefs: */
@@ -43 +45 @@
 {
     Q_OBJECT;
+    Q_PROPERTY(int gradient READ gradient WRITE setGradient);
     Q_PROPERTY(int additionalHeight READ additionalHeight WRITE setAdditionalHeight);
 
 signals:
+
+    /* Notifiers: Hover stuff: */
+    void sigHoverEnter();
+    void sigHoverLeave();
 
     /* Notifier: Toggle stuff: */
@@ -123 +130 @@
     void updateLayout();
 
+    /* Helpers: Hover stuff: */
+    int gradient() const { return m_iGradient; }
+    void setGradient(int iGradient) { m_iGradient = iGradient; update(); }
+
     /* Helpers: Animation stuff: */
     void setAdditionalHeight(int iAdditionalHeight);
@@ -159 +170 @@
     void paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
     void paintElementInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
-    static void paintBackground(QPainter *pPainter, const QRect &rect, int iRadius, int iHeaderHeight);
+    static void paintBackground(QPainter *pPainter, const QRect &rect,
+                                int iRadius, int iHeaderHeight, int iGradient);
 
     /* Handlers: Mouse stuff: */
@@ -189 +201 @@
     int m_iAdditionalHeight;
     int m_iCornerRadius;
+
+    /* Variables: Hover stuff: */
     bool m_fHovered;
     bool m_fNameHoveringAccessible;
     bool m_fNameHovered;
+    QStateMachine *m_pHighlightMachine;
+    QPropertyAnimation *m_pForwardAnimation;
+    QPropertyAnimation *m_pBackwardAnimation;
+    int m_iAnimationDuration;
+    int m_iDefaultDarkness;
+    int m_iHighlightDarkness;
+    int m_iGradient;
 };
 

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

@@ -86 +86 @@
 }
 
-#if 0
-void UIGDetailsItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)
-{
-}
-
-void UIGDetailsItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)
-{
-}
-#endif
-
 /* static */
 void UIGDetailsItem::configurePainterShape(QPainter *pPainter,

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

@@ -76 +76 @@
 protected:
 
-#if 0
-    /* Hover-enter event: */
-    void hoverEnterEvent(QGraphicsSceneHoverEvent *pEvent);
-    /* Hover-leave event: */
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent *pEvent);
-#endif
-
     /* Helpers: Paint stuff: */
     static void configurePainterShape(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, int iRadius);