Changeset 3936 in vbox for trunk/src

Timestamp:

Jul 31, 2007 10:40:06 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: GA Download UI spelling.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (6 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

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

@@ -195 +195 @@
                                    const QString &, const QString &);
 
-    void cannotDonwloadGuestAdditions (const QString &aName,
+    void cannotDownloadGuestAdditions (const QString &aURL,
                                        const QString &aReason);
-
-    int warnAboutAdditionsDownload (const QString &aSrc1, const QString &aSrc2,
-                                    const QString &aName, ulong aSize);
-
+    int confirmDownloadAdditions (const QString &aSrc1, const QString &aSrc2,
+                                  const QString &aURL, ulong aSize);
     void warnAboutTooOldAdditions (QWidget *, const QString &, const QString &);
     void warnAboutOldAdditions (QWidget *, const QString &, const QString &);

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

@@ -289 +289 @@
                 mHttp->abort();
                 if (mStatus == 404)
-                    abortDownload (tr ("Unable to find the corresponding "
-                                       "Guest Additions Image file."));
+                    abortDownload (tr ("Could not locate the file on "
+                                       "the server."));
                 else
                     processFile (aTotal);
@@ -298 +298 @@
         }
         else
-            abortDownload (tr ("Couldn't determine file size."));
+            abortDownload (tr ("Could not determine the file size."));
     }
 
@@ -309 +309 @@
         {
             QString reason = mIsChecking ?
-                tr ("Checking Guest Additions file presence failed (%1).") :
-                tr ("Downloading Guest Additions file failed (%1).");
+                tr ("Could not connect to the server (%1).") :
+                tr ("Could not download the file (%1).");
             abortDownload (reason.arg (mHttp->errorString()));
         }
@@ -326 +326 @@
             }
             else
-                abortDownload (tr ("Could not write the local file."));
+                abortDownload (tr ("Could not save the downloaded file as "
+                                   "<nobr><b>%1</b></nobr>.")
+                               .arg (QDir::convertSeparators (path)));
         }
     }
@@ -362 +364 @@
     {
         /* Ask user about GA image downloading */
-        int rc = vboxProblem().warnAboutAdditionsDownload (mSrc1, mSrc2,
-                                          mHost + mPath + mFile, aSize);
+        int rc = vboxProblem().
+            confirmDownloadAdditions (mSrc1, mSrc2,
+                                      mHost + mPath + mFile, aSize);
         if (rc == QIMessageBox::Yes)
         {
@@ -380 +383 @@
     void abortDownload (const QString &aReason)
     {
-        vboxProblem().cannotDonwloadGuestAdditions (mHost + mPath + mFile,
+        vboxProblem().cannotDownloadGuestAdditions (mHost + mPath + mFile,
                                                     aReason);
         /* Allows all the queued signals to be processed before quit. */

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

@@ -1254 +1254 @@
 }
 
-void VBoxProblemReporter::cannotDonwloadGuestAdditions (const QString &aName,
+void VBoxProblemReporter::cannotDownloadGuestAdditions (const QString &aURL,
                                                         const QString &aReason)
 {
     QString msg = tr ("<p>Failed to download the VirtualBox Guest "
-        "Additions CD image <nobr><b>%1</b>.</nobr></p>").arg (aName);
+        "Additions CD image from <nobr><b>%1</b>.</nobr></p>").arg (aURL);
     msg += QString ("<p>%1</p>").arg (aReason);
     message (&vboxGlobal().consoleWnd(), Error, msg);
 }
 
-int VBoxProblemReporter::warnAboutAdditionsDownload (const QString &aSrc1,
-                                                     const QString &aSrc2,
-                                                     const QString &aName,
-                                                     ulong aSize)
+int VBoxProblemReporter::confirmDownloadAdditions (const QString &aSrc1,
+                                                   const QString &aSrc2,
+                                                   const QString &aURL,
+                                                   ulong aSize)
 {
     QString msg = tr ("<p>Failed to find the VirtualBox Guest Additions CD image "
                       "<nobr><b>%1</b></nobr> or "
                       "<nobr><b>%2</b></nobr></p>").arg (aSrc1).arg (aSrc2);
-    msg += tr ("<p>Do you want to download this image "
-               "<nobr><b>%1</b></nobr> (%2 bytes)?</p>").arg (aName).arg (aSize);
+    msg += tr ("<p>Do you want to download this image from "
+               "<nobr><b>%1</b></nobr> (%2 bytes)?</p>").arg (aURL).arg (aSize);
 
     return message (&vboxGlobal().consoleWnd(), Question, msg,