Changeset 47694 in vbox for trunk/src/VBox

Timestamp:

Aug 13, 2013 1:12:05 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Popup-pane: Support for initially focused pane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupPane.cpp (modified) (4 diffs)
• UIPopupPane.h (modified) (2 diffs)
• UIPopupPaneTextPane.cpp (modified) (3 diffs)
• UIPopupPaneTextPane.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp

@@ -40 +40 @@
     , m_fShown(false)
     , m_pShowAnimation(0)
-    , m_fHovered(false)
+    , m_fCanLooseFocus(!m_buttonDescriptions.isEmpty())
+    , m_fFocused(!m_fCanLooseFocus)
+    , m_fHovered(m_fFocused)
     , m_iDefaultOpacity(180)
     , m_iHoveredOpacity(250)
-    , m_iOpacity(m_iDefaultOpacity)
-    , m_fFocused(false)
+    , m_iOpacity(m_fHovered ? m_iHoveredOpacity : m_iDefaultOpacity)
     , m_pTextPane(0), m_pButtonPane(0)
 {
@@ -227 +228 @@
 {
     /* Create message-label: */
-    m_pTextPane = new UIPopupPaneTextPane(this, m_strMessage, m_fProposeAutoConfirmation);
+    m_pTextPane = new UIPopupPaneTextPane(this, m_strMessage, m_fProposeAutoConfirmation, m_fFocused);
     {
         /* Prepare label: */
@@ -265 +266 @@
     /* Install 'hover' animation for 'opacity' property: */
     UIAnimation::installPropertyAnimation(this, "opacity", "defaultOpacity", "hoveredOpacity",
-                                          SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()));
+                                          SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()), m_fHovered);
 }
 
@@ -340 +341 @@
         {
             /* Unhocus pane if focused: */
-            if (m_fFocused)
+            if (m_fCanLooseFocus && m_fFocused)
             {
                 m_fFocused = false;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.h

@@ -161 +161 @@
     QSize m_shownSizeHint;
 
+    /* Variables: Focus stuff: */
+    bool m_fCanLooseFocus;
+    bool m_fFocused;
+
     /* Variables: Hover stuff: */
     bool m_fHovered;
@@ -166 +170 @@
     const int m_iHoveredOpacity;
     int m_iOpacity;
-
-    /* Variables: Focus stuff: */
-    bool m_fFocused;
 
     /* Widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.cpp

@@ -26 +26 @@
 #include "UIAnimationFramework.h"
 
-UIPopupPaneTextPane::UIPopupPaneTextPane(QWidget *pParent, const QString &strText, bool fProposeAutoConfirmation)
+UIPopupPaneTextPane::UIPopupPaneTextPane(QWidget *pParent, const QString &strText,
+                                         bool fProposeAutoConfirmation, bool fFocused)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_iLayoutMargin(0)
@@ -35 +36 @@
     , m_pAutoConfirmCheckBox(0)
     , m_fProposeAutoConfirmation(fProposeAutoConfirmation)
-    , m_fFocused(false)
+    , m_fFocused(fFocused)
     , m_pAnimation(0)
 {
@@ -219 +220 @@
     /* Install geometry animation for 'minimumSizeHint' property: */
     m_pAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
-                                                         SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()));
+                                                         SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()), m_fFocused);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.h

@@ -51 +51 @@
 
     /* Constructor: */
-    UIPopupPaneTextPane(QWidget *pParent, const QString &strText, bool fProposeAutoConfirmation);
+    UIPopupPaneTextPane(QWidget *pParent, const QString &strText,
+                        bool fProposeAutoConfirmation, bool fFocused);
 
     /* API: Text stuff: */