Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45342) @@ -1885,7 +1885,8 @@ } -bool UIMessageCenter::askAboutCancelAllNetworkRequest(QWidget *pParent) -{ - return messageOkCancel(pParent, MessageType_Question, tr("Do you wish to cancel all current network operations?")); +bool UIMessageCenter::confirmCancelingAllNetworkRequests() +{ + return messageOkCancel(networkManagerOrMainWindowShown(), MessageType_Question, + tr("Do you wish to cancel all current network operations?")); } @@ -1893,8 +1894,9 @@ { message(networkManagerOrMainWindowShown(), MessageType_Info, - tr("

A new version of VirtualBox has been released! Version %1 is available at virtualbox.org.

" + tr("

A new version of VirtualBox has been released! Version %1 is available " + "at virtualbox.org.

" "

You can download this version using the link:

" "

%3

") - .arg(strVersion, strLink, strLink)); + .arg(strVersion, strLink, strLink)); } @@ -1905,111 +1907,5 @@ } -bool UIMessageCenter::cannotFindGuestAdditions() -{ - return messageYesNo(mainMachineWindowShown(), MessageType_Question, - tr("

Could not find the VirtualBox Guest Additions " - "CD image file.

Do you wish to " - "download this CD image from the Internet?

")); -} - -bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize) -{ - QLocale loc(VBoxGlobal::languageId()); - return messageOkCancel(networkManagerOrMainMachineWindowShown(), MessageType_Question, - tr("

Are you sure you want to download the VirtualBox " - "Guest Additions CD image from " - "%2 " - "(size %3 bytes)?

").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)), - 0 /* auto-confirm id */, - tr("Download", "additions")); -} - -bool UIMessageCenter::confirmMountAdditions(const QString &strUrl, const QString &strSrc) -{ - return messageOkCancel(networkManagerOrMainMachineWindowShown(), MessageType_Question, - tr("

The VirtualBox Guest Additions CD image has been " - "successfully downloaded from " - "%2 " - "and saved locally as %3.

" - "

Do you wish to register this CD image and mount it " - "on the virtual CD/DVD drive?

") - .arg(strUrl).arg(strUrl).arg(strSrc), - 0 /* auto-confirm id */, - tr("Mount", "additions")); -} - -void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) -{ - message(mainMachineWindowShown(), MessageType_Error, - tr("

Could not insert the VirtualBox Guest Additions " - "installer CD image into the virtual machine %1, as the machine " - "has no CD/DVD-ROM drives. Please add a drive using the " - "storage page of the virtual machine settings dialog.

") - .arg(strMachineName)); -} - -void UIMessageCenter::warnAboutAdditionsCantBeSaved(const QString &strTarget) -{ - message(networkManagerOrMainMachineWindowShown(), MessageType_Error, - tr("

Failed to save the downloaded file as %1.

") - .arg(QDir::toNativeSeparators(strTarget))); -} - -bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocation) -{ - return messageOkCancel(mainWindowShown(), MessageType_Question, - tr("

Could not find the VirtualBox User Manual " - "%1.

Do you wish to " - "download this file from the Internet?

") - .arg(strMissedLocation), - 0 /* auto-confirm id */, - tr("Download", "additions")); -} - -bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize) -{ - QLocale loc(VBoxGlobal::languageId()); - return messageOkCancel(networkManagerOrMainWindowShown(), MessageType_Question, - tr("

Are you sure you want to download the VirtualBox " - "User Manual from " - "%2 " - "(size %3 bytes)?

").arg(strURL).arg(strURL).arg(loc.toString(uSize)), - 0 /* auto-confirm id */, - tr("Download", "additions")); -} - -void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) -{ - message(networkManagerOrMainWindowShown(), MessageType_Warning, - tr("

The VirtualBox User Manual has been " - "successfully downloaded from " - "%2 " - "and saved locally as %3.

") - .arg(strURL).arg(strURL).arg(strTarget)); -} - -void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget) -{ - message(networkManagerOrMainWindowShown(), MessageType_Error, - tr("

The VirtualBox User Manual has been " - "successfully downloaded from " - "%2 " - "but can't be saved locally as %3.

" - "

Please choose another location for that file.

") - .arg(strURL).arg(strURL).arg(strTarget)); -} - -bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) -{ - return messageOkCancel(mainWindowShown(), - MessageType_Question, - tr("

You have an old version (%1) of the %2 installed.

" - "

Do you wish to download latest one from the Internet?

") - .arg(strExtPackVersion).arg(strExtPackName), - 0 /* auto-confirm id */, - tr("Download", "extension pack")); -} - -bool UIMessageCenter::requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) +bool UIMessageCenter::askUserToDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) { return message(mainWindowShown(), MessageType_Info, @@ -2024,5 +1920,115 @@ } -bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) +bool UIMessageCenter::cannotFindGuestAdditions() const +{ + return messageYesNo(mainMachineWindowShown(), MessageType_Question, + tr("

Could not find the VirtualBox Guest Additions CD image.

" + "

Do you wish to download this CD image from the Internet?

"), + 0 /* auto-confirm id */, + tr("Download")); +} + +bool UIMessageCenter::confirmDownloadGuestAdditions(const QString &strUrl, qulonglong uSize) const +{ + QLocale loc(VBoxGlobal::languageId()); + return messageOkCancel(networkManagerOrMainMachineWindowShown(), MessageType_Question, + tr("

Are you sure you want to download the VirtualBox Guest Additions CD image " + "from %1 (size %2 bytes)?

") + .arg(strUrl, loc.toString(uSize)), + 0 /* auto-confirm id */, + tr("Download")); +} + +void UIMessageCenter::cannotSaveGuestAdditions(const QString &strURL, const QString &strTarget) const +{ + message(networkManagerOrMainMachineWindowShown(), MessageType_Error, + tr("

The VirtualBox Guest Additions CD image has been successfully downloaded " + "from %1 " + "but can't be saved locally as %2.

" + "

Please choose another location for that file.

") + .arg(strURL, strTarget)); +} + +bool UIMessageCenter::proposeMountGuestAdditions(const QString &strUrl, const QString &strSrc) const +{ + return messageOkCancel(networkManagerOrMainMachineWindowShown(), MessageType_Question, + tr("

The VirtualBox Guest Additions CD image has been successfully downloaded " + "from %1 " + "and saved locally as %2.

" + "

Do you wish to register this CD image and mount it on the virtual CD/DVD drive?

") + .arg(strUrl, strSrc), + 0 /* auto-confirm id */, + tr("Mount", "additions")); +} + +void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const +{ + message(mainMachineWindowShown(), MessageType_Error, + tr("

Could not insert the VirtualBox Guest Additions CD image into the virtual machine %1, " + "as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the " + "virtual machine settings dialog.

") + .arg(strMachineName)); +} + +void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress) const +{ + message(mainMachineWindowShown(), MessageType_Error, + tr("Failed to update Guest Additions. " + "The Guest Additions installation image will be mounted to provide a manual installation."), + !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo())); +} + +bool UIMessageCenter::cannotFindUserManual(const QString &strMissedLocation) const +{ + return messageYesNo(mainWindowShown(), MessageType_Question, + tr("

Could not find the VirtualBox User Manual %1.

" + "

Do you wish to download this file from the Internet?

") + .arg(strMissedLocation), + 0 /* auto-confirm id */, + tr("Download")); +} + +bool UIMessageCenter::confirmDownloadUserManual(const QString &strURL, qulonglong uSize) const +{ + QLocale loc(VBoxGlobal::languageId()); + return messageOkCancel(networkManagerOrMainWindowShown(), MessageType_Question, + tr("

Are you sure you want to download the VirtualBox User Manual " + "from %1 (size %2 bytes)?

") + .arg(strURL, loc.toString(uSize)), + 0 /* auto-confirm id */, + tr("Download")); +} + +void UIMessageCenter::cannotSaveUserManual(const QString &strURL, const QString &strTarget) const +{ + message(networkManagerOrMainWindowShown(), MessageType_Error, + tr("

The VirtualBox User Manual has been successfully downloaded " + "from %1 " + "but can't be saved locally as %2.

" + "

Please choose another location for that file.

") + .arg(strURL, strTarget)); +} + +void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) const +{ + message(networkManagerOrMainWindowShown(), MessageType_Warning, + tr("

The VirtualBox User Manual has been successfully downloaded " + "from %1 " + "and saved locally as %2.

") + .arg(strURL, strTarget)); +} + +bool UIMessageCenter::warAboutOutdatedExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) const +{ + return messageYesNo(mainWindowShown(), + MessageType_Question, + tr("

You have an old version (%1) of the %2 installed.

" + "

Do you wish to download latest one from the Internet?

") + .arg(strExtPackVersion).arg(strExtPackName), + 0 /* auto-confirm id */, + tr("Download")); +} + +bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) const { QLocale loc(VBoxGlobal::languageId()); @@ -2032,90 +2038,31 @@ .arg(strExtPackName, strURL, loc.toString(uSize)), 0 /* auto-confirm id */, - tr("Download", "extension pack")); -} - -bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) + tr("Download")); +} + +void UIMessageCenter::cannotSaveExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const +{ + message(networkManagerOrMainWindowShown(), MessageType_Error, + tr("

The %1 has been successfully downloaded " + "from %2 " + "but can't be saved locally as %3.

" + "

Please choose another location for that file.

") + .arg(strExtPackName, strFrom, strTo)); +} + +bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const { return messageOkCancel(networkManagerOrMainWindowShown(), MessageType_Question, - tr("

The %1 has been " - "successfully downloaded from %2 " + tr("

The %1 has been successfully downloaded " + "from %2 " "and saved locally as %3.

" "

Do you wish to install this extension pack?

") .arg(strExtPackName, strFrom, strTo), 0 /* auto-confirm id */, - tr ("Install", "extension pack")); -} - -void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo) -{ - message(networkManagerOrMainWindowShown(), MessageType_Error, - tr("

The %1 has been " - "successfully downloaded from %2 " - "but can't be saved locally as %3.

" - "

Please choose another location for that file.

") - .arg(strExtPackName, strFrom, strTo)); -} - -void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress, - QWidget *pParent /* = NULL */) const -{ - AssertWrapperOk(progress); - - message(pParent ? pParent : mainWindowShown(), - MessageType_Error, - tr("Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation."), - formatErrorInfo(progress.GetErrorInfo())); -} - -void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, - const CExtPackManager &extPackManager, - QWidget *pParent) -{ - message(pParent ? pParent : mainWindowShown(), - MessageType_Error, - tr("Failed to open the Extension Pack %1.").arg(strFilename), - formatErrorInfo(extPackManager)); -} - -void UIMessageCenter::badExtPackFile(const QString &strFilename, - const CExtPackFile &extPackFile, - QWidget *pParent) -{ - message(pParent ? pParent : mainWindowShown(), - MessageType_Error, - tr("Failed to open the Extension Pack %1.").arg(strFilename), - "" + extPackFile.GetWhyUnusable()); -} - -void UIMessageCenter::cannotInstallExtPack(const QString &strFilename, - const CExtPackFile &extPackFile, - const CProgress &progress, - QWidget *pParent) -{ - if (!pParent) - pParent = mainWindowShown(); - QString strErrInfo = !extPackFile.isOk() || progress.isNull() - ? formatErrorInfo(extPackFile) : formatErrorInfo(progress.GetErrorInfo()); - message(pParent, - MessageType_Error, - tr("Failed to install the Extension Pack %1.").arg(strFilename), - strErrInfo); -} - -void UIMessageCenter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, - const CProgress &progress, QWidget *pParent) -{ - if (!pParent) - pParent = mainWindowShown(); - QString strErrInfo = !extPackManager.isOk() || progress.isNull() - ? formatErrorInfo(extPackManager) : formatErrorInfo(progress.GetErrorInfo()); - message(pParent, - MessageType_Error, - tr("Failed to uninstall the Extension Pack %1.").arg(strPackName), - strErrInfo); -} - -bool UIMessageCenter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, - const QString &strPackDescription, QWidget *pParent) + tr("Install", "extension pack")); +} + +bool UIMessageCenter::confirmInstallExtensionPack(const QString &strPackName, const QString &strPackVersion, + const QString &strPackDescription, QWidget *pParent /*= 0*/) const { return messageOkCancel(pParent ? pParent : mainWindowShown(), @@ -2130,16 +2077,14 @@ "Description:  %3" "

") - .arg(strPackName).arg(strPackVersion).arg(strPackDescription), + .arg(strPackName).arg(strPackVersion).arg(strPackDescription), 0, - tr("&Install")); -} - -bool UIMessageCenter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, - const QString &strPackVersionOld, const QString &strPackDescription, - QWidget *pParent) -{ - if (!pParent) - pParent = pParent ? pParent : mainWindowShown(); /* this is boring stuff that messageOkCancel should do! */ - + tr("Install", "extension pack")); +} + +bool UIMessageCenter::confirmReplaceExtensionPack(const QString &strPackName, const QString &strPackVersionNew, + const QString &strPackVersionOld, const QString &strPackDescription, + QWidget *pParent /*= 0*/) const +{ + /* Prepare initial message: */ QString strBelehrung = tr("Extension packs complement the functionality of VirtualBox and can contain " "system level software that could be potentially harmful to your system. " @@ -2147,11 +2092,13 @@ "the extension pack from a trusted source."); + /* Compare versions: */ QByteArray ba1 = strPackVersionNew.toUtf8(); QByteArray ba2 = strPackVersionOld.toUtf8(); int iVerCmp = RTStrVersionCompare(ba1.constData(), ba2.constData()); + /* Show the message: */ bool fRc; if (iVerCmp > 0) - fRc = messageOkCancel(pParent, + fRc = messageOkCancel(pParent ? pParent : mainWindowShown(), MessageType_Question, tr("

An older version of the extension pack is already installed, would you like to upgrade? " @@ -2163,9 +2110,9 @@ "Description:  %5" "

") - .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), + .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), 0, tr("&Upgrade")); else if (iVerCmp < 0) - fRc = messageOkCancel(pParent, + fRc = messageOkCancel(pParent ? pParent : mainWindowShown(), MessageType_Question, tr("

An newer version of the extension pack is already installed, would you like to downgrade? " @@ -2177,9 +2124,9 @@ "Description:  %5" "

") - .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), + .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), 0, tr("&Downgrade")); else - fRc = messageOkCancel(pParent, + fRc = messageOkCancel(pParent ? pParent : mainWindowShown(), MessageType_Question, tr("

The extension pack is already installed with the same version, would you like reinstall it? " @@ -2190,5 +2137,5 @@ "Description:  %4" "

") - .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), + .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), 0, tr("&Reinstall")); @@ -2196,19 +2143,67 @@ } -bool UIMessageCenter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent) +bool UIMessageCenter::confirmRemoveExtensionPack(const QString &strPackName, QWidget *pParent /*= 0*/) const { return messageOkCancel(pParent ? pParent : mainWindowShown(), - MessageType_Question, - tr("

You are about to remove the VirtualBox extension pack %1.

" - "

Are you sure you want to proceed?

").arg(strPackName), - 0, - tr("&Remove")); -} - -void UIMessageCenter::notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent) + MessageType_Question, + tr("

You are about to remove the VirtualBox extension pack %1.

" + "

Are you sure you want to proceed?

") + .arg(strPackName), + 0, + tr("&Remove")); +} + +void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent /*= 0*/) const +{ + message(pParent ? pParent : mainWindowShown(), MessageType_Error, + tr("Failed to open the Extension Pack %1.").arg(strFilename), + formatErrorInfo(extPackManager)); +} + +void UIMessageCenter::warnAboutBadExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent /*= 0*/) const +{ + message(pParent ? pParent : mainWindowShown(), MessageType_Error, + tr("Failed to open the Extension Pack %1.").arg(strFilename), + "" + extPackFile.GetWhyUnusable()); +} + +void UIMessageCenter::cannotInstallExtPack(const CExtPackFile &extPackFile, const QString &strFilename, QWidget *pParent /*= 0*/) const +{ + message(pParent ? pParent : mainWindowShown(), MessageType_Error, + tr("Failed to install the Extension Pack %1.") + .arg(strFilename), + formatErrorInfo(extPackFile)); +} + +void UIMessageCenter::cannotInstallExtPack(const CProgress &progress, const QString &strFilename, QWidget *pParent /*= 0*/) const +{ + message(pParent ? pParent : mainWindowShown(), MessageType_Error, + tr("Failed to install the Extension Pack %1.") + .arg(strFilename), + !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo())); +} + +void UIMessageCenter::cannotUninstallExtPack(const CExtPackManager &extPackManager, const QString &strPackName, QWidget *pParent /*= 0*/) const +{ + message(pParent ? pParent : mainWindowShown(), MessageType_Error, + tr("Failed to uninstall the Extension Pack %1.") + .arg(strPackName), + formatErrorInfo(extPackManager)); +} + +void UIMessageCenter::cannotUninstallExtPack(const CProgress &progress, const QString &strPackName, QWidget *pParent /*= 0*/) const +{ + message(pParent ? pParent : mainWindowShown(), MessageType_Error, + tr("Failed to uninstall the Extension Pack %1.") + .arg(strPackName), + !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo())); +} + +void UIMessageCenter::warnAboutExtPackInstalled(const QString &strPackName, QWidget *pParent /*= 0*/) const { message(pParent ? pParent : mainWindowShown(), - MessageType_Info, - tr("The extension pack
%1
was installed successfully.").arg(strPackName)); + MessageType_Info, + tr("The extension pack
%1
was installed successfully.") + .arg(strPackName)); } @@ -2531,5 +2526,5 @@ } /* Else propose to download user manual: */ - else if (askAboutUserManualDownload(strUserManualFileName1)) + else if (cannotFindUserManual(strUserManualFileName1)) { /* Create User Manual downloader: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45342) @@ -325,33 +325,35 @@ /* API: Network management warnings: */ - bool askAboutCancelAllNetworkRequest(QWidget *pParent); + bool confirmCancelingAllNetworkRequests(); void showUpdateSuccess(const QString &strVersion, const QString &strLink); void showUpdateNotFound(); + bool askUserToDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion); /* API: Downloading warnings: */ - bool cannotFindGuestAdditions(); - bool confirmDownloadAdditions(const QString &strUrl, qulonglong uSize); - bool confirmMountAdditions(const QString &strUrl, const QString &strSrc); - void cannotMountGuestAdditions(const QString &strMachineName); - void warnAboutAdditionsCantBeSaved(const QString &strTarget); - bool askAboutUserManualDownload(const QString &strMissedLocation); - bool confirmUserManualDownload(const QString &strURL, qulonglong uSize); - void warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget); - void warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget); - bool proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion); - bool requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion); - bool confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize); - bool proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo); - void warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo); - void cannotUpdateGuestAdditions(const CProgress &progress, QWidget *pParent /* = NULL */) const; - void cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent); - void badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent); - void cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, const CProgress &progress, QWidget *pParent); - void cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, const CProgress &progress, QWidget *pParent); - bool confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, const QString &strPackDescription, QWidget *pParent); - bool confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, const QString &strPackVersionOld, - const QString &strPackDescription, QWidget *pParent); - bool confirmRemovingPackage(const QString &strPackName, QWidget *pParent); - void notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent); + bool cannotFindGuestAdditions() const; + bool confirmDownloadGuestAdditions(const QString &strUrl, qulonglong uSize) const; + void cannotSaveGuestAdditions(const QString &strURL, const QString &strTarget) const; + bool proposeMountGuestAdditions(const QString &strUrl, const QString &strSrc) const; + void cannotMountGuestAdditions(const QString &strMachineName) const; + void cannotUpdateGuestAdditions(const CProgress &progress) const; + bool cannotFindUserManual(const QString &strMissedLocation) const; + bool confirmDownloadUserManual(const QString &strURL, qulonglong uSize) const; + void cannotSaveUserManual(const QString &strURL, const QString &strTarget) const; + void warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) const; + bool warAboutOutdatedExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) const; + bool confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) const; + void cannotSaveExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const; + bool proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const; + bool confirmInstallExtensionPack(const QString &strPackName, const QString &strPackVersion, const QString &strPackDescription, QWidget *pParent = 0) const; + bool confirmReplaceExtensionPack(const QString &strPackName, const QString &strPackVersionNew, const QString &strPackVersionOld, + const QString &strPackDescription, QWidget *pParent = 0) const; + bool confirmRemoveExtensionPack(const QString &strPackName, QWidget *pParent = 0) const; + void cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent = 0) const; + void warnAboutBadExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent = 0) const; + void cannotInstallExtPack(const CExtPackFile &extPackFile, const QString &strFilename, QWidget *pParent = 0) const; + void cannotInstallExtPack(const CProgress &progress, const QString &strFilename, QWidget *pParent = 0) const; + void cannotUninstallExtPack(const CExtPackManager &extPackManager, const QString &strPackName, QWidget *pParent = 0) const; + void cannotUninstallExtPack(const CProgress &progress, const QString &strPackName, QWidget *pParent = 0) const; + void warnAboutExtPackInstalled(const QString &strPackName, QWidget *pParent = 0) const; /* API: License-viewer warnings: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp (revision 45342) @@ -74,5 +74,5 @@ bool UIDownloaderAdditions::askForDownloadingConfirmation(UINetworkReply *pReply) { - return msgCenter().confirmDownloadAdditions(source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); + return msgCenter().confirmDownloadGuestAdditions(source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); } @@ -93,5 +93,5 @@ /* Warn the user about additions-image loaded and saved, propose to mount it: */ - if (msgCenter().confirmMountAdditions(source().toString(), QDir::toNativeSeparators(target()))) + if (msgCenter().proposeMountGuestAdditions(source().toString(), QDir::toNativeSeparators(target()))) emit sigDownloadFinished(target()); break; @@ -99,5 +99,5 @@ /* Warn the user about additions-image was downloaded but was NOT saved: */ - msgCenter().warnAboutAdditionsCantBeSaved(target()); + msgCenter().cannotSaveGuestAdditions(source().toString(), QDir::toNativeSeparators(target())); /* Ask the user for another location for the additions-image file: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp (revision 45342) @@ -116,5 +116,5 @@ /* Warn the user about extension-pack was downloaded but was NOT saved: */ - msgCenter().warnAboutExtentionPackCantBeSaved(GUI_ExtPackName, source().toString(), QDir::toNativeSeparators(target())); + msgCenter().cannotSaveExtensionPack(GUI_ExtPackName, source().toString(), QDir::toNativeSeparators(target())); /* Ask the user for another location for the extension-pack file: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp (revision 45342) @@ -77,5 +77,5 @@ bool UIDownloaderUserManual::askForDownloadingConfirmation(UINetworkReply *pReply) { - return msgCenter().confirmUserManualDownload(source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); + return msgCenter().confirmDownloadUserManual(source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); } @@ -103,5 +103,5 @@ /* Warn user about user-manual was downloaded but was NOT saved: */ - msgCenter().warnAboutUserManualCantBeSaved(source().toString(), QDir::toNativeSeparators(target())); + msgCenter().cannotSaveUserManual(source().toString(), QDir::toNativeSeparators(target())); /* Ask the user for another location for the user-manual file: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp (revision 45342) @@ -145,5 +145,5 @@ { /* Ask if user wants to cancel all current network-requests: */ - if (msgCenter().askAboutCancelAllNetworkRequest(this)) + if (msgCenter().confirmCancelingAllNetworkRequests()) emit sigCancelNetworkRequests(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (revision 45342) @@ -414,5 +414,5 @@ { /* Inform the user that he should update the extension pack: */ - msgCenter().requestUserDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion, strVBoxVersion); + msgCenter().askUserToDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion, strVBoxVersion); /* Never try to download for ENTERPRISE version: */ emit sigStepComplete(); @@ -421,5 +421,5 @@ /* Ask the user about extension pack downloading: */ - if (!msgCenter().proposeDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion)) + if (!msgCenter().warAboutOutdatedExtensionPack(GUI_ExtPackName, strExtPackVersion)) { emit sigStepComplete(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 45341) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 45342) @@ -148,5 +148,5 @@ if (!extPackFile.GetUsable()) { - msgCenter().badExtPackFile(strFilePath, extPackFile, pParent); + msgCenter().warnAboutBadExtPackFile(strFilePath, extPackFile, pParent); return; } @@ -166,5 +166,5 @@ { QString strPackVersionCur = QString("%1r%2%3").arg(extPackCur.GetVersion()).arg(extPackCur.GetRevision()).arg(extPackCur.GetEdition()); - if (!msgCenter().confirmReplacePackage(strPackName, strPackVersion, strPackVersionCur, strPackDescription, pParent)) + if (!msgCenter().confirmReplaceExtensionPack(strPackName, strPackVersion, strPackVersionCur, strPackDescription, pParent)) return; } @@ -174,5 +174,5 @@ else { - if (!msgCenter().confirmInstallingPackage(strPackName, strPackVersion, strPackDescription, pParent)) + if (!msgCenter().confirmInstallExtensionPack(strPackName, strPackVersion, strPackDescription, pParent)) return; } @@ -196,27 +196,24 @@ */ QString displayInfo; -#ifdef RT_OS_WINDOWS +#ifdef Q_WS_WIN if (pParent) displayInfo.sprintf("hwnd=%#llx", (uint64_t)(uintptr_t)pParent->winId()); -#endif +#endif /* Q_WS_WIN */ + /* Prepare installation progress: */ CProgress progress = extPackFile.Install(fReplaceIt, displayInfo); if (extPackFile.isOk()) { - if (progress.isNull()) - msgCenter().notifyAboutExtPackInstalled(strPackName, pParent); - else + /* Show installation progress: */ + msgCenter().showModalProgressDialog(progress, tr("Extensions"), "", pParent); + if (!progress.GetCanceled()) { - msgCenter().showModalProgressDialog(progress, tr("Extensions"), "", pParent); - if (!progress.GetCanceled()) - { - if (progress.isOk() && progress.GetResultCode() == 0) - msgCenter().notifyAboutExtPackInstalled(strPackName, pParent); - else - msgCenter().cannotInstallExtPack(strFilePath, extPackFile, progress, pParent); - } + if (progress.isOk() && progress.GetResultCode() == 0) + msgCenter().warnAboutExtPackInstalled(strPackName, pParent); + else + msgCenter().cannotInstallExtPack(progress, strFilePath, pParent); } } else - msgCenter().cannotInstallExtPack(strFilePath, extPackFile, progress, pParent); + msgCenter().cannotInstallExtPack(extPackFile, strFilePath, pParent); if (pstrExtPackName) @@ -409,5 +406,5 @@ QString strSelectedPackageName = pItem->name(); /* Ask the user about package removing: */ - if (msgCenter().confirmRemovingPackage(strSelectedPackageName, this)) + if (msgCenter().confirmRemoveExtensionPack(strSelectedPackageName, this)) { /* @@ -417,17 +414,14 @@ /** @todo Refuse this if any VMs are running. */ QString displayInfo; -#ifdef RT_OS_WINDOWS +#ifdef Q_WS_WIN displayInfo.sprintf("hwnd=%#llx", (uint64_t)(uintptr_t)this->winId()); -#endif +#endif /* Q_WS_WIN */ + /* Prepare uninstallation progress: */ CProgress progress = manager.Uninstall(strSelectedPackageName, false /* forced removal? */, displayInfo); if (manager.isOk()) { - bool fOk = true; - if (!progress.isNull()) - { - msgCenter().showModalProgressDialog(progress, tr("Extensions"), "", window()); - fOk = progress.isOk() && progress.GetResultCode() == 0; - } - if (fOk) + /* Show uninstallation progress: */ + msgCenter().showModalProgressDialog(progress, tr("Extensions"), "", this); + if (progress.isOk() && progress.GetResultCode() == 0) { /* Remove selected package from cache: */ @@ -440,13 +434,12 @@ } } - /* Remove selected package from tree: */ delete pItem; } else - msgCenter().cannotUninstallExtPack(strSelectedPackageName, manager, progress, this); + msgCenter().cannotUninstallExtPack(progress, strSelectedPackageName, this); } else - msgCenter().cannotUninstallExtPack(strSelectedPackageName, manager, progress, this); + msgCenter().cannotUninstallExtPack(manager, strSelectedPackageName, this); } }