Changeset 47612 in vbox

Timestamp:

Aug 8, 2013 12:35:01 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Modal-window Manager: Make sure progress-dialog which passed as parent to other modal-dialog is shown before that.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIModalWindowManager.cpp (modified) (4 diffs)
• globals/UIModalWindowManager.h (modified) (1 diff)
• widgets/UIProgressDialog.cpp (modified) (4 diffs)
• widgets/UIProgressDialog.h (modified) (2 diffs)

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

@@ -23 +23 @@
 #include "UINetworkManager.h"
 #include "UISelectorWindow.h"
+#include "UIProgressDialog.h"
 #include "VBoxGlobal.h"
 
@@ -126 +127 @@
             {
                 /* Return the 'top' of the iterated-window-stack as the result: */
-                return iteratedWindowStack.last();
+                QWidget *pTopWindow = iteratedWindowStack.last();
+                preprocessRealParent(pTopWindow);
+                return pTopWindow;
             }
         }
@@ -133 +136 @@
     /* If we unable to found the possible-parent-window among all ours,
      * we have to add it as the new-window-stack only element: */
-    QList<QWidget*> newWindowStack(QList<QWidget*>() << pTopLevelWindow);
-    m_windows << newWindowStack;
+    registerNewParent(pTopLevelWindow);
     /* And return as the result: */
     return pTopLevelWindow;
@@ -292 +294 @@
 }
 
+/* static */
+void UIModalWindowManager::preprocessRealParent(QWidget *pParent)
+{
+    /* Progress dialog can be hidden while we are trying to use it as top-most modal parent,
+     * We should show it in such cases because else on MacOS X there will be a problem. */
+    if (UIProgressDialog *pProgressDialog = qobject_cast<UIProgressDialog*>(pParent))
+        pProgressDialog->show();
+}
+

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

@@ -64 +64 @@
     bool contains(QWidget *pParentWindow, bool fAsTheTopOfStack = false);
 
+    /* Static helper: Access stuff: */
+    static void preprocessRealParent(QWidget *pParent);
+
     /* Variables: */
     QList<QList<QWidget*> > m_windows;

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

@@ -56 +56 @@
 {
     /* Setup dialog: */
-    setModal(true);
     setWindowTitle(QString("%1: %2").arg(strTitle, m_progress.GetDescription()));
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -125 +124 @@
     /* The progress dialog will be shown automatically after
      * the duration is over if progress is not finished yet. */
-    QTimer::singleShot(cMinDuration, this, SLOT(sltShowDialog()));
+    QTimer::singleShot(cMinDuration, this, SLOT(showDialog()));
 }
 
@@ -178 +177 @@
     }
     return Rejected;
+}
+
+void UIProgressDialog::show()
+{
+    /* We should not show progress-dialog
+     * if it was already finalized but not yet closed.
+     * This could happens in case of some other
+     * modal dialog prevents our event-loop from
+     * being exit overlapping 'this'. */
+    if (!m_fEnded)
+        QIDialog::show();
 }
 
@@ -307 +317 @@
 }
 
-void UIProgressDialog::sltShowDialog()
-{
-    /* We should not show progress-dialog
-     * if it was already finalized but not yet closed.
-     * This could happens in case of some other
-     * modal dialog prevents our event-loop from
-     * being exit overlapping 'this'. */
-    if (!m_fEnded)
-        show();
-}
-
 void UIProgressDialog::sltCancelOperation()
 {

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

@@ -57 +57 @@
     int run(int aRefreshInterval);
 
+public slots:
+
+    /* Handler: Show stuff: */
+    void show();
+
 protected:
 
@@ -71 +76 @@
 private slots:
 
-    /* Handlers: */
-    void sltShowDialog();
+    /* Handler: Cancel stuff: */
     void sltCancelOperation();