Changeset 20594 in vbox

Timestamp:

Jun 15, 2009 2:46:15 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: 4008: GUI modal lock up on starting VM on Solaris with a warning - Should be fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProgressDialog.h (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/VBoxProgressDialog.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProgressDialog.h

@@ -53 +53 @@
 
 public:
+
     VBoxProgressDialog (CProgress &aProgress, const QString &aTitle,
-                        int aMinDuration = 2000, QWidget *aParent = NULL);
+                        int aMinDuration = 2000, QWidget *aParent = 0);
 
     int run (int aRefreshInterval);
@@ -60 +61 @@
 
 protected:
+
     virtual void retranslateUi();
 
     virtual void reject();
+
     virtual void timerEvent (QTimerEvent *aEvent);
     virtual void closeEvent (QCloseEvent *aEvent);
 
 private slots:
+
+    void showDialog();
     void cancelOperation();
 
 private:
+
     /* Private member vars */
     CProgress &mProgress;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -249 +249 @@
     int aMinDuration)
 {
-    QApplication::setOverrideCursor (QCursor (Qt::WaitCursor));
-
-    VBoxProgressDialog progressDlg (aProgress, aTitle, aMinDuration,
-                                    aParent);
+    VBoxProgressDialog progressDlg (aProgress, aTitle, aMinDuration, aParent);
 
     /* run the dialog with the 100 ms refresh interval */
     progressDlg.run (100);
-
-    QApplication::restoreOverrideCursor();
 
     return true;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProgressDialog.cpp

@@ -22 +22 @@
 
 /* VBox includes */
+#include "COMDefs.h"
+#include "QIDialogButtonBox.h"
+#include "QILabel.h"
+#include "VBoxGlobal.h"
 #include "VBoxProgressDialog.h"
-#include "COMDefs.h"
-#include "QILabel.h"
-#include "QIDialogButtonBox.h"
-#include "VBoxGlobal.h"
 
 #ifdef Q_WS_MAC
@@ -33 +33 @@
 
 /* Qt includes */
-#include <QVBoxLayout>
+#include <QCloseEvent>
+#include <QEventLoop>
 #include <QProgressBar>
 #include <QTime>
-#include <QEventLoop>
-#include <QCloseEvent>
 #include <QTimer>
+#include <QVBoxLayout>
 
 const char *VBoxProgressDialog::sOpDescTpl = "%1... (%2/%3)";
 
-VBoxProgressDialog::VBoxProgressDialog (CProgress &aProgress, const QString &aTitle,
-                                        int aMinDuration /* = 2000 */, QWidget *aParent /* = NULL */)
+VBoxProgressDialog::VBoxProgressDialog (CProgress &aProgress,
+                                        const QString &aTitle,
+                                        int aMinDuration /* = 2000 */,
+                                        QWidget *aParent /* = 0 */)
   : QIDialog (aParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
   , mProgress (aProgress)
@@ -83 +85 @@
                          .arg (mProgress.GetOperationDescription()));
     mProgressBar->setMaximum (100);
-    setWindowTitle (QString ("%1: %2")
-                    .arg (aTitle, mProgress.GetDescription()));
-    QTimer::singleShot (aMinDuration, this, SLOT (show()));
+    setWindowTitle (QString ("%1: %2").arg (aTitle, mProgress.GetDescription()));
     mProgressBar->setValue (0);
     mCancelEnabled = aProgress.GetCancelable();
     if (mCancelEnabled)
     {
-        QDialogButtonBox *pBtnBox = new QDialogButtonBox (QDialogButtonBox::Cancel, Qt::Horizontal, this);
+        QDialogButtonBox *pBtnBox = new QDialogButtonBox (QDialogButtonBox::Cancel,
+                                                          Qt::Horizontal, this);
         pLayout1->addWidget (pBtnBox);
-        connect (pBtnBox, SIGNAL (rejected()),
-                 this, SLOT (cancelOperation()));
+        connect (pBtnBox, SIGNAL (rejected()), this, SLOT (cancelOperation()));
     }
 
     retranslateUi();
+
+    /* The progress dialog will be shown automatically after
+     * the duration is over if progress is not finished yet. */
+    QTimer::singleShot (aMinDuration, this, SLOT (showDialog()));
 }
 
@@ -111 +115 @@
         int id = startTimer (aRefreshInterval);
 
-        /* The progress dialog is automatically shown after the duration is over */
+        /* Set busy cursor */
+        QApplication::setOverrideCursor (QCursor (Qt::WaitCursor));
 
         /* Enter the modal loop */
@@ -124 +129 @@
 }
 
+void VBoxProgressDialog::showDialog()
+{
+    /* 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 (!mEnded)
+        show();
+}
+
 void VBoxProgressDialog::cancelOperation()
 {
@@ -131 +147 @@
 void VBoxProgressDialog::timerEvent (QTimerEvent * /* aEvent */)
 {
+    /* We should hide 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 (mEnded && !isHidden())
+        hide();
+
     if (!mEnded && (!mProgress.isOk() || mProgress.GetCompleted()))
     {
@@ -153 +177 @@
     if (mEnded)
     {
-        /* Exit loop if it is running */
         if (mEventLoop->isRunning())
+        {
+            /* Exit loop if it is running */
             mEventLoop->quit();
+
+            /* Restore normal cursor */
+            QApplication::restoreOverrideCursor();
+        }
         return;
     }
@@ -166 +195 @@
         if (newTime >= 0)
         {
-            QTime time(0, 0);
+            QTime time (0, 0);
             time = time.addSecs (newTime);
             mETA->setText (mETAText.arg (time.toString()));
-        }else
+        }
+        else
             mETA->clear();
         /* Then operation text if changed */