Changeset 47455 in vbox for trunk/src/VBox

Timestamp:

Jul 29, 2013 12:07:32 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Integrate scrollable-area into popup-stack; Optimize popup-stack layout for embedded and top-level integration types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (1 diff)
• widgets/UIPopupPane.cpp (modified) (5 diffs)
• widgets/UIPopupPane.h (modified) (4 diffs)
• widgets/UIPopupPaneTextPane.cpp (modified) (2 diffs)
• widgets/UIPopupPaneTextPane.h (modified) (2 diffs)
• widgets/UIPopupStack.cpp (modified) (13 diffs)
• widgets/UIPopupStack.h (modified) (4 diffs)

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

@@ -317 +317 @@
         return;
 
-    /* Just raise, its:
-     * useful for Win host,
-     * do not work on Mac host and
-     * need to check for x11/KDE still. */
-    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
-    pPopupStack->raise();
+    /* Remove stack: */
+    hidePopupStack(pParent);
+
+    /* Make sure integration type is correct: */
+    setStackIntegrationType(UIPopupIntegrationType_Toplevel);
+
+    /* Return stack again: */
+    showPopupStack(pParent);
 }
 

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

@@ -89 +89 @@
 }
 
-void UIPopupPane::setDesiredWidth(int iWidth)
-{
-    /* Make sure text-pane exists: */
-    if (!m_pTextPane)
-        return;
-
-    /* Propagate desired width to the text-pane we have: */
-    m_pTextPane->setDesiredWidth(iWidth - 2 * m_iLayoutMargin
-                                        - m_pButtonPane->minimumSizeHint().width());
-}
-
 void UIPopupPane::setMinimumSizeHint(const QSize &minimumSizeHint)
 {
@@ -148 +137 @@
 }
 
+void UIPopupPane::sltHandleProposalForWidth(int iWidth)
+{
+    /* Make sure text-pane exists: */
+    if (!m_pTextPane)
+        return;
+
+    /* Subtract layout margins: */
+    iWidth -= 2 * m_iLayoutMargin;
+    /* Subtract layout spacing: */
+    iWidth -= m_iLayoutSpacing;
+    /* Subtract button-pane width: */
+    iWidth -= m_pButtonPane->minimumSizeHint().width();
+
+    /* Propose resulting width to text-pane: */
+    emit sigProposeTextPaneWidth(iWidth);
+}
+
 void UIPopupPane::sltUpdateSizeHint()
 {
@@ -197 +203 @@
 void UIPopupPane::prepare()
 {
+    /* Prepare this: */
+    installEventFilter(this);
+    /* Prepare background: */
+    prepareBackground();
     /* Prepare content: */
     prepareContent();
@@ -206 +216 @@
 }
 
+void UIPopupPane::prepareBackground()
+{
+    /* Prepare palette: */
+    QPalette pal = palette();
+    pal.setColor(QPalette::Window, QApplication::palette().color(QPalette::Window));
+    setPalette(pal);
+}
+
 void UIPopupPane::prepareContent()
 {
-    /* Prepare this: */
-    installEventFilter(this);
-
     /* Create message-label: */
     m_pTextPane = new UIPopupPaneTextPane(this, m_strMessage, m_fProposeAutoConfirmation);
     {
         /* Prepare label: */
+        connect(this, SIGNAL(sigProposeTextPaneWidth(int)), m_pTextPane, SLOT(sltHandleProposalForWidth(int)));
         connect(m_pTextPane, SIGNAL(sigSizeHintChanged()), this, SLOT(sltUpdateSizeHint()));
         m_pTextPane->installEventFilter(this);
@@ -301 +317 @@
             break;
         }
-        /* Pane is focused: */
-        case QEvent::FocusIn:
+        /* Pane is clicked with mouse: */
+        case QEvent::MouseButtonPress:
         {
             /* Focus pane if not focused: */

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

@@ -59 +59 @@
     void sigFocusLeave();
 
-    /* Notifier: Layout stuff: */
+    /* Notifiers: Layout stuff: */
+    void sigProposeTextPaneWidth(int iWidth);
     void sigSizeHintChanged();
 
@@ -86 +87 @@
     QSize minimumSizeHint() const { return m_minimumSizeHint; }
     void setMinimumSizeHint(const QSize &minimumSizeHint);
-    void setDesiredWidth(int iWidth);
     void layoutContent();
 
@@ -94 +94 @@
     void sltMarkAsShown();
 
-    /* Handler: Layout stuff: */
+    /* Handlers: Layout stuff: */
+    void sltHandleProposalForWidth(int iWidth);
     void sltUpdateSizeHint();
 
@@ -104 +105 @@
     /* Helpers: Prepare stuff: */
     void prepare();
+    void prepareBackground();
     void prepareContent();
     void prepareAnimation();

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

@@ -51 +51 @@
     m_strText = strText;
     m_pLabel->setText(m_strText);
-
-    /* Update size-hint: */
-    updateSizeHint();
-}
-
-void UIPopupPaneTextPane::setDesiredWidth(int iDesiredWidth)
-{
-    /* Make sure the desired-width has changed: */
-    if (m_iDesiredLabelWidth == iDesiredWidth)
-        return;
-
-    /* Fetch new desired-width: */
-    m_iDesiredLabelWidth = iDesiredWidth;
 
     /* Update size-hint: */
@@ -151 +138 @@
 }
 
+void UIPopupPaneTextPane::sltHandleProposalForWidth(int iWidth)
+{
+    /* Make sure the desired-width has changed: */
+    if (m_iDesiredLabelWidth == iWidth)
+        return;
+
+    /* Fetch new desired-width: */
+    m_iDesiredLabelWidth = iWidth;
+
+    /* Update size-hint: */
+    updateSizeHint();
+}
+
 void UIPopupPaneTextPane::sltFocusEnter()
 {

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

@@ -56 +56 @@
     void setText(const QString &strText);
 
-    /* API: Desired-width stuff: */
-    void setDesiredWidth(int iDesiredWidth);
-
     /* API: Auto-confirmation stuff: */
     void setProposeAutoConfirmation(bool fPropose);
@@ -70 +67 @@
 
 private slots:
+
+    /* Handler: Layout stuff: */
+    void sltHandleProposalForWidth(int iWidth);
 
     /* Handlers: Focus stuff: */

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

@@ -19 +19 @@
 
 /* Qt includes: */
+#include <QVBoxLayout>
+#include <QScrollArea>
 #include <QEvent>
 #include <QMainWindow>
@@ -33 +35 @@
 
 UIPopupStack::UIPopupStack()
-    : m_iLayoutMargin(1)
-    , m_iLayoutSpacing(1)
+    : m_pScrollArea(0)
+    , m_pScrollViewport(0)
     , m_iParentMenuBarHeight(0)
     , m_iParentStatusBarHeight(0)
 {
-    /* Make sure cursor is *always* valid: */
-    setCursor(Qt::ArrowCursor);
-
+    /* Prepare: */
+    prepare();
+}
+
+bool UIPopupStack::exists(const QString &strPopupPaneID) const
+{
+    /* Redirect question to viewport: */
+    return m_pScrollViewport->exists(strPopupPaneID);
+}
+
+void UIPopupStack::createPopupPane(const QString &strPopupPaneID,
+                                   const QString &strMessage, const QString &strDetails,
+                                   const QMap<int, QString> &buttonDescriptions,
+                                   bool fProposeAutoConfirmation)
+{
+    /* Redirect request to viewport: */
+    m_pScrollViewport->createPopupPane(strPopupPaneID,
+                                       strMessage, strDetails,
+                                       buttonDescriptions,
+                                       fProposeAutoConfirmation);
+
+    /* Propagate width: */
+    propagateWidth();
+}
+
+void UIPopupStack::updatePopupPane(const QString &strPopupPaneID,
+                                   const QString &strMessage, const QString &strDetails)
+{
+    /* Redirect request to viewport: */
+    m_pScrollViewport->updatePopupPane(strPopupPaneID,
+                                       strMessage, strDetails);
+
+    /* Propagate width: */
+    propagateWidth();
+}
+
+void UIPopupStack::recallPopupPane(const QString &strPopupPaneID)
+{
+    /* Redirect request to viewport: */
+    m_pScrollViewport->recallPopupPane(strPopupPaneID);
+
+    /* Propagate width: */
+    propagateWidth();
+}
+
+void UIPopupStack::setParent(QWidget *pParent)
+{
+    /* Call to base-class: */
+    QWidget::setParent(pParent);
+    /* Recalculate parent menu-bar height: */
+    m_iParentMenuBarHeight = parentMenuBarHeight(pParent);
+    /* Recalculate parent status-bar height: */
+    m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
+}
+
+void UIPopupStack::setParent(QWidget *pParent, Qt::WindowFlags flags)
+{
+    /* Call to base-class: */
+    QWidget::setParent(pParent, flags);
+    /* Recalculate parent menu-bar height: */
+    m_iParentMenuBarHeight = parentMenuBarHeight(pParent);
+    /* Recalculate parent status-bar height: */
+    m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
+}
+
+void UIPopupStack::sltAdjustGeometry()
+{
+    /* Make sure parent is currently set: */
+    if (!parent())
+        return;
+
+    /* Read parent geometry: */
+    QRect geo(parentWidget()->geometry());
+
+    /* Determine origin: */
+    bool fIsWindow = isWindow();
+    int iX = fIsWindow ? geo.x() : 0;
+    int iY = fIsWindow ? geo.y() : 0;
+    /* Subtract menu-bar height: */
+    iY += m_iParentMenuBarHeight;
+
+    /* Determine size: */
+    int iWidth = parentWidget()->width();
+    int iHeight = parentWidget()->height();
+    /* Subtract menu-bar and status-bar heights: */
+    iHeight -= (m_iParentMenuBarHeight + m_iParentStatusBarHeight);
+    /* Check if minimum height is even less than current: */
+    if (m_pScrollViewport)
+    {
+        /* Get minimum viewport height: */
+        int iMinimumHeight = m_pScrollViewport->minimumSizeHint().height();
+        /* Subtract layout margins: */
+        int iLeft, iTop, iRight, iBottom;
+        m_pMainLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+        iMinimumHeight += (iTop + iBottom);
+        /* Compare minimum and current height: */
+        iHeight = qMin(iHeight, iMinimumHeight);
+    }
+
+    /* Adjust geometry: */
+    setGeometry(iX, iY, iWidth, iHeight);
+}
+
+void UIPopupStack::sltPopupPaneRemoved(QString)
+{
+    /* Move focus to the parent: */
+    if (parentWidget())
+        parentWidget()->setFocus();
+}
+
+void UIPopupStack::prepare()
+{
+    /* Configure background: */
+    setAutoFillBackground(false);
 #if defined(Q_WS_WIN) || defined (Q_WS_MAC)
     /* Using Qt API to enable translucent background for the Win/Mac host.
@@ -53 +166 @@
     setAttribute(Qt::WA_MacAlwaysShowToolWindow);
 #endif /* Q_WS_MAC */
-}
-
-bool UIPopupStack::exists(const QString &strPopupPaneID) const
+
+    /* Prepare content: */
+    prepareContent();
+}
+
+void UIPopupStack::prepareContent()
+{
+    /* Create main-layout: */
+    m_pMainLayout = new QVBoxLayout(this);
+    {
+        /* Configure main-layout: */
+        m_pMainLayout->setContentsMargins(0, 0, 0, 0);
+        /* Create scroll-area: */
+        m_pScrollArea = new QScrollArea;
+        {
+            /* Configure scroll-area: */
+            m_pScrollArea->setCursor(Qt::ArrowCursor);
+            m_pScrollArea->setWidgetResizable(true);
+            m_pScrollArea->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
+            m_pScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+            //m_pScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+            QPalette pal = m_pScrollArea->palette();
+            pal.setColor(QPalette::Window, QColor(Qt::transparent));
+            m_pScrollArea->setPalette(pal);
+            /* Create scroll-viewport: */
+            m_pScrollViewport = new UIPopupStackViewport;
+            {
+                /* Configure scroll-viewport: */
+                m_pScrollViewport->setCursor(Qt::ArrowCursor);
+                /* Connect scroll-viewport: */
+                connect(this, SIGNAL(sigProposeStackViewportWidth(int)),
+                        m_pScrollViewport, SLOT(sltHandleProposalForWidth(int)));
+                connect(m_pScrollViewport, SIGNAL(sigSizeHintChanged()),
+                        this, SLOT(sltAdjustGeometry()));
+                connect(m_pScrollViewport, SIGNAL(sigPopupPaneDone(QString, int)),
+                        this, SIGNAL(sigPopupPaneDone(QString, int)));
+                connect(m_pScrollViewport, SIGNAL(sigPopupPaneRemoved(QString)),
+                        this, SLOT(sltPopupPaneRemoved(QString)));
+                connect(m_pScrollViewport, SIGNAL(sigRemove()),
+                        this, SIGNAL(sigRemove()));
+            }
+            /* Assign scroll-viewport to scroll-area: */
+            m_pScrollArea->setWidget(m_pScrollViewport);
+        }
+        /* Add scroll-area to layout: */
+        m_pMainLayout->addWidget(m_pScrollArea);
+    }
+}
+
+bool UIPopupStack::eventFilter(QObject *pWatched, QEvent *pEvent)
+{
+    /* Call to base-class if that is not parent event: */
+    if (!parent() || pWatched != parent())
+        return QWidget::eventFilter(pWatched, pEvent);
+
+    /* Handle parent geometry events: */
+    switch (pEvent->type())
+    {
+        case QEvent::Resize:
+        {
+            /* Propagate stack width: */
+            propagateWidth();
+            /* Adjust geometry: */
+            sltAdjustGeometry();
+            break;
+        }
+        case QEvent::Move:
+        {
+            /* Adjust geometry: */
+            sltAdjustGeometry();
+            break;
+        }
+    }
+
+    /* Call to base-class: */
+    return QWidget::eventFilter(pWatched, pEvent);
+}
+
+void UIPopupStack::showEvent(QShowEvent*)
+{
+    /* Propagate width: */
+    propagateWidth();
+    /* Adjust geometry: */
+    sltAdjustGeometry();
+}
+
+void UIPopupStack::propagateWidth()
+{
+    /* Make sure parent is currently set: */
+    if (!parent())
+        return;
+
+    /* Get parent width: */
+    int iWidth = parentWidget()->width();
+    /* Subtract left/right layout margins: */
+    if (m_pMainLayout)
+    {
+        int iLeft, iTop, iRight, iBottom;
+        m_pMainLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+        iWidth -= (iLeft + iRight);
+    }
+    /* Subtract scroll-area frame-width: */
+    if (m_pScrollArea)
+    {
+        iWidth -= 2 * m_pScrollArea->frameWidth();
+    }
+
+    /* Propose resulting width to viewport: */
+    emit sigProposeStackViewportWidth(iWidth);
+}
+
+/* static */
+int UIPopupStack::parentMenuBarHeight(QWidget *pParent)
+{
+    /* Menu-bar can exist only on QMainWindow sub-class: */
+    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
+    {
+        /* Search for existing menu-bar child: */
+        if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
+            return pMenuBar->height();
+    }
+    /* Zero by default: */
+    return 0;
+}
+
+/* static */
+int UIPopupStack::parentStatusBarHeight(QWidget *pParent)
+{
+    /* Status-bar can exist only on QMainWindow sub-class: */
+    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
+    {
+        /* Search for existing status-bar child: */
+        if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())
+            return pStatusBar->height();
+    }
+    /* Zero by default: */
+    return 0;
+}
+
+
+UIPopupStackViewport::UIPopupStackViewport()
+    : m_iLayoutMargin(1)
+    , m_iLayoutSpacing(1)
+{
+}
+
+bool UIPopupStackViewport::exists(const QString &strPopupPaneID) const
 {
     /* Is there already popup-pane with the same ID? */
@@ -61 +318 @@
 }
 
-void UIPopupStack::createPopupPane(const QString &strPopupPaneID,
-                                   const QString &strMessage, const QString &strDetails,
-                                   const QMap<int, QString> &buttonDescriptions,
-                                   bool fProposeAutoConfirmation)
+void UIPopupStackViewport::createPopupPane(const QString &strPopupPaneID,
+                                           const QString &strMessage, const QString &strDetails,
+                                           const QMap<int, QString> &buttonDescriptions,
+                                           bool fProposeAutoConfirmation)
 {
     /* Make sure there is no such popup-pane already: */
@@ -78 +335 @@
                                                                         buttonDescriptions,
                                                                         fProposeAutoConfirmation);
+
     /* Attach popup-pane connection: */
+    connect(this, SIGNAL(sigProposePopupPaneWidth(int)), pPopupPane, SLOT(sltHandleProposalForWidth(int)));
     connect(pPopupPane, SIGNAL(sigSizeHintChanged()), this, SLOT(sltAdjustGeometry()));
     connect(pPopupPane, SIGNAL(sigDone(int)), this, SLOT(sltPopupPaneDone(int)));
+
     /* Show popup-pane: */
     pPopupPane->show();
-
-    /* Adjust geometry only if parent is currently set: */
-    if (parent())
-    {
-        /* Propagate desired width: */
-        setDesiredWidth(parentWidget()->width());
-        /* Adjust geometry: */
-        sltAdjustGeometry();
-    }
-}
-
-void UIPopupStack::updatePopupPane(const QString &strPopupPaneID,
-                                   const QString &strMessage, const QString &strDetails)
+}
+
+void UIPopupStackViewport::updatePopupPane(const QString &strPopupPaneID,
+                                           const QString &strMessage, const QString &strDetails)
 {
     /* Make sure there is such popup-pane already: */
@@ -110 +361 @@
     pPopupPane->setMessage(strMessage);
     pPopupPane->setDetails(strDetails);
-
-    /* Adjust geometry only if parent is currently set: */
-    if (parent())
-    {
-        /* Propagate desired width: */
-        setDesiredWidth(parentWidget()->width());
-        /* Adjust geometry: */
-        sltAdjustGeometry();
-    }
-}
-
-void UIPopupStack::recallPopupPane(const QString &strPopupPaneID)
+}
+
+void UIPopupStackViewport::recallPopupPane(const QString &strPopupPaneID)
 {
     /* Make sure there is such popup-pane already: */
@@ -137 +379 @@
 }
 
-void UIPopupStack::setParent(QWidget *pParent)
-{
-    /* Call to base-class: */
-    QWidget::setParent(pParent);
-    /* Recalculate parent menu-bar height: */
-    m_iParentMenuBarHeight = parentMenuBarHeight(pParent);
-    /* Recalculate parent status-bar height: */
-    m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
-}
-
-void UIPopupStack::setParent(QWidget *pParent, Qt::WindowFlags flags)
-{
-    /* Call to base-class: */
-    QWidget::setParent(pParent, flags);
-    /* Recalculate parent menu-bar height: */
-    m_iParentMenuBarHeight = parentMenuBarHeight(pParent);
-    /* Recalculate parent status-bar height: */
-    m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
-}
-
-void UIPopupStack::sltAdjustGeometry()
-{
-    /* Adjust geometry only if parent is currently set: */
-    if (!parent())
-        return;
-
+void UIPopupStackViewport::sltHandleProposalForWidth(int iWidth)
+{
+    /* Subtract layout margins: */
+    iWidth -= 2 * m_iLayoutMargin;
+
+    /* Propagate resulting width to popups: */
+    emit sigProposePopupPaneWidth(iWidth);
+}
+
+void UIPopupStackViewport::sltAdjustGeometry()
+{
     /* Update size-hint: */
     updateSizeHint();
 
-    /* Get this attributes: */
-    bool fIsWindow = isWindow();
-    const int iX = fIsWindow ? parentWidget()->x() : 0;
-    const int iY = fIsWindow ? parentWidget()->y() : m_iParentMenuBarHeight;
-    const int iWidth = parentWidget()->width();
-    const int iHeight = m_minimumSizeHint.height();
-
-    /* Move/resize according parent: */
-    setGeometry(iX, iY, iWidth, iHeight);
-
     /* Layout content: */
     layoutContent();
-}
-
-void UIPopupStack::sltPopupPaneDone(int iResultCode)
+
+    /* Notify parent popup-stack: */
+    emit sigSizeHintChanged();
+}
+
+void UIPopupStackViewport::sltPopupPaneDone(int iResultCode)
 {
     /* Make sure the sender is the popup-pane: */
@@ -198 +418 @@
     }
 
-    /* Notify listeners about popup-pane: */
+    /* Notify listeners about popup-pane removal: */
     emit sigPopupPaneDone(strPopupPaneID, iResultCode);
 
@@ -205 +425 @@
     delete pPopupPane;
 
-    /* Give focus back to parent: */
-    if (parentWidget())
-        parentWidget()->setFocus();
-
-    /* Layout content: */
-    layoutContent();
+    /* Notify listeners about popup-pane removed: */
+    emit sigPopupPaneRemoved(strPopupPaneID);
+
+    /* Adjust geometry: */
+    sltAdjustGeometry();
 
     /* Make sure this stack still contains popup-panes: */
@@ -220 +439 @@
 }
 
-void UIPopupStack::updateSizeHint()
+void UIPopupStackViewport::updateSizeHint()
 {
     /* Calculate minimum width-hint: */
@@ -252 +471 @@
 }
 
-void UIPopupStack::setDesiredWidth(int iWidth)
-{
-    /* Propagate desired width to all the popup-panes we have: */
-    foreach (UIPopupPane *pPane, m_panes)
-        pPane->setDesiredWidth(iWidth - 2 * m_iLayoutMargin);
-}
-
-void UIPopupStack::layoutContent()
+void UIPopupStackViewport::layoutContent()
 {
     /* Get attributes: */
@@ -269 +481 @@
     {
         /* Get pane attributes: */
-        const int iPaneWidth = width() - 2 * m_iLayoutMargin;
-        const int iPaneHeight = pPane->minimumSizeHint().height();
+        QSize paneSize = pPane->minimumSizeHint();
+        const int iPaneWidth = paneSize.width();
+        const int iPaneHeight = paneSize.height();
         /* Adjust geometry for the pane: */
-        pPane->move(iX, iY);
-        pPane->resize(iPaneWidth, iPaneHeight);
+        pPane->setGeometry(iX, iY, iPaneWidth, iPaneHeight);
         pPane->layoutContent();
         /* Increment placeholder: */
@@ -280 +492 @@
 }
 
-bool UIPopupStack::eventFilter(QObject *pWatched, QEvent *pEvent)
-{
-    /* Make sure its parent event came: */
-    if (!parent() || pWatched != parent())
-        return false;
-
-    /* Make sure its resize event came: */
-    if (pEvent->type() != QEvent::Resize)
-        return false;
-
-    /* Propagate desired width: */
-    setDesiredWidth(parentWidget()->width());
-    /* Adjust geometry: */
-    sltAdjustGeometry();
-
-    /* Do not filter anything: */
-    return false;
-}
-
-void UIPopupStack::showEvent(QShowEvent*)
-{
-    /* Adjust geometry only if parent is currently set: */
-    if (parent())
-    {
-        /* Propagate desired width: */
-        setDesiredWidth(parentWidget()->width());
-        /* Adjust geometry: */
-        sltAdjustGeometry();
-    }
-}
-
-/* static */
-int UIPopupStack::parentMenuBarHeight(QWidget *pParent)
-{
-    /* Menu-bar can exist only on QMainWindow sub-class: */
-    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
-    {
-        /* Search for existing menu-bar child: */
-        if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
-            return pMenuBar->height();
-    }
-    /* Zero by default: */
-    return 0;
-}
-
-/* static */
-int UIPopupStack::parentStatusBarHeight(QWidget *pParent)
-{
-    /* Status-bar can exist only on QMainWindow sub-class: */
-    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
-    {
-        /* Search for existing status-bar child: */
-        if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())
-            return pStatusBar->height();
-    }
-    /* Zero by default: */
-    return 0;
-}
-

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

@@ -25 +25 @@
 
 /* Forward declaration: */
+class QVBoxLayout;
+class QScrollArea;
 class UIPopupPane;
+class UIPopupStackViewport;
 
 /* Popup-stack prototype class: */
@@ -33 +36 @@
 
 signals:
+
+    /* Notifier: Layout stuff: */
+    void sigProposeStackViewportWidth(int iWidth);
 
     /* Notifier: Popup-pane stuff: */
@@ -64 +70 @@
     void sltAdjustGeometry();
 
-    /* Handler: Popup-pane stuff: */
-    void sltPopupPaneDone(int iButtonCode);
+    /* Handler: Popuyp-pane stuff: */
+    void sltPopupPaneRemoved(QString strPopupPaneID);
 
 private:
 
-    /* Helpers: Layout stuff: */
-    QSize minimumSizeHint() const { return m_minimumSizeHint; }
-    void updateSizeHint();
-    void setDesiredWidth(int iWidth);
-    void layoutContent();
+    /* Helpers: Prepare stuff: */
+    void prepare();
+    void prepareContent();
 
     /* Handler: Event-filter stuff: */
@@ -81 +85 @@
     void showEvent(QShowEvent *pEvent);
 
+    /* Helper: Layout stuff: */
+    void propagateWidth();
+
     /* Static helpers: Prepare stuff: */
     static int parentMenuBarHeight(QWidget *pParent);
     static int parentStatusBarHeight(QWidget *pParent);
 
-    /* Variables: */
+    /* Variables: Widget stuff: */
+    QVBoxLayout *m_pMainLayout;
+    QScrollArea *m_pScrollArea;
+    UIPopupStackViewport *m_pScrollViewport;
+
+    /* Variables: Layout stuff: */
+    int m_iParentMenuBarHeight;
+    int m_iParentStatusBarHeight;
+};
+
+/* Popup-stack viewport prototype class: */
+class UIPopupStackViewport : public QWidget
+{
+    Q_OBJECT;
+
+signals:
+
+    /* Notifier: Layout stuff: */
+    void sigProposePopupPaneWidth(int iWidth);
+    void sigSizeHintChanged();
+
+    /* Notifier: Popup-pane stuff: */
+    void sigPopupPaneDone(QString strPopupPaneID, int iResultCode);
+    void sigPopupPaneRemoved(QString strPopupPaneID);
+
+    /* Notifier: Popup-stack stuff: */
+    void sigRemove();
+
+public:
+
+    /* Constructor: */
+    UIPopupStackViewport();
+
+    /* API: Popup-pane stuff: */
+    bool exists(const QString &strPopupPaneID) const;
+    void createPopupPane(const QString &strPopupPaneID,
+                         const QString &strMessage, const QString &strDetails,
+                         const QMap<int, QString> &buttonDescriptions,
+                         bool fProposeAutoConfirmation);
+    void updatePopupPane(const QString &strPopupPaneID,
+                         const QString &strMessage, const QString &strDetails);
+    void recallPopupPane(const QString &strPopupPaneID);
+
+    /* API: Layout stuff: */
+    QSize minimumSizeHint() const { return m_minimumSizeHint; }
+
+private slots:
+
+    /* Handlers: Layout stuff: */
+    void sltHandleProposalForWidth(int iWidth);
+    void sltAdjustGeometry();
+
+    /* Handler: Popup-pane stuff: */
+    void sltPopupPaneDone(int iButtonCode);
+
+private:
+
+    /* Helpers: Layout stuff: */
+    void updateSizeHint();
+    void layoutContent();
+
+    /* Variables: Layout stuff: */
     const int m_iLayoutMargin;
     const int m_iLayoutSpacing;
     QSize m_minimumSizeHint;
-    int m_iParentMenuBarHeight;
-    int m_iParentStatusBarHeight;
+
+    /* Variables: Children stuff: */
     QMap<QString, UIPopupPane*> m_panes;
 };