Changeset 47644 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 9, 2013 1:40:03 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Support for popup-stack orientation (top/bottom) setting.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (3 diffs)
• globals/UIPopupCenter.h (modified) (3 diffs)
• widgets/UIPopupStack.cpp (modified) (4 diffs)
• widgets/UIPopupStack.h (modified) (4 diffs)

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

@@ -125 +125 @@
     AssertPtrReturnVoid(pParent);
 
-    /* Composing corresponding popup-stack: */
+    /* Composing corresponding popup-stack ID: */
     const QString strPopupStackID(popupStackID(pParent));
 
@@ -141 +141 @@
                 newStackType == UIPopupStackType_Separate ? "separate window" : "embedded widget"));
     stackType = newStackType;
+}
+
+void UIPopupCenter::setPopupStackOrientation(QWidget *pParent, UIPopupStackOrientation newStackOrientation)
+{
+    /* Make sure parent is set! */
+    AssertPtrReturnVoid(pParent);
+
+    /* Composing corresponding popup-stack ID: */
+    const QString strPopupStackID(popupStackID(pParent));
+
+    /* Looking for current popup-stack orientation, create if it doesn't exists: */
+    UIPopupStackOrientation &stackOrientation = m_stackOrientations[strPopupStackID];
+
+    /* Make sure stack-orientation has changed: */
+    if (stackOrientation == newStackOrientation)
+        return;
+
+    /* Remember new stack orientation: */
+    LogRelFlow(("UIPopupCenter::setPopupStackType: Changing orientation of popup-stack with ID = '%s' from '%s' to '%s'.\n",
+                strPopupStackID.toAscii().constData(),
+                stackOrientation == UIPopupStackOrientation_Top ? "top oriented" : "bottom oriented",
+                newStackOrientation == UIPopupStackOrientation_Top ? "top oriented" : "bottom oriented"));
+    stackOrientation = newStackOrientation;
+
+    /* Update orientation for popup-stack if it currently exists: */
+    if (m_stacks.contains(strPopupStackID))
+        m_stacks[strPopupStackID]->setOrientation(stackOrientation);
 }
 
@@ -245 +272 @@
     {
         /* Create new one: */
-        pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack(strPopupStackID);
+        pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack(strPopupStackID, m_stackOrientations[strPopupStackID]);
         /* Attach popup-stack connections: */
         connect(pPopupStack, SIGNAL(sigPopupPaneDone(QString, int)), this, SLOT(sltPopupPaneDone(QString, int)));

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

@@ -36 +36 @@
 };
 
+/* Popup-stack orientations: */
+enum UIPopupStackOrientation
+{
+    UIPopupStackOrientation_Top,
+    UIPopupStackOrientation_Bottom
+};
+
 /* Popup-center singleton: */
 class UIPopupCenter: public QObject
@@ -56 +63 @@
     void hidePopupStack(QWidget *pParent);
     void setPopupStackType(QWidget *pParent, UIPopupStackType newStackType);
+    void setPopupStackOrientation(QWidget *pParent, UIPopupStackOrientation newStackOrientation);
 
     /* API: Main message function.
@@ -130 +138 @@
     /* Variables: Popup-stack stuff: */
     QMap<QString, UIPopupStackType> m_stackTypes;
+    QMap<QString, UIPopupStackOrientation> m_stackOrientations;
     QMap<QString, QPointer<UIPopupStack> > m_stacks;
 

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

@@ -30 +30 @@
 #include "UIPopupStackViewport.h"
 
-UIPopupStack::UIPopupStack(const QString &strID)
+UIPopupStack::UIPopupStack(const QString &strID, UIPopupStackOrientation orientation)
     : m_strID(strID)
+    , m_orientation(orientation)
     , m_pScrollArea(0)
     , m_pScrollViewport(0)
@@ -74 +75 @@
     /* Redirect request to viewport: */
     m_pScrollViewport->recallPopupPane(strPopupPaneID);
+}
+
+void UIPopupStack::setOrientation(UIPopupStackOrientation orientation)
+{
+    /* Make sure orientation has changed: */
+    if (m_orientation == orientation)
+        return;
+
+    /* Update orientation: */
+    m_orientation = orientation;
+    sltAdjustGeometry();
 }
 
@@ -104 +116 @@
     /* Read parent geometry: */
     QRect geo(parentWidget()->geometry());
-
-    /* Determine origin: */
-    bool fIsWindow = isWindow();
-    int iX = fIsWindow ? geo.x() : 0;
-    int iY = fIsWindow ? geo.y() : 0;
-    /* Add menu-bar height: */
-    iY += m_iParentMenuBarHeight;
 
     /* Determine size: */
@@ -128 +133 @@
         /* Compare minimum and current height: */
         iHeight = qMin(iHeight, iMinimumHeight);
+    }
+
+    /* Determine origin: */
+    int iX = 0;
+    int iY = 0;
+    /* Shift for top-level window: */
+    if (isWindow())
+    {
+        iX += geo.x();
+        iY += geo.y();
+    }
+    switch (m_orientation)
+    {
+        case UIPopupStackOrientation_Top:
+        {
+            /* Just add menu-bar height: */
+            iY += m_iParentMenuBarHeight;
+            break;
+        }
+        case UIPopupStackOrientation_Bottom:
+        {
+            /* Shift to bottom: */
+            iY += (geo.height() - iHeight);
+            /* And subtract status-bar height: */
+            iY -= m_iParentStatusBarHeight;
+            break;
+        }
     }
 

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

@@ -24 +24 @@
 #include <QMap>
 
+/* GUI includes: */
+#include "UIPopupCenter.h"
+
 /* Forward declaration: */
 class QVBoxLayout;
@@ -48 +51 @@
 
     /* Constructor: */
-    UIPopupStack(const QString &strID);
+    UIPopupStack(const QString &strID, UIPopupStackOrientation orientation);
 
     /* API: Popup-pane stuff: */
@@ -59 +62 @@
                          const QString &strMessage, const QString &strDetails);
     void recallPopupPane(const QString &strPopupPaneID);
+    void setOrientation(UIPopupStackOrientation orientation);
 
     /* API: Parent stuff: */
@@ -94 +98 @@
     /* Variable: General stuff: */
     QString m_strID;
+    UIPopupStackOrientation m_orientation;
 
     /* Variables: Widget stuff: */