Changeset 45939 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 7, 2013 5:16:31 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Support for visual-representation mode change; Popup-stack: Layout tuning.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (8 diffs)
• globals/UIPopupCenter.h (modified) (3 diffs)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (4 diffs)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (3 diffs)
• runtime/scale/UIMachineLogicScale.cpp (modified) (3 diffs)
• runtime/seamless/UIMachineLogicSeamless.cpp (modified) (4 diffs)
• widgets/UIPopupStack.cpp (modified) (8 diffs)
• widgets/UIPopupStack.h (modified) (5 diffs)

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

@@ -21 +21 @@
 #include "UIPopupCenter.h"
 #include "UIPopupStack.h"
+#include "UIMachineWindow.h"
 #include "QIMessageBox.h"
 #include "VBoxGlobal.h"
@@ -49 +50 @@
         return;
 
+    /* Cleanup instance: */
+    m_spInstance->cleanup();
     /* Destroy instance: */
     delete m_spInstance;
@@ -63 +66 @@
     /* Unassign instance: */
     m_spInstance = 0;
+}
+
+void UIPopupCenter::cleanup()
+{
+    /* Make sure all the popup-stacks destroyed: */
+    foreach (const QString &strPopupStackID, m_stacks.keys())
+    {
+        delete m_stacks[strPopupStackID];
+        m_stacks.remove(strPopupStackID);
+    }
 }
 
@@ -162 +175 @@
 
     /* Looking for the corresponding popup-stack: */
-    QString strPopupStackID = pParent->metaObject()->className();
+    const QString strPopupStackID(popupStackID(pParent));
     UIPopupStack *pPopupStack = 0;
     /* Is there already popup-stack with the same ID? */
@@ -174 +187 @@
     {
         /* Create new one: */
-        pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack(pParent);
+        pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack;
         /* Attach popup-stack connections: */
         connect(pPopupStack, SIGNAL(sigPopupPaneDone(QString, int)), this, SLOT(sltPopupPaneDone(QString, int)));
         connect(pPopupStack, SIGNAL(sigRemove()), this, SLOT(sltRemovePopupStack()));
         /* Show popup-stack: */
-        pPopupStack->show();
+        showPopupStack(pParent);
     }
 
@@ -202 +215 @@
 }
 
+void UIPopupCenter::showPopupStack(QWidget *pParent)
+{
+    /* Make sure passed parent is valid: */
+    if (!pParent)
+    {
+        AssertMsgFailed(("Passed parent is NULL"));
+        return;
+    }
+
+    /* Do we have a stack for passed parent? */
+    const QString strPopupStackID(popupStackID(pParent));
+    if (!m_stacks.contains(strPopupStackID))
+        return;
+
+    /* Install stack to passed parent: */
+    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
+    pParent->installEventFilter(pPopupStack);
+    pPopupStack->setParent(pParent);
+    pPopupStack->show();
+}
+
+void UIPopupCenter::hidePopupStack(QWidget *pParent)
+{
+    /* Make sure passed parent is valid: */
+    if (!pParent)
+    {
+        AssertMsgFailed(("Passed parent is NULL"));
+        return;
+    }
+
+    /* Do we have a stack for passed parent? */
+    const QString strPopupStackID(popupStackID(pParent));
+    if (!m_stacks.contains(strPopupStackID))
+        return;
+
+    /* Uninstall stack from passed parent: */
+    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
+    pPopupStack->hide();
+    pPopupStack->setParent(0);
+    pParent->removeEventFilter(pPopupStack);
+}
+
 void UIPopupCenter::sltPopupPaneDone(QString strPopupPaneID, int iResultCode)
 {
@@ -217 +272 @@
 }
 
+void UIPopupCenter::sltShowPopupStack()
+{
+    showPopupStack(vboxGlobal().activeMachineWindow());
+}
+
+void UIPopupCenter::sltHidePopupStack()
+{
+    hidePopupStack(vboxGlobal().activeMachineWindow());
+}
+
 void UIPopupCenter::sltRemovePopupStack()
 {
@@ -238 +303 @@
     m_stacks.remove(strPopupStackID);
     delete pPopupStack;
+}
+
+/* static */
+QString UIPopupCenter::popupStackID(QWidget *pParent)
+{
+    /* Make sure passed parent is always valid: */
+    if (!pParent)
+    {
+        AssertMsgFailed(("Passed parent is NULL"));
+        return QString();
+    }
+
+    /* Special handling for Runtime UI: */
+    if (qobject_cast<UIMachineWindow*>(pParent))
+        return QString("UIMachineWindow");
+
+    /* Common handling for other cases: */
+    return pParent->metaObject()->className();
 }
 

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

@@ -93 +93 @@
     void sltPopupPaneDone(QString strPopupPaneID, int iResultCode);
 
-    /* Handler: Popup-stack stuff: */
+    /* Handlers: Popup-stack stuff: */
+    void sltShowPopupStack();
+    void sltHidePopupStack();
     void sltRemovePopupStack();
 
@@ -102 +104 @@
     ~UIPopupCenter();
 
+    /* Helper: Cleanup stuff: */
+    void cleanup();
+
     /* Helper: Popup-pane stuff: */
     void showPopupPane(QWidget *pParent, const QString &strPopupPaneID,
@@ -108 +113 @@
                        const QString &strButtonText1, const QString &strButtonText2,
                        bool fProposeAutoConfirmation);
+
+    /* Helpers: Popup-stack stuff: */
+    void showPopupStack(QWidget *pParent);
+    void hidePopupStack(QWidget *pParent);
+
+    /* Static helper: Popup-stack stuff: */
+    static QString popupStackID(QWidget *pParent);
 
     /* Variable: Popup-stack stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -47 +47 @@
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
 #include "VBoxTakeSnapshotDlg.h"
 #include "VBoxVMInformationDlg.h"
@@ -533 +534 @@
 #endif /* Q_WS_MAC */
 {
+    /* Register popup-center connections: */
+    connect(this, SIGNAL(sigMachineWidnowsCreated()),
+            &popupCenter(), SLOT(sltShowPopupStack()));
+    connect(this, SIGNAL(sigMachineWidnowsDestroyed()),
+            &popupCenter(), SLOT(sltHidePopupStack()));
+}
+
+UIMachineLogic::~UIMachineLogic()
+{
+    /* Unregister popup-center connections: */
+    disconnect(this, SIGNAL(sigMachineWidnowsCreated()),
+               &popupCenter(), SLOT(sltShowPopupStack()));
+    disconnect(this, SIGNAL(sigMachineWidnowsDestroyed()),
+               &popupCenter(), SLOT(sltHidePopupStack()));
+}
+
+void UIMachineLogic::setMachineWindowsCreated(bool fIsWindowsCreated)
+{
+    /* Make sure something changed: */
+    if (m_fIsWindowsCreated == fIsWindowsCreated)
+        return;
+
+    /* Special handling for 'destroyed' case: */
+    if (!fIsWindowsCreated)
+    {
+        /* We emit this signal *before* the remembering new value
+         * because we want UIMachineLogic::activeMachineWindow() to be yet alive. */
+        emit sigMachineWidnowsDestroyed();
+    }
+
+    /* Remember new value: */
+    m_fIsWindowsCreated = fIsWindowsCreated;
+
+    /* Special handling for 'created' case: */
+    if (fIsWindowsCreated)
+    {
+        /* We emit this signal *after* the remembering new value
+         * because we want UIMachineLogic::activeMachineWindow() to be already alive. */
+        emit sigMachineWidnowsCreated();
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -53 +53 @@
     Q_OBJECT;
 
+signals:
+
+    /* Notifiers: Machine-window(s) stuff: */
+    void sigMachineWidnowsCreated();
+    void sigMachineWidnowsDestroyed();
+
 public:
 
@@ -112 +118 @@
 protected:
 
-    /* Constructor: */
+    /* Constructor/destructor: */
     UIMachineLogic(QObject *pParent, UISession *pSession, UIVisualStateType visualStateType);
+    ~UIMachineLogic();
 
     /* Protected getters/setters: */
     bool isMachineWindowsCreated() const { return m_fIsWindowsCreated; }
-    void setMachineWindowsCreated(bool fIsWindowsCreated) { m_fIsWindowsCreated = fIsWindowsCreated; }
+    void setMachineWindowsCreated(bool fIsWindowsCreated);
 
     /* Protected members: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -141 +141 @@
 void UIMachineLogicFullscreen::prepareMachineWindows()
 {
-    /* Do not create window(s) if they created already: */
+    /* Do not create machine-window(s) if they created already: */
     if (isMachineWindowsCreated())
         return;
@@ -151 +151 @@
 #endif /* Q_WS_MAC */
 
-    /* Update the multi screen layout: */
+    /* Update the multi-screen layout: */
     m_pScreenLayout->update();
 
-    /* Create machine window(s): */
+    /* Create machine-window(s): */
     for (uint cScreenId = 0; cScreenId < session().GetMachine().GetMonitorCount(); ++cScreenId)
         addMachineWindow(UIMachineWindow::create(this, cScreenId));
 
-    /* Connect screen-layout change handler: */
+    /* Connect multi-screen layout change handler: */
     for (int i = 0; i < machineWindows().size(); ++i)
         connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChanged()),
@@ -172 +172 @@
 #endif /* Q_WS_MAC */
 
-    /* Remember what machine window(s) created: */
+    /* Mark machine-window(s) created: */
     setMachineWindowsCreated(true);
 }
@@ -187 +187 @@
 void UIMachineLogicFullscreen::cleanupMachineWindows()
 {
-    /* Do not cleanup machine window(s) if not present: */
+    /* Do not destroy machine-window(s) if they destroyed already: */
     if (!isMachineWindowsCreated())
         return;
 
-    /* Cleanup machine window(s): */
+    /* Mark machine-window(s) destroyed: */
+    setMachineWindowsCreated(false);
+
+    /* Cleanup machine-window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -86 +86 @@
 void UIMachineLogicNormal::prepareMachineWindows()
 {
-    /* Do not create window(s) if they created already: */
+    /* Do not create machine-window(s) if they created already: */
     if (isMachineWindowsCreated())
         return;
@@ -105 +105 @@
         machineWindows()[uScreenId - 1]->raise();
 
-    /* Remember what machine window(s) created: */
+    /* Mark machine-window(s) created: */
     setMachineWindowsCreated(true);
 }
@@ -111 +111 @@
 void UIMachineLogicNormal::cleanupMachineWindows()
 {
-    /* Do not cleanup machine window(s) if not present: */
+    /* Do not destroy machine-window(s) if they destroyed already: */
     if (!isMachineWindowsCreated())
         return;
 
-    /* Cleanup machine window(s): */
+    /* Mark machine-window(s) destroyed: */
+    setMachineWindowsCreated(false);
+
+    /* Cleanup machine-window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -66 +66 @@
 void UIMachineLogicScale::prepareMachineWindows()
 {
-    /* Do not create window(s) if they created already: */
+    /* Do not create machine-window(s) if they created already: */
     if (isMachineWindowsCreated())
         return;
@@ -85 +85 @@
         machineWindows()[uScreenId - 1]->raise();
 
-    /* Remember what machine window(s) created: */
+    /* Mark machine-window(s) created: */
     setMachineWindowsCreated(true);
 }
@@ -91 +91 @@
 void UIMachineLogicScale::cleanupMachineWindows()
 {
-    /* Do not cleanup machine window(s) if not present: */
+    /* Do not destroy machine-window(s) if they destroyed already: */
     if (!isMachineWindowsCreated())
         return;
 
-    /* Cleanup machine window(s): */
+    /* Mark machine-window(s) destroyed: */
+    setMachineWindowsCreated(false);
+
+    /* Cleanup machine-window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -125 +125 @@
 void UIMachineLogicSeamless::prepareMachineWindows()
 {
-    /* Do not create window(s) if they created already: */
+    /* Do not create machine-window(s) if they created already: */
     if (isMachineWindowsCreated())
         return;
@@ -135 +135 @@
 #endif /* Q_WS_MAC */
 
-    /* Update the multi screen layout: */
+    /* Update the multi-screen layout: */
     m_pScreenLayout->update();
 
@@ -142 +142 @@
         addMachineWindow(UIMachineWindow::create(this, cScreenId));
 
-    /* Connect screen-layout change handler: */
+    /* Connect multi-screen layout change handler: */
     for (int i = 0; i < machineWindows().size(); ++i)
         connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChanged()),
                 static_cast<UIMachineWindowSeamless*>(machineWindows()[i]), SLOT(sltShowInNecessaryMode()));
 
-    /* Remember what machine window(s) created: */
+    /* Mark machine-window(s) created: */
     setMachineWindowsCreated(true);
 }
@@ -162 +162 @@
 void UIMachineLogicSeamless::cleanupMachineWindows()
 {
-    /* Do not cleanup machine window(s) if not present: */
+    /* Do not destroy machine-window(s) if they destroyed already: */
     if (!isMachineWindowsCreated())
         return;
 
-    /* Cleanup machine window(s): */
+    /* Mark machine-window(s) destroyed: */
+    setMachineWindowsCreated(false);
+
+    /* Cleanup machine-window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);

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

@@ -26 +26 @@
 #include "UIPopupStack.h"
 #include "UIPopupPane.h"
+#include "UIMachineWindowNormal.h"
 
 /* Other VBox includes: */
 #include <VBox/sup.h>
 
-UIPopupStack::UIPopupStack(QWidget *pParent)
-    : QWidget(pParent)
-    , m_fPolished(false)
-    , m_iLayoutMargin(2), m_iLayoutSpacing(0)
-    , m_iParentStatusBarHeight(parentStatusBarHeight(pParent))
-{
-    /* Prepare: */
-    prepare();
+UIPopupStack::UIPopupStack()
+    : m_iLayoutMargin(1), m_iLayoutSpacing(1)
+{
 }
 
@@ -69 +65 @@
     pPopupPane->show();
 
-    /* Propagate desired width: */
-    setDesiredWidth(parentWidget()->width());
-    /* Adjust geometry: */
-    sltAdjustGeometry();
+    /* Adjust geometry only if parent is currently set: */
+    if (parent())
+    {
+        /* Propagate desired width: */
+        setDesiredWidth(parentWidget()->width());
+        /* Adjust geometry: */
+        sltAdjustGeometry();
+    }
 }
 
@@ -91 +91 @@
     pPopupPane->setDetails(strDetails);
 
-    /* Propagate desired width: */
-    setDesiredWidth(parentWidget()->width());
-    /* Adjust geometry: */
-    sltAdjustGeometry();
+    /* Adjust geometry only if parent is currently set: */
+    if (parent())
+    {
+        /* Propagate desired width: */
+        setDesiredWidth(parentWidget()->width());
+        /* Adjust geometry: */
+        sltAdjustGeometry();
+    }
+}
+
+void UIPopupStack::setParent(QWidget *pParent)
+{
+    /* Call to base-class: */
+    QWidget::setParent(pParent);
+    /* Recalculate parent status-bar height: */
+    m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
 }
 
 void UIPopupStack::sltAdjustGeometry()
 {
+    /* Adjust geometry only if parent is currently set: */
+    if (!parent())
+        return;
+
     /* Get this attributes: */
     const int iWidth = parentWidget()->width();
@@ -137 +153 @@
     delete pPopupPane;
 
+    /* Layout content: */
+    layoutContent();
+
     /* Make sure this stack still contains popup-panes: */
     if (!m_panes.isEmpty())
@@ -143 +162 @@
     /* Notify listeners about popup-stack: */
     emit sigRemove();
-}
-
-void UIPopupStack::prepare()
-{
-    /* Install event-filter to parent: */
-    parent()->installEventFilter(this);
 }
 
@@ -226 +239 @@
 {
     /* Make sure its parent event came: */
-    if (pWatched != parent())
+    if (!parent() || pWatched != parent())
         return false;
 
@@ -242 +255 @@
 }
 
-void UIPopupStack::showEvent(QShowEvent *pEvent)
-{
-    /* Make sure we should polish dialog: */
-    if (m_fPolished)
-        return;
-
-    /* Call to polish-event: */
-    polishEvent(pEvent);
-
-    /* Mark dialog as polished: */
-    m_fPolished = true;
-}
-
-void UIPopupStack::polishEvent(QShowEvent*)
-{
-    /* Propagate desired width: */
-    setDesiredWidth(parentWidget()->width());
-    /* Adjust geometry: */
-    sltAdjustGeometry();
+void UIPopupStack::showEvent(QShowEvent*)
+{
+    /* Adjust geometry only if parent is currently set: */
+    if (parent())
+    {
+        /* Propagate desired width: */
+        setDesiredWidth(parentWidget()->width());
+        /* Adjust geometry: */
+        sltAdjustGeometry();
+    }
 }
 
@@ -266 +270 @@
 int UIPopupStack::parentStatusBarHeight(QWidget *pParent)
 {
-    /* Check if passed parent is QMainWindow and contains status-bar: */
-    if (QMainWindow *pParentWindow = qobject_cast<QMainWindow*>(pParent))
-        if (pParentWindow->statusBar())
-            return pParentWindow->statusBar()->height();
+    /* Status-bar can exist only on QMainWindow sub-class: */
+    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
+    {
+        /* Status-bar can exist only:
+         * 1. on non-machine-window
+         * 2. on machine-window in normal mode: */
+        if (!qobject_cast<UIMachineWindow*>(pMainWindow) ||
+            qobject_cast<UIMachineWindowNormal*>(pMainWindow))
+            return pMainWindow->statusBar()->height();
+    }
     /* Zero by default: */
     return 0;

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

@@ -43 +43 @@
 
     /* Constructor: */
-    UIPopupStack(QWidget *pParent);
+    UIPopupStack();
 
     /* API: Popup-pane stuff: */
@@ -53 +53 @@
     void updatePopupPane(const QString &strPopupPaneID,
                          const QString &strMessage, const QString &strDetails);
+
+    /* API: Parent stuff: */
+    void setParent(QWidget *pParent);
 
 private slots:
@@ -64 +67 @@
 private:
 
-    /* Helper: Prepare stuff: */
-    void prepare();
-
     /* Helpers: Layout stuff: */
     int minimumWidthHint();
@@ -77 +77 @@
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
 
-    /* Handlers: Event stuff: */
-    virtual void showEvent(QShowEvent *pEvent);
-    virtual void polishEvent(QShowEvent *pEvent);
+    /* Handler: Event stuff: */
+    void showEvent(QShowEvent *pEvent);
 
     /* Static helpers: Prepare stuff: */
@@ -85 +84 @@
 
     /* Variables: */
-    bool m_fPolished;
     const int m_iLayoutMargin;
     const int m_iLayoutSpacing;
-    const int m_iParentStatusBarHeight;
+    int m_iParentStatusBarHeight;
     QMap<QString, UIPopupPane*> m_panes;
 };