Changeset 38582 in vbox

Timestamp:

Aug 31, 2011 1:09:09 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73773

Message:

FE/Qt: also show the version of the old installed extpack

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• net/UIUpdateManager.cpp (modified) (2 diffs)

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

@@ -1790 +1790 @@
 }
 
-bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName)
+bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion)
 {
     return messageOkCancel(mainWindowShown(), Question,
-                           tr("<p>You have an old <b><nobr>%1</nobr></b> installed.</p>"
+                           tr("<p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p>"
                               "<p>Do you wish to download latest one from the Internet?</p>")
-                              .arg(strExtPackName),
+                              .arg(strExtPackVersion).arg(strExtPackName),
                            0, /* Auto-confirm Id */
                            tr("Download", "extension pack"));

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

@@ -310 +310 @@
     void warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget);
 
-    bool proposeDownloadExtensionPack(const QString &strExtPackName);
+    bool proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion);
     bool confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize);
     bool proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo);

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -138 +138 @@
     VBoxVersion vboxVersion(vboxGlobal().vboxVersionStringNormalized());
     /* Get extension pack version: */
-    VBoxVersion extPackVersion(extPack.GetVersion().remove(VBOX_BUILD_PUBLISHER));
+    QString strExtPackVersion(extPack.GetVersion().remove(VBOX_BUILD_PUBLISHER));
+    VBoxVersion extPackVersion(strExtPackVersion);
     /* Check if extension pack version less than required: */
     if ((vboxVersion.z() % 2 != 0) /* Skip unstable VBox version */ ||
@@ -145 +146 @@
 
     /* Ask the user about extension pack downloading: */
-    if (!msgCenter().proposeDownloadExtensionPack(UI_ExtPackName))
+    if (!msgCenter().proposeDownloadExtensionPack(UI_ExtPackName, strExtPackVersion))
         return;