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

Timestamp:

Aug 1, 2007 3:47:41 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: GA Download UI: Show 0% initially.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (5 diffs)

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

@@ -230 +230 @@
         mProgressBar = new QProgressBar (this);
         mProgressBar->setFixedWidth (100);
+        mProgressBar->setPercentageVisible (true);
+        mProgressBar->setProgress (0);
+
         mCancelButton = new QToolButton (this);
         mCancelButton->setAutoRaise (true);
@@ -273 +276 @@
     {
         mCancelButton->setText (tr ("Cancel"));
-        QToolTip::add (mProgressBar, tr ("Downloading the VirtualBox Guest Additions CD image "
-                                         "from <nobr><b>%1</b>...</nobr>")
+        QToolTip::add (mProgressBar, tr ("Downloading the VirtualBox Guest Additions "
+                                         "CD image from <nobr><b>%1</b>...</nobr>")
                                      .arg (mProtocol + mHost + mPath + mFile));
         QToolTip::add (mCancelButton, tr ("Cancel the VirtualBox Guest "
@@ -295 +298 @@
                 if (mStatus == 404)
                     abortDownload (tr ("Could not locate the file on "
-                                       "the server."));
+                                       "the server (response: %1).")
+                                   .arg (mStatus));
                 else
                     processFile (aTotal);
@@ -352 +356 @@
     void processTimeout()
     {
-        if (mConnectDone) return;
+        if (mConnectDone)
+            return;
         mHttp->abort();
-        abortDownload (tr ("The download process has been cancelled "
-                           "due to connection timeout."));
+        abortDownload (tr ("Connection timed out."));
     }
 
@@ -401 +405 @@
         }
         else
-            abortDownload (tr ("Download rejected by user."));
-    }
-
-    /* This wrapper displays the error message box with the root cause of the
-     * download procedure termination. It is also used to command the
-     * downloader to terminate himself after all the events being processed. */
-    void abortDownload (const QString &aReason)
+            abortDownload();
+    }
+
+    /* This wrapper displays an error message box (unless @aReason is
+     * QString::null) with the cause of the download procedure
+     * termination. After the message box is dismissed, the downloader signals
+     * to close itself on the next event loop iteration. */
+    void abortDownload (const QString &aReason = QString::null)
     {
         /* Protect against double kill request. */
-        if (mSuicide) return;
+        if (mSuicide)
+            return;
         mSuicide = true;
 
-        vboxProblem().cannotDownloadGuestAdditions (mProtocol + mHost +
-                                                    mPath + mFile, aReason);
+        if (!aReason.isNull())
+            vboxProblem().cannotDownloadGuestAdditions (mProtocol + mHost +
+                                                        mPath + mFile, aReason);
         /* Allows all the queued signals to be processed before quit. */
         QTimer::singleShot (0, this, SLOT (suicide()));