Changeset 47031 in vbox

Timestamp:

Jul 8, 2013 10:30:00 AM (12 years ago)

Author:

vboxsync

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

87064

Message:

FE/Qt: Popup-center: Cumulative patch to popup-pane and popup-pane-text-pane for more wise encapsulation and layout stuff.

Location:

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

Files:

• UIPopupPane.cpp (modified) (7 diffs)
• UIPopupPane.h (modified) (2 diffs)
• UIPopupPaneTextPane.cpp (modified) (10 diffs)
• UIPopupPaneTextPane.h (modified) (3 diffs)

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

@@ -53 +53 @@
 void UIPopupPane::setMessage(const QString &strMessage)
 {
-    /* Make sure somthing changed: */
+    /* Make sure the message has changed: */
     if (m_strMessage == strMessage)
         return;
@@ -64 +64 @@
 void UIPopupPane::setDetails(const QString &strDetails)
 {
-    /* Make sure somthing changed: */
+    /* Make sure the details has changed: */
     if (m_strDetails == strDetails)
         return;
@@ -74 +74 @@
 void UIPopupPane::setProposeAutoConfirmation(bool fPropose)
 {
-    /* Make sure something changed: */
+    /* Make sure the auto-confirmation-proposal has changed: */
     if (m_fProposeAutoConfirmation == fPropose)
         return;
 
-    /* Fetch new auto-confirmation proposal: */
+    /* Fetch new auto-confirmation-proposal: */
     m_fProposeAutoConfirmation = fPropose;
     m_pTextPane->setProposeAutoConfirmation(m_fProposeAutoConfirmation);
@@ -96 +96 @@
 void UIPopupPane::setMinimumSizeHint(const QSize &minimumSizeHint)
 {
-    /* Make sure the size-hint is changed: */
+    /* Make sure the size-hint has changed: */
     if (m_minimumSizeHint == minimumSizeHint)
         return;
 
-    /* Assign new size-hint: */
+    /* Fetch new size-hint: */
     m_minimumSizeHint = minimumSizeHint;
 
     /* Notify parent popup-stack: */
     emit sigSizeHintChanged();
-}
-
-void UIPopupPane::updateSizeHint()
-{
-    /* Calculate minimum width-hint: */
-    int iMinimumWidthHint = 0;
-    {
-        /* Take into account layout: */
-        iMinimumWidthHint += 2 * m_iLayoutMargin;
-        {
-            /* Take into account widgets: */
-            iMinimumWidthHint += m_pTextPane->minimumSizeHint().width();
-            iMinimumWidthHint += m_iLayoutSpacing;
-            iMinimumWidthHint += m_pButtonPane->minimumSizeHint().width();
-        }
-    }
-
-    /* Calculate minimum height-hint: */
-    int iMinimumHeightHint = 0;
-    {
-        /* Take into account layout: */
-        iMinimumHeightHint += 2 * m_iLayoutMargin;
-        {
-            /* Take into account widgets: */
-            const int iTextPaneHeight = m_pTextPane->minimumSizeHint().height();
-            const int iButtonBoxHeight = m_pButtonPane->minimumSizeHint().height();
-            iMinimumHeightHint += qMax(iTextPaneHeight, iButtonBoxHeight);
-        }
-    }
-
-    /* Compose minimum size-hints: */
-    m_hiddenSizeHint = QSize(iMinimumWidthHint, 1);
-    m_shownSizeHint = QSize(iMinimumWidthHint, iMinimumHeightHint);
-    m_minimumSizeHint = m_fShown ? m_shownSizeHint : m_hiddenSizeHint;
-
-    /* Update 'show/hide' animation: */
-    if (m_pShowAnimation)
-        m_pShowAnimation->update();
 }
 
@@ -180 +142 @@
 }
 
-void UIPopupPane::sltAdjustGeometry()
-{
-    /* Update size-hint: */
-    updateSizeHint();
+void UIPopupPane::sltUpdateSizeHint()
+{
+    /* Calculate minimum width-hint: */
+    int iMinimumWidthHint = 0;
+    {
+        /* Take into account layout: */
+        iMinimumWidthHint += 2 * m_iLayoutMargin;
+        {
+            /* Take into account widgets: */
+            iMinimumWidthHint += m_pTextPane->minimumSizeHint().width();
+            iMinimumWidthHint += m_iLayoutSpacing;
+            iMinimumWidthHint += m_pButtonPane->minimumSizeHint().width();
+        }
+    }
+
+    /* Calculate minimum height-hint: */
+    int iMinimumHeightHint = 0;
+    {
+        /* Take into account layout: */
+        iMinimumHeightHint += 2 * m_iLayoutMargin;
+        {
+            /* Take into account widgets: */
+            const int iTextPaneHeight = m_pTextPane->minimumSizeHint().height();
+            const int iButtonBoxHeight = m_pButtonPane->minimumSizeHint().height();
+            iMinimumHeightHint += qMax(iTextPaneHeight, iButtonBoxHeight);
+        }
+    }
+
+    /* Compose minimum size-hints: */
+    m_hiddenSizeHint = QSize(iMinimumWidthHint, 1);
+    m_shownSizeHint = QSize(iMinimumWidthHint, iMinimumHeightHint);
+    m_minimumSizeHint = m_fShown ? m_shownSizeHint : m_hiddenSizeHint;
+
+    /* Update 'show/hide' animation: */
+    if (m_pShowAnimation)
+        m_pShowAnimation->update();
 
     /* Notify parent popup-stack: */
@@ -202 +196 @@
     prepareAnimation();
 
-    /* Adjust geometry: */
-    sltAdjustGeometry();
+    /* Update size-hint: */
+    sltUpdateSizeHint();
 }
 
@@ -212 +206 @@
 
     /* Create message-label: */
-    m_pTextPane = new UIPopupPaneTextPane(this);
+    m_pTextPane = new UIPopupPaneTextPane(this, m_strMessage, m_fProposeAutoConfirmation);
     {
         /* Prepare label: */
-        connect(m_pTextPane, SIGNAL(sigSizeHintChanged()), this, SLOT(sltAdjustGeometry()));
+        connect(m_pTextPane, SIGNAL(sigSizeHintChanged()), this, SLOT(sltUpdateSizeHint()));
         m_pTextPane->installEventFilter(this);
-        m_pTextPane->setText(m_strMessage);
-        m_pTextPane->setProposeAutoConfirmation(m_fProposeAutoConfirmation);
     }
 

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

@@ -80 +80 @@
     QSize minimumSizeHint() const { return m_minimumSizeHint; }
     void setMinimumSizeHint(const QSize &minimumSizeHint);
-    void updateSizeHint();
     void setDesiredWidth(int iWidth);
     void layoutContent();
@@ -90 +89 @@
 
     /* Handler: Layout stuff: */
-    void sltAdjustGeometry();
+    void sltUpdateSizeHint();
 
     /* Handler: Button stuff: */

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

@@ -26 +26 @@
 #include "UIAnimationFramework.h"
 
-UIPopupPaneTextPane::UIPopupPaneTextPane(QWidget *pParent /*= 0*/)
+UIPopupPaneTextPane::UIPopupPaneTextPane(QWidget *pParent, const QString &strText, bool fProposeAutoConfirmation)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_iLayoutMargin(0)
     , m_iLayoutSpacing(10)
+    , m_strText(strText)
     , m_pLabel(0)
     , m_iDesiredLabelWidth(-1)
     , m_pAutoConfirmCheckBox(0)
-    , m_fProposeAutoConfirmation(false)
+    , m_fProposeAutoConfirmation(fProposeAutoConfirmation)
     , m_fFocused(false)
     , m_pAnimation(0)
@@ -43 +44 @@
 void UIPopupPaneTextPane::setText(const QString &strText)
 {
-    /* Make sure the text is changed: */
+    /* Make sure the text has changed: */
     if (m_pLabel->text() == strText)
         return;
-    /* Update the pane for the new text: */
-    m_pLabel->setText(strText);
+
+    /* Fetch new text: */
+    m_strText = strText;
+    m_pLabel->setText(m_strText);
+
+    /* Update size-hint: */
     updateSizeHint();
 }
@@ -53 +58 @@
 void UIPopupPaneTextPane::setDesiredWidth(int iDesiredWidth)
 {
-    /* Make sure the desired-width is changed: */
+    /* Make sure the desired-width has changed: */
     if (m_iDesiredLabelWidth == iDesiredWidth)
         return;
-    /* Update the pane for the new desired-width: */
+
+    /* Fetch new desired-width: */
     m_iDesiredLabelWidth = iDesiredWidth;
+
+    /* Update size-hint: */
     updateSizeHint();
 }
@@ -63 +71 @@
 void UIPopupPaneTextPane::setProposeAutoConfirmation(bool fPropose)
 {
-    /* Make sure the auto-confirmation-proposal is changed: */
+    /* Make sure the auto-confirmation-proposal has changed: */
     if (m_fProposeAutoConfirmation == fPropose)
         return;
-    /* Update the pane for the new auto-confirmation-proposal: */
+
+    /* Fetch new auto-confirmation-proposal: */
     m_fProposeAutoConfirmation = fPropose;
+
+    /* Update size-hint: */
     updateSizeHint();
 }
@@ -95 +106 @@
 void UIPopupPaneTextPane::setMinimumSizeHint(const QSize &minimumSizeHint)
 {
-    /* Make sure the size-hint is changed: */
+    /* Make sure the size-hint has changed: */
     if (m_minimumSizeHint == minimumSizeHint)
         return;
-    /* Assign new size-hint: */
+
+    /* Fetch new size-hint: */
     m_minimumSizeHint = minimumSizeHint;
+
     /* Notify parent popup-pane: */
     emit sigSizeHintChanged();
@@ -111 +124 @@
     const int iLabelWidth = m_labelSizeHint.width();
     const int iLabelHeight = m_labelSizeHint.height();
+
     /* Label: */
     m_pLabel->move(m_iLayoutMargin, m_iLayoutMargin);
@@ -165 +179 @@
 void UIPopupPaneTextPane::prepare()
 {
-    /* Propagate parent signals: */
-    connect(parent(), SIGNAL(sigFocusEnter()), this, SLOT(sltFocusEnter()));
-    connect(parent(), SIGNAL(sigFocusLeave()), this, SLOT(sltFocusLeave()));
     /* Prepare content: */
     prepareContent();
-    /* Install geometry animation for 'minimumSizeHint' property: */
-    m_pAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
-                                                         SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()));
+    /* Prepare animation: */
+    prepareAnimation();
+
+    /* Update size-hint: */
+    updateSizeHint();
 }
 
@@ -190 +203 @@
         m_pLabel->setWordWrap(true);
         m_pLabel->setFocusPolicy(Qt::NoFocus);
-    }
+        m_pLabel->setText(m_strText);
+    }
+
     /* Create check-box: */
     m_pAutoConfirmCheckBox = new QCheckBox(this);
@@ -204 +219 @@
         m_pAutoConfirmCheckBox->setFocusPolicy(Qt::NoFocus);
     }
+
     /* Translate UI finally: */
     retranslateUi();
+}
+
+void UIPopupPaneTextPane::prepareAnimation()
+{
+    /* Propagate parent signals: */
+    connect(parent(), SIGNAL(sigFocusEnter()), this, SLOT(sltFocusEnter()));
+    connect(parent(), SIGNAL(sigFocusLeave()), this, SLOT(sltFocusLeave()));
+    /* Install geometry animation for 'minimumSizeHint' property: */
+    m_pAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
+                                                         SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()));
 }
 
@@ -243 +269 @@
 
     /* Update animation: */
-    m_pAnimation->update();
-}
-
+    if (m_pAnimation)
+        m_pAnimation->update();
+
+    /* Notify parent popup-pane: */
+    emit sigSizeHintChanged();
+}
+

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

@@ -51 +51 @@
 
     /* Constructor: */
-    UIPopupPaneTextPane(QWidget *pParent = 0);
+    UIPopupPaneTextPane(QWidget *pParent, const QString &strText, bool fProposeAutoConfirmation);
 
     /* API: Text stuff: */
@@ -80 +80 @@
     void prepare();
     void prepareContent();
+    void prepareAnimation();
 
     /* Helper: Translate stuff: */
@@ -101 +102 @@
 
     /* Variables: Widget stuff: */
+    QString m_strText;
     QLabel *m_pLabel;
     int m_iDesiredLabelWidth;