Changeset 45424 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 9, 2013 8:21:25 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center: Parent-usage cleanup; Progress-dialog error-handling unification.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (98 diffs)
• globals/UIMessageCenter.h (modified) (7 diffs)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UISession.cpp (modified) (8 diffs)
• settings/machine/UIMachineSettingsSF.cpp (modified) (6 diffs)
• widgets/UIApplianceImportEditorWidget.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (2 diffs)

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

@@ -349 +349 @@
 void UIMessageCenter::warnAboutWrongUSBMounted() const
 {
-    alert(mainWindowShown(), MessageType_Warning,
+    alert(0, MessageType_Warning,
           tr("You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. "
              "We strongly recommend that you change this, as it is a severe mis-configuration of "
              "your system which could cause USB devices to fail in unexpected ways."),
-          "checkForMountedWrongUSB");
+          "warnAboutWrongUSBMounted");
 }
 #endif /* RT_OS_LINUX */
@@ -411 +411 @@
           tr("<p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
              "<p>The language will be temporarily reset to the system default language. "
-             "Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu "
-             "of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p>")
+             "Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the "
+             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
              .arg(strLangId).arg(strNlsPath));
 }
@@ -421 +421 @@
           tr("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
              "<p>The language will be temporarily reset to English (built-in). "
-             "Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu "
-             "of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p>")
+             "Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the "
+             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
              .arg(strLangFile));
 }
@@ -428 +428 @@
 void UIMessageCenter::cannotLoadGlobalConfig(const CVirtualBox &vbox, const QString &strError) const
 {
-    /* Preserve error-info: */
-    COMResult res(vbox);
-    /* Show the error: */
     error(0, MessageType_Critical,
           tr("<p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p>"
              "<p>The application will now terminate.</p>")
-             .arg(vbox.GetSettingsFilePath()),
-          !res.isOk() ? formatErrorInfo(res) : QString("<!--EOM--><p>%1</p>").arg(vboxGlobal().emphasize(strError)));
+             .arg(CVirtualBox(vbox).GetSettingsFilePath()),
+          !vbox.isOk() ? formatErrorInfo(vbox) : QString("<!--EOM--><p>%1</p>").arg(vboxGlobal().emphasize(strError)));
 }
 
 void UIMessageCenter::cannotSaveGlobalConfig(const CVirtualBox &vbox) const
 {
-    /* Preserve error-info: */
-    COMResult res(vbox);
-    /* Show the error: */
     error(0, MessageType_Critical,
           tr("<p>Failed to save the global GUI configuration to <b><nobr>%1</nobr></b>.</p>"
              "<p>The application will now terminate.</p>")
-             .arg(vbox.GetSettingsFilePath()),
-          formatErrorInfo(res));
+             .arg(CVirtualBox(vbox).GetSettingsFilePath()),
+          formatErrorInfo(vbox));
 }
 
@@ -468 +462 @@
 void UIMessageCenter::cannotOpenSession(const CSession &session) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to create a new session."),
           formatErrorInfo(session));
@@ -475 +469 @@
 void UIMessageCenter::cannotOpenSession(const CMachine &machine) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(machine);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to open a session for the virtual machine <b>%1</b>.")
-             .arg(machine.GetName()),
-          strErrorInfo);
+             .arg(CMachine(machine).GetName()),
+          formatErrorInfo(machine));
 }
 
 void UIMessageCenter::cannotOpenSession(const CProgress &progress, const QString &strMachineName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to open a session for the virtual machine <b>%1</b>.")
              .arg(strMachineName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
 void UIMessageCenter::cannotGetMediaAccessibility(const UIMedium &medium) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to determine the accessibility state of the medium <nobr><b>%1</b></nobr>.")
              .arg(medium.location()),
@@ -502 +493 @@
 void UIMessageCenter::cannotOpenURL(const QString &strUrl) const
 {
-    alert(mainWindowShown(), MessageType_Error,
+    alert(0, MessageType_Error,
           tr("Failed to open <tt>%1</tt>. "
              "Make sure your desktop environment can properly handle URLs of this type.")
@@ -510 +501 @@
 void UIMessageCenter::cannotOpenMachine(const CVirtualBox &vbox, const QString &strMachinePath) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to open virtual machine located in %1.")
              .arg(strMachinePath),
@@ -518 +509 @@
 void UIMessageCenter::cannotReregisterExistingMachine(const QString &strMachinePath, const QString &strMachineName) const
 {
-    alert(mainWindowShown(), MessageType_Error,
+    alert(0, MessageType_Error,
           tr("Failed to add virtual machine <b>%1</b> located in <i>%2</i> because its already present.")
-             .arg(strMachineName).arg(strMachinePath));
-}
-
-void UIMessageCenter::cannotResolveCollisionAutomatically(const QString &strName, const QString &strGroupName) const
-{
-    alert(mainWindowShown(), MessageType_Error,
+             .arg(strMachineName, strMachinePath));
+}
+
+void UIMessageCenter::cannotResolveCollisionAutomatically(const QString &strCollisionName, const QString &strGroupName) const
+{
+    alert(0, MessageType_Error,
           tr("<p>You are trying to move machine <nobr><b>%1</b></nobr> "
              "to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p>"
              "<p>Please resolve this name-conflict and try again.</p>")
-             .arg(strName, strGroupName));
+             .arg(strCollisionName, strGroupName));
 }
 
 bool UIMessageCenter::confirmAutomaticCollisionResolve(const QString &strName, const QString &strGroupName) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>You are trying to move group <nobr><b>%1</b></nobr> "
                              "to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p>"
@@ -545 +536 @@
 void UIMessageCenter::cannotSetGroups(const CMachine &machine) const
 {
-    /* Preserve error-info: */
-    COMResult res(machine);
     /* Compose machine name: */
-    QString strName = machine.GetName();
+    QString strName = CMachine(machine).GetName();
     if (strName.isEmpty())
-        strName = QFileInfo(machine.GetSettingsFilePath()).baseName();
+        strName = QFileInfo(CMachine(machine).GetSettingsFilePath()).baseName();
     /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to set groups of the virtual machine <b>%1</b>.")
              .arg(strName),
-          formatErrorInfo(res));
+          formatErrorInfo(machine));
 }
 
 bool UIMessageCenter::confirmMachineItemRemoval(const QStringList &names) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>You are about to remove following virtual machine items from the machine list:</p>"
                              "<p><b>%1</b></p><p>Do you wish to proceed?</p>")
@@ -632 +621 @@
     /* Prepare message itself: */
     return cInacessibleMachineCount == machines.size() ?
-           message(mainWindowShown(), MessageType_Question,
+           message(0, MessageType_Question,
                    strText, QString(),
                    0 /* auto-confirm id */,
@@ -639 +628 @@
                    0,
                    tr("Remove")) :
-           message(mainWindowShown(), MessageType_Question,
+           message(0, MessageType_Question,
                    strText, QString(),
                    0 /* auto-confirm id */,
@@ -651 +640 @@
 void UIMessageCenter::cannotRemoveMachine(const CMachine &machine) const
 {
-    /* Preserve error-info: */
-    COMResult res(machine);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to remove the virtual machine <b>%1</b>.")
-             .arg(machine.GetName()),
-          !machine.isOk() ? formatErrorInfo(machine) : formatErrorInfo(res));
+             .arg(CMachine(machine).GetName()),
+          formatErrorInfo(machine));
 }
 
 void UIMessageCenter::cannotRemoveMachine(const CMachine &machine, const CProgress &progress) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to remove the virtual machine <b>%1</b>.")
-             .arg(machine.GetName()),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+             .arg(CMachine(machine).GetName()),
+          formatErrorInfo(progress));
 }
 
 bool UIMessageCenter::warnAboutInaccessibleMedia() const
 {
-    return questionBinary(mainWindowShown(), MessageType_Warning,
+    return questionBinary(0, MessageType_Warning,
                           tr("<p>One or more virtual hard disks, CD/DVD or "
                              "floppy media are not currently accessible. As a result, you will "
@@ -684 +670 @@
 bool UIMessageCenter::confirmDiscardSavedState(const QString &strNames) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Are you sure you want to discard the saved state of "
                              "the following virtual machines?</p><p><b>%1</b></p>"
@@ -696 +682 @@
 bool UIMessageCenter::confirmResetMachine(const QString &strNames) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Do you really want to reset the following virtual machines?</p>"
                              "<p><b>%1</b></p><p>This will cause any unsaved data "
@@ -707 +693 @@
 bool UIMessageCenter::confirmACPIShutdownMachine(const QString &strNames) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Do you really want to send an ACPI shutdown signal "
                              "to the following virtual machines?</p><p><b>%1</b></p>")
@@ -717 +703 @@
 bool UIMessageCenter::confirmPowerOffMachine(const QString &strNames) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Do you really want to power off the following virtual machines?</p>"
                              "<p><b>%1</b></p><p>This will cause any unsaved data in applications "
@@ -728 +714 @@
 void UIMessageCenter::cannotPauseMachine(const CConsole &console) const
 {
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to pause the execution of the virtual machine <b>%1</b>.")
-             .arg(console.GetMachine().GetName()),
-          formatErrorInfo(res));
+             .arg(CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
 }
 
 void UIMessageCenter::cannotResumeMachine(const CConsole &console) const
 {
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to resume the execution of the virtual machine <b>%1</b>.")
-             .arg(console.GetMachine().GetName()),
-          formatErrorInfo(res));
+             .arg(CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
 }
 
 void UIMessageCenter::cannotDiscardSavedState(const CConsole &console) const
 {
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to discard the saved state of the virtual machine <b>%1</b>.")
-             .arg(console.GetMachine().GetName()),
-          formatErrorInfo(res));
+             .arg(CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
 }
 
 void UIMessageCenter::cannotSaveMachineState(const CConsole &console)
 {
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to save the state of the virtual machine <b>%1</b>.")
-             .arg(console.GetMachine().GetName()),
-          formatErrorInfo(res));
-}
-
-void UIMessageCenter::cannotSaveMachineState(const CProgress &progress, const QString &strName)
-{
-    error(mainWindowShown(), MessageType_Error,
+             .arg(CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
+}
+
+void UIMessageCenter::cannotSaveMachineState(const CProgress &progress, const QString &strMachineName)
+{
+    error(0, MessageType_Error,
           tr("Failed to save the state of the virtual machine <b>%1</b>.")
-             .arg(strName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+             .arg(strMachineName),
+          formatErrorInfo(progress));
 }
 
 void UIMessageCenter::cannotACPIShutdownMachine(const CConsole &console) const
 {
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
-          tr("Failed to send the ACPI Power Button press event to the "
-             "virtual machine <b>%1</b>.")
-             .arg(console.GetMachine().GetName()),
-          formatErrorInfo(res));
+    error(0, MessageType_Error,
+          tr("Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.")
+             .arg(CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
 }
 
 void UIMessageCenter::cannotPowerDownMachine(const CConsole &console) const
 {
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to stop the virtual machine <b>%1</b>.")
-             .arg(console.GetMachine().GetName()),
-          formatErrorInfo(res));
-}
-
-void UIMessageCenter::cannotPowerDownMachine(const CProgress &progress, const QString &strName) const
-{
-    error(mainWindowShown(), MessageType_Error,
+             .arg(CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
+}
+
+void UIMessageCenter::cannotPowerDownMachine(const CProgress &progress, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
           tr("Failed to stop the virtual machine <b>%1</b>.")
-              .arg(strName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+             .arg(strMachineName),
+          formatErrorInfo(progress));
 }
 
@@ -812 +779 @@
 {
     return fAlsoCreateNewSnapshot ?
-           messageWithOption(mainWindowShown(), MessageType_Question,
+           messageWithOption(0, MessageType_Question,
                              tr("<p>You are about to restore snapshot <nobr><b>%1</b></nobr>.</p>"
                                 "<p>You can create a snapshot of the current state of the virtual machine first by checking the box below; "
@@ -823 +790 @@
                              0 /* 3rd button */,
                              tr("Restore"), tr("Cancel"), QString() /* 3rd button text */) :
-           message(mainWindowShown(), MessageType_Question,
+           message(0, MessageType_Question,
                    tr("<p>Are you sure you want to restore snapshot <nobr><b>%1</b></nobr>?</p>")
                       .arg(strSnapshotName),
@@ -836 +803 @@
 bool UIMessageCenter::confirmSnapshotRemoval(const QString &strSnapshotName) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Deleting the snapshot will cause the state information saved in it to be lost, and disk data spread over "
                              "several image files that VirtualBox has created together with the snapshot will be merged into one file. "
@@ -851 +818 @@
                                                         const QString &strTargetFileSystemFree) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, "
                               "however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in "
@@ -874 +841 @@
           tr("Failed to create a snapshot of the virtual machine <b>%1</b>.")
              .arg(strMachineName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
-}
-
-void UIMessageCenter::cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent /*= 0*/) const
-{
-    error(pParent, MessageType_Error,
+          formatErrorInfo(progress));
+}
+
+void UIMessageCenter::cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
           tr("Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
              .arg(strSnapshotName, strMachineName),
@@ -885 +852 @@
 }
 
-void UIMessageCenter::cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent /*= 0*/) const
-{
-    error(pParent, MessageType_Error,
+void UIMessageCenter::cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
           tr("Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
              .arg(strSnapshotName, strMachineName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
 void UIMessageCenter::cannotRemoveSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
              .arg(strSnapshotName, strMachineName),
@@ -903 +870 @@
 void UIMessageCenter::cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
              .arg(strSnapshotName).arg(strMachineName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -936 +903 @@
     error(pParent, MessageType_Error,
           tr("Failed to create the host network interface."),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
-}
-
-void UIMessageCenter::cannotRemoveHostInterface(const CHost &host, const QString &strName, QWidget *pParent /*= 0*/)
+          formatErrorInfo(progress));
+}
+
+void UIMessageCenter::cannotRemoveHostInterface(const CHost &host, const QString &strInterfaceName, QWidget *pParent /*= 0*/)
 {
     error(pParent, MessageType_Error,
           tr("Failed to remove the host network interface <b>%1</b>.")
-             .arg(strName),
+             .arg(strInterfaceName),
           formatErrorInfo(host));
 }
 
-void UIMessageCenter::cannotRemoveHostInterface(const CProgress &progress, const QString &strName, QWidget *pParent /*= 0*/)
+void UIMessageCenter::cannotRemoveHostInterface(const CProgress &progress, const QString &strInterfaceName, QWidget *pParent /*= 0*/)
 {
     error(pParent, MessageType_Error,
           tr("Failed to remove the host network interface <b>%1</b>.")
-             .arg(strName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+             .arg(strInterfaceName),
+          formatErrorInfo(progress));
 }
 
@@ -977 +944 @@
 }
 
-void UIMessageCenter::warnAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
+void UIMessageCenter::warnAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent /*= 0*/)
 {
     if (warningShown("warnAboutUnsupportedUSB2"))
@@ -996 +963 @@
 void UIMessageCenter::warnAboutStateChange(QWidget *pParent /*= 0*/) const
 {
-    /* Do not show this async warning more than one at time: */
     if (warningShown("warnAboutStateChange"))
         return;
     setWarningShown("warnAboutStateChange", true);
-    /* Show the error: */
+
     alert(pParent, MessageType_Warning,
           tr("The virtual machine that you are changing has been started. "
              "Only certain settings can be changed while a machine is running. "
              "All other changes will be lost if you close this window now."));
-    /* Allow to show this async warning: */
+
     setWarningShown("warnAboutStateChange", false);
 }
@@ -1026 +992 @@
                               .arg(strControllerName),
                            0 /* auto-confirm id */,
-                           tr("Create &new disk", "add attachment routine"),
-                           tr("&Choose existing disk", "add attachment routine"));
+                           tr("Create &new disk"), tr("&Choose existing disk"));
 }
 
@@ -1038 +1003 @@
                               .arg(strControllerName),
                            0 /* auto-confirm id */,
-                           tr("Leave &empty", "add attachment routine"),
-                           tr("&Choose disk", "add attachment routine"));
+                           tr("Leave &empty"), tr("&Choose disk"));
 }
 
@@ -1050 +1014 @@
                               .arg(strControllerName),
                            0 /* auto-confirm id */,
-                           tr("Leave &empty", "add attachment routine"),
-                           tr("&Choose disk", "add attachment routine"));
+                           tr("Leave &empty"), tr("&Choose disk"));
 }
 
@@ -1074 +1037 @@
         {
             strMessage = tr("Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
+                            .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -1080 +1043 @@
         {
             strMessage = tr("Failed to attach the CD/DVD device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
+                            .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -1086 +1049 @@
         {
             strMessage = tr("Failed to attach the floppy device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
+                            .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -1110 +1073 @@
 }
 
-void UIMessageCenter::cannotCreateSharedFolder(const CMachine &machine, const QString &strMachineName,
-                                               const QString &strName, const QString &strPath,
-                                               QWidget *pParent /*= 0*/)
+void UIMessageCenter::cannotCreateSharedFolder(const CMachine &machine, const QString &strName, const QString &strPath, QWidget *pParent /*= 0*/)
 {
     error(pParent, MessageType_Error,
           tr("Failed to create the shared folder <b>%1</b> (pointing to "
              "<nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.")
-             .arg(strName, strPath, strMachineName),
+          .arg(strName, strPath, CMachine(machine).GetName()),
           formatErrorInfo(machine));
 }
 
-void UIMessageCenter::cannotCreateSharedFolder(const CConsole &console, const QString &strMachineName,
-                                               const QString &strName, const QString &strPath,
-                                               QWidget *pParent /*= 0*/)
+void UIMessageCenter::cannotCreateSharedFolder(const CConsole &console, const QString &strName, const QString &strPath, QWidget *pParent /*= 0*/)
 {
     error(pParent, MessageType_Error,
           tr("Failed to create the shared folder <b>%1</b> (pointing to "
              "<nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.")
-             .arg(strName, strPath, strMachineName),
+             .arg(strName, strPath, CConsole(console).GetMachine().GetName()),
           formatErrorInfo(console));
 }
 
-void UIMessageCenter::cannotRemoveSharedFolder(const CMachine &machine, const QString &strMachineName,
-                                               const QString &strName, const QString &strPath,
-                                               QWidget *pParent /*= 0*/)
+void UIMessageCenter::cannotRemoveSharedFolder(const CMachine &machine, const QString &strName, const QString &strPath, QWidget *pParent /*= 0*/)
 {
     error(pParent, MessageType_Error,
@@ -1141 +1098 @@
              "<p>Please close all programs in the guest OS that "
              "may be using this shared folder and try again.</p>")
-             .arg(strName, strPath, strMachineName),
+             .arg(strName, strPath, CMachine(machine).GetName()),
           formatErrorInfo(machine));
 }
 
-void UIMessageCenter::cannotRemoveSharedFolder(const CConsole &console, const QString &strMachineName,
-                                               const QString &strName, const QString &strPath,
-                                               QWidget *pParent /*= 0*/)
+void UIMessageCenter::cannotRemoveSharedFolder(const CConsole &console, const QString &strName, const QString &strPath, QWidget *pParent /*= 0*/)
 {
     error(pParent, MessageType_Error,
@@ -1154 +1109 @@
              "<p>Please close all programs in the guest OS that "
              "may be using this shared folder and try again.</p>")
-             .arg(strName, strPath, strMachineName),
+             .arg(strName, strPath, CConsole(console).GetMachine().GetName()),
           formatErrorInfo(console));
 }
@@ -1160 +1115 @@
 void UIMessageCenter::cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent /*= 0*/) const
 {
-    /* Preserve error-info: */
-    COMResult res(machine);
-    /* Show the error: */
     error(pParent, MessageType_Error,
           tr("Failed to save the settings of the virtual machine <b>%1</b> to <b><nobr>%2</nobr></b>.")
-             .arg(machine.GetName(), machine.GetSettingsFilePath()),
-          formatErrorInfo(res));
-}
-
-void UIMessageCenter::cannotChangeMediumType(const CMedium &medium, KMediumType oldMediumType, KMediumType newMediumType,
-                                             QWidget *pParent /*= 0*/) const
+             .arg(machine.GetName(), CMachine(machine).GetSettingsFilePath()),
+          formatErrorInfo(machine));
+}
+
+void UIMessageCenter::cannotChangeMediumType(const CMedium &medium, KMediumType oldMediumType, KMediumType newMediumType, QWidget *pParent /*= 0*/) const
 {
     error(pParent, MessageType_Error,
@@ -1208 +1159 @@
     return questionBinary(pParent, MessageType_Question,
                           strMessage.arg(medium.location(), strUsage),
-                          0 /* auto-confirm id */, tr("Release", "detach medium"));
+                          0 /* auto-confirm id */,
+                          tr("Release", "detach medium"));
 }
 
@@ -1258 +1210 @@
     return questionBinary(pParent, MessageType_Question,
                           strMessage.arg(medium.location()),
-                          "confirmMediumRemoval" /* auto-confirm id */, tr("Remove", "medium"));
+                          "confirmMediumRemoval" /* auto-confirm id */,
+                          tr("Remove", "medium"));
 }
 
@@ -1292 +1245 @@
           tr("Failed to delete the storage unit of the hard disk <b>%1</b>.")
              .arg(strLocation),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
 void UIMessageCenter::cannotDetachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent /*= 0*/) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(machine);
     /* Prepare the message: */
     QString strMessage;
@@ -1306 +1257 @@
         {
             strMessage = tr("Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
-                            .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(machine.GetName());
+                            .arg(strLocation, gpConverter->toString(storageSlot), CMachine(machine).GetName());
             break;
         }
@@ -1312 +1263 @@
         {
             strMessage = tr("Failed to detach the CD/DVD device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
-                            .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(machine.GetName());
+                            .arg(strLocation, gpConverter->toString(storageSlot), CMachine(machine).GetName());
             break;
         }
@@ -1318 +1269 @@
         {
             strMessage = tr("Failed to detach the floppy device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
-                            .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(machine.GetName());
+                            .arg(strLocation, gpConverter->toString(storageSlot), CMachine(machine).GetName());
             break;
         }
@@ -1325 +1276 @@
     }
     /* Show the error: */
-    error(pParent, MessageType_Error,
-          strMessage, strErrorInfo);
+    error(pParent, MessageType_Error, strMessage, formatErrorInfo(machine));
 }
 
 bool UIMessageCenter::cannotRemountMedium(const CMachine &machine, const UIMedium &medium, bool fMount, bool fRetry, QWidget *pParent /*= 0*/) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(machine);
     /* Compose the message: */
     QString strMessage;
@@ -1375 +1323 @@
     if (fRetry)
         return errorWithQuestion(pParent, MessageType_Question,
-                                 strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location()).arg(machine.GetName()),
-                                 strErrorInfo,
+                                 strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location(), CMachine(machine).GetName()),
+                                 formatErrorInfo(machine),
                                  0 /* Auto Confirm ID */,
                                  tr("Force Unmount"));
     error(pParent, MessageType_Error,
-          strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location()).arg(machine.GetName()),
-          strErrorInfo);
+          strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location(), CMachine(machine).GetName()),
+          formatErrorInfo(machine));
     return false;
 }
@@ -1472 +1420 @@
 void UIMessageCenter::cannotCreateClone(const CMachine &machine, QWidget *pParent /*= 0*/) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(machine);
-    /* Show the error: */
     error(pParent, MessageType_Error,
           tr("Failed to clone the virtual machine <b>%1</b>.")
-             .arg(machine.GetName()),
-          strErrorInfo);
+             .arg(CMachine(machine).GetName()),
+          formatErrorInfo(machine));
 }
 
@@ -1486 +1431 @@
           tr("Failed to clone the virtual machine <b>%1</b>.")
              .arg(strMachineName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -1520 +1465 @@
           tr("Failed to create the hard disk storage <nobr><b>%1</b>.</nobr>")
              .arg(strLocation),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
 void UIMessageCenter::cannotRemoveMachineFolder(const QString &strFolderName, QWidget *pParent /*= 0*/) const
 {
-    QFileInfo fi(strFolderName);
     alert(pParent, MessageType_Critical,
           tr("<p>Cannot remove the machine folder <nobr><b>%1</b>.</nobr></p>"
              "<p>Please check that this folder really exists and that you have permissions to remove it.</p>")
-             .arg(fi.fileName()));
+             .arg(QFileInfo(strFolderName).fileName()));
 }
 
@@ -1572 +1516 @@
           tr("Failed to import appliance <b>%1</b>.")
              .arg(strPath),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -1579 +1523 @@
     error(pParent, MessageType_Error,
           tr("Failed to check files."),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -1586 +1530 @@
     error(pParent, MessageType_Error,
           tr("Failed to remove file."),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -1605 +1549 @@
 void UIMessageCenter::cannotExportAppliance(const CAppliance &appliance, QWidget *pParent /*= 0*/) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(appliance);
-    /* Show the error: */
     error(pParent, MessageType_Error,
           tr("Failed to prepare the export of the appliance <b>%1</b>.")
-             .arg(appliance.GetPath()),
-          strErrorInfo);
+             .arg(CAppliance(appliance).GetPath()),
+          formatErrorInfo(appliance));
 }
 
@@ -1627 +1568 @@
           tr("Failed to export appliance <b>%1</b>.")
              .arg(strPath),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -1699 +1640 @@
     if (type == MessageType_Critical)
     {
-        error(mainWindowShown(), type,
+        error(0, type,
               tr("<p>A fatal error has occurred during virtual machine execution! "
                  "The virtual machine will be powered off. Please copy the following error message "
@@ -1707 +1648 @@
     else if (type == MessageType_Error)
     {
-        error(mainWindowShown(), type,
+        error(0, type,
               tr("<p>An error has occurred during virtual machine execution! "
                  "The error details are shown below. You may try to correct the error "
@@ -1715 +1656 @@
     else
     {
-        error(mainWindowShown(), type,
+        error(0, type,
               tr("<p>The virtual machine execution may run into an error condition as described below. "
                  "We suggest that you take an appropriate action to avert the error.</p>"),
@@ -1732 +1673 @@
 bool UIMessageCenter::remindAboutGuruMeditation(const QString &strLogFolder)
 {
-    return questionBinary(mainWindowShown(), MessageType_GuruMeditation,
+    return questionBinary(0, MessageType_GuruMeditation,
                           tr("<p>A critical error has occurred while running the virtual "
                              "machine and the machine execution has been stopped.</p>"
@@ -1759 +1700 @@
 {
     if (fHWVirtExSupported)
-        return questionBinary(mainWindowShown(), MessageType_Error,
+        return questionBinary(0, MessageType_Error,
                               tr("<p>VT-x/AMD-V hardware acceleration has been enabled, but is "
                                  "not operational. Your 64-bit guest will fail to detect a "
@@ -1768 +1709 @@
                               tr("Close VM"), tr("Continue"));
     else
-        return questionBinary(mainWindowShown(), MessageType_Error,
+        return questionBinary(0, MessageType_Error,
                               tr("<p>VT-x/AMD-V hardware acceleration is not available on your system. "
                                  "Your 64-bit guest will fail to detect a 64-bit CPU and will "
@@ -1779 +1720 @@
 {
     if (fHWVirtExSupported)
-        return questionBinary(mainWindowShown(), MessageType_Error,
+        return questionBinary(0, MessageType_Error,
                               tr("<p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. "
                                  "Certain guests (e.g. OS/2 and QNX) require this feature.</p>"
@@ -1786 +1727 @@
                               tr("Close VM"), tr("Continue"));
     else
-        return questionBinary(mainWindowShown(), MessageType_Error,
+        return questionBinary(0, MessageType_Error,
                               tr("<p>VT-x/AMD-V hardware acceleration is not available on your system. "
                                  "Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p>"),
@@ -1795 +1736 @@
 bool UIMessageCenter::cannotStartWithoutNetworkIf(const QString &strMachineName, const QString &strIfNames) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Error,
+    return questionBinary(0, MessageType_Error,
                           tr("<p>Could not start the machine <b>%1</b> because the following "
                              "physical network interfaces were not found:</p><p><b>%2</b></p>"
@@ -1806 +1747 @@
 void UIMessageCenter::cannotStartMachine(const CConsole &console, const QString &strName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to start the virtual machine <b>%1</b>.")
              .arg(strName),
@@ -1814 +1755 @@
 void UIMessageCenter::cannotStartMachine(const CProgress &progress, const QString &strName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to start the virtual machine <b>%1</b>.")
              .arg(strName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
 void UIMessageCenter::cannotSendACPIToMachine() const
 {
-    alert(mainWindowShown(),  MessageType_Warning,
+    alert(0,  MessageType_Warning,
           tr("You are trying to shut down the guest with the ACPI power button. "
              "This is currently not possible because the guest does not support software shutdown."));
@@ -1829 +1770 @@
 bool UIMessageCenter::confirmInputCapture(bool &fAutoConfirmed) const
 {
-    int rc = question(mainWindowShown(), MessageType_Info,
+    int rc = question(0, MessageType_Info,
                       tr("<p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. "
                          "This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer "
@@ -1854 +1795 @@
 void UIMessageCenter::remindAboutAutoCapture() const
 {
-    alert(mainWindowShown(), MessageType_Info,
+    alert(0, MessageType_Info,
           tr("<p>You have the <b>Auto capture keyboard</b> option turned on. "
              "This will cause the Virtual Machine to automatically <b>capture</b> "
@@ -1876 +1817 @@
 void UIMessageCenter::remindAboutMouseIntegration(bool fSupportsAbsolute) const
 {
-    /* Do not show this async warning more than one at time: */
     if (warningShown("remindAboutMouseIntegration"))
         return;
@@ -1889 +1829 @@
     if (fSupportsAbsolute)
     {
-        alert(mainWindowShown(), MessageType_Info,
+        alert(0, MessageType_Info,
               tr("<p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. "
                  "This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- "
@@ -1903 +1843 @@
     else
     {
-        alert(mainWindowShown(), MessageType_Info,
+        alert(0, MessageType_Info,
               tr("<p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> "
                  "in the current video mode. You need to capture the mouse (by clicking over the VM display "
@@ -1910 +1850 @@
     }
 
-    /* Allow to show this async warning: */
     setWarningShown("remindAboutMouseIntegration", false);
 }
@@ -1916 +1855 @@
 void UIMessageCenter::remindAboutPausedVMInput() const
 {
-    alert(mainWindowShown(), MessageType_Info,
+    alert(0, MessageType_Info,
           tr("<p>The Virtual Machine is currently in the <b>Paused</b> state and "
              "not able to see any keyboard or mouse input. If you want to "
@@ -1926 +1865 @@
 bool UIMessageCenter::confirmGoingFullscreen(const QString &strHotKey) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Info,
+    return questionBinary(0, MessageType_Info,
                           tr("<p>The virtual machine window will be now switched to <b>fullscreen</b> mode. "
                              "You can go back to windowed mode at any time by pressing <b>%1</b>.</p>"
@@ -1939 +1878 @@
 bool UIMessageCenter::confirmGoingSeamless(const QString &strHotKey) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Info,
+    return questionBinary(0, MessageType_Info,
                           tr("<p>The virtual machine window will be now switched to <b>Seamless</b> mode. "
                              "You can go back to windowed mode at any time by pressing <b>%1</b>.</p>"
@@ -1952 +1891 @@
 bool UIMessageCenter::confirmGoingScale(const QString &strHotKey) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Info,
+    return questionBinary(0, MessageType_Info,
                           tr("<p>The virtual machine window will be now switched to <b>Scale</b> mode. "
                              "You can go back to windowed mode at any time by pressing <b>%1</b>.</p>"
@@ -1965 +1904 @@
 bool UIMessageCenter::cannotEnterFullscreenMode(ULONG /* uWidth */, ULONG /* uHeight */, ULONG /* uBpp */, ULONG64 uMinVRAM) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Warning,
+    return questionBinary(0, MessageType_Warning,
                           tr("<p>Could not switch the guest display to fullscreen mode due to insufficient guest video memory.</p>"
                              "<p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p>"
@@ -1976 +1915 @@
 void UIMessageCenter::cannotEnterSeamlessMode(ULONG /* uWidth */, ULONG /* uHeight */, ULONG /* uBpp */, ULONG64 uMinVRAM) const
 {
-    alert(mainWindowShown(), MessageType_Error,
+    alert(0, MessageType_Error,
           tr("<p>Could not enter seamless mode due to insufficient guest "
              "video memory.</p>"
@@ -1986 +1925 @@
 bool UIMessageCenter::cannotSwitchScreenInFullscreen(quint64 uMinVRAM) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Warning,
+    return questionBinary(0, MessageType_Warning,
                           tr("<p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p>"
                              "<p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p>"
@@ -1997 +1936 @@
 void UIMessageCenter::cannotSwitchScreenInSeamless(quint64 uMinVRAM) const
 {
-    alert(mainWindowShown(), MessageType_Error,
+    alert(0, MessageType_Error,
           tr("<p>Could not change the guest screen to this host screen "
              "due to insufficient guest video memory.</p>"
@@ -2007 +1946 @@
 void UIMessageCenter::cannotAttachUSBDevice(const CConsole &console, const QString &strDevice) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.")
-             .arg(strDevice, console.GetMachine().GetName()),
-          strErrorInfo);
+             .arg(strDevice, CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
 }
 
 void UIMessageCenter::cannotAttachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.")
              .arg(strDevice, strMachineName),
@@ -2026 +1962 @@
 void UIMessageCenter::cannotDetachUSBDevice(const CConsole &console, const QString &strDevice) const
 {
-    /* Preserve error-info: */
-    QString strErrorInfo = formatErrorInfo(console);
-    /* Show the error: */
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.")
-             .arg(strDevice, console.GetMachine().GetName()),
-          strErrorInfo);
+             .arg(strDevice, CConsole(console).GetMachine().GetName()),
+          formatErrorInfo(console));
 }
 
 void UIMessageCenter::cannotDetachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, MessageType_Error,
           tr("Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.")
              .arg(strDevice, strMachineName),
@@ -2043 +1976 @@
 }
 
-void UIMessageCenter::remindAboutGuestAdditionsAreNotActive(QWidget *pParent /*= 0*/) const
-{
-    alert(pParent, MessageType_Warning,
+void UIMessageCenter::remindAboutGuestAdditionsAreNotActive() const
+{
+    alert(0, MessageType_Warning,
           tr("<p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, "
              "and shared folders cannot be used without them. To use shared folders inside the virtual machine, "
@@ -2078 +2011 @@
 void UIMessageCenter::askUserToDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) const
 {
-    alert(mainWindowShown(), MessageType_Info,
+    alert(networkManagerOrMainWindowShown(), MessageType_Info,
           tr("<p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p>"
              "<p>You should download and install version %3 of this extension pack from Oracle!</p>")
-             .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion),
-          0 /* auto-confirm id */);
+             .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion));
 }
 
 bool UIMessageCenter::cannotFindGuestAdditions() const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Could not find the <b>VirtualBox Guest Additions</b> CD image.</p>"
                              "<p>Do you wish to download this CD image from the Internet?</p>"),
@@ -2096 +2028 @@
 bool UIMessageCenter::confirmDownloadGuestAdditions(const QString &strUrl, qulonglong uSize) const
 {
-    QLocale loc(VBoxGlobal::languageId());
     return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question,
                           tr("<p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> CD image "
                              "from <nobr><a href=\"%1\">%1</a></nobr> (size %2 bytes)?</p>")
-                             .arg(strUrl, loc.toString(uSize)),
+                             .arg(strUrl, QLocale(VBoxGlobal::languageId()).toString(uSize)),
                           0 /* auto-confirm id */,
                           tr("Download"));
@@ -2129 +2060 @@
 void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
 {
-    alert(mainWindowShown(), MessageType_Error,
+    alert(0, MessageType_Error,
           tr("<p>Could not insert the <b>VirtualBox Guest Additions</b> CD image into the virtual machine <b>%1</b>, "
              "as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the "
@@ -2138 +2069 @@
 void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress) const
 {
-    error(mainWindowShown(), MessageType_Error,
+    error(0, 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()));
+          formatErrorInfo(progress));
 }
 
 bool UIMessageCenter::cannotFindUserManual(const QString &strMissedLocation) const
 {
-    return questionBinary(mainWindowShown(), MessageType_Question,
+    return questionBinary(0, MessageType_Question,
                           tr("<p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p>"
                              "<p>Do you wish to download this file from the Internet?</p>")
@@ -2156 +2087 @@
 bool UIMessageCenter::confirmDownloadUserManual(const QString &strURL, qulonglong uSize) const
 {
-    QLocale loc(VBoxGlobal::languageId());
     return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question,
                           tr("<p>Are you sure you want to download the <b>VirtualBox User Manual</b> "
                              "from <nobr><a href=\"%1\">%1</a></nobr> (size %2 bytes)?</p>")
-                             .arg(strURL, loc.toString(uSize)),
+                             .arg(strURL, QLocale(VBoxGlobal::languageId()).toString(uSize)),
                           0 /* auto-confirm id */,
                           tr("Download"));
@@ -2186 +2116 @@
 bool UIMessageCenter::warAboutOutdatedExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) const
 {
-    return questionBinary(mainWindowShown(),
-                          MessageType_Question,
+    return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question,
                           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>")
@@ -2197 +2126 @@
 bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) const
 {
-    QLocale loc(VBoxGlobal::languageId());
     return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question,
                           tr("<p>Are you sure you want to download the <b><nobr>%1</nobr></b> "
                              "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>")
-                             .arg(strExtPackName, strURL, loc.toString(uSize)),
+                             .arg(strExtPackName, strURL, QLocale(VBoxGlobal::languageId()).toString(uSize)),
                           0 /* auto-confirm id */,
                           tr("Download"));
@@ -2242 +2170 @@
                              "</table></p>")
                              .arg(strPackName).arg(strPackVersion).arg(strPackDescription),
-                          0,
+                          0 /* auto-confirm id */,
                           tr("Install", "extension pack"));
 }
@@ -2274 +2202 @@
                                 "</table></p>")
                                 .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription),
-                             0,
+                             0 /* auto-confirm id */,
                              tr("&Upgrade"));
     else if (iVerCmp < 0)
@@ -2287 +2215 @@
                                 "</table></p>")
                                 .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription),
-                             0,
+                             0 /* auto-confirm id */,
                              tr("&Downgrade"));
     else
@@ -2299 +2227 @@
                                 "</table></p>")
                                 .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription),
-                             0,
+                             0 /* auto-confirm id */,
                              tr("&Reinstall"));
     return fRc;
@@ -2310 +2238 @@
                              "<p>Are you sure you want to proceed?</p>")
                              .arg(strPackName),
-                          0,
+                          0 /* auto-confirm id */,
                           tr("&Remove"));
 }
@@ -2341 +2269 @@
           tr("Failed to install the Extension Pack <b>%1</b>.")
              .arg(strFilename),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -2357 +2285 @@
           tr("Failed to uninstall the Extension Pack <b>%1</b>.")
              .arg(strPackName),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 
@@ -2379 +2307 @@
     error(pParent, MessageType_Error,
           tr("Failed to drop data."),
-          !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+          formatErrorInfo(progress));
 }
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -2479 +2407 @@
 
     return str;
+}
+
+/* static */
+QString UIMessageCenter::formatErrorInfo(const CProgress &progress)
+{
+    return !progress.isOk() ? formatErrorInfo(static_cast<COMBaseWithEI>(progress)) : formatErrorInfo(progress.GetErrorInfo());
 }
 

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

@@ -186 +186 @@
     void cannotOpenMachine(const CVirtualBox &vbox, const QString &strMachinePath) const;
     void cannotReregisterExistingMachine(const QString &strMachinePath, const QString &strMachineName) const;
-    void cannotResolveCollisionAutomatically(const QString &strName, const QString &strGroupName) const;
+    void cannotResolveCollisionAutomatically(const QString &strCollisionName, const QString &strGroupName) const;
     bool confirmAutomaticCollisionResolve(const QString &strName, const QString &strGroupName) const;
     void cannotSetGroups(const CMachine &machine) const;
@@ -202 +202 @@
     void cannotDiscardSavedState(const CConsole &console) const;
     void cannotSaveMachineState(const CConsole &console);
-    void cannotSaveMachineState(const CProgress &progress, const QString &strName);
+    void cannotSaveMachineState(const CProgress &progress, const QString &strMachineName);
     void cannotACPIShutdownMachine(const CConsole &console) const;
     void cannotPowerDownMachine(const CConsole &console) const;
-    void cannotPowerDownMachine(const CProgress &progress, const QString &strName) const;
+    void cannotPowerDownMachine(const CProgress &progress, const QString &strMachineName) const;
 
     /* API: Snapshot warnings: */
@@ -214 +214 @@
     void cannotTakeSnapshot(const CConsole &console, const QString &strMachineName, QWidget *pParent = 0) const;
     void cannotTakeSnapshot(const CProgress &progress, const QString &strMachineName, QWidget *pParent = 0) const;
-    void cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent = 0) const;
-    void cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent = 0) const;
+    void cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName) const;
+    void cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const;
     void cannotRemoveSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName) const;
     void cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const;
@@ -223 +223 @@
     void cannotCreateHostInterface(const CHost &host, QWidget *pParent = 0);
     void cannotCreateHostInterface(const CProgress &progress, QWidget *pParent = 0);
-    void cannotRemoveHostInterface(const CHost &host, const QString &strName, QWidget *pParent = 0);
-    void cannotRemoveHostInterface(const CProgress &progress, const QString &strName, QWidget *pParent = 0);
+    void cannotRemoveHostInterface(const CHost &host, const QString &strInterfaceName, QWidget *pParent = 0);
+    void cannotRemoveHostInterface(const CProgress &progress, const QString &strInterfaceName, QWidget *pParent = 0);
     void cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent = 0) const;
 
@@ -239 +239 @@
     void warnAboutIncorrectPort(QWidget *pParent = 0) const;
     bool confirmCancelingPortForwardingDialog(QWidget *pParent = 0) const;
-    void cannotCreateSharedFolder(const CMachine &machine, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
-    void cannotCreateSharedFolder(const CConsole &console, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
-    void cannotRemoveSharedFolder(const CMachine &machine, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
-    void cannotRemoveSharedFolder(const CConsole &console, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+    void cannotCreateSharedFolder(const CMachine &machine, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+    void cannotCreateSharedFolder(const CConsole &console, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+    void cannotRemoveSharedFolder(const CMachine &machine, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+    void cannotRemoveSharedFolder(const CConsole &console, const QString &strName, const QString &strPath, QWidget *pParent = 0);
     void cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent = 0) const;
 
@@ -304 +304 @@
     void cannotDetachUSBDevice(const CConsole &console, const QString &strDevice) const;
     void cannotDetachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const;
-    void remindAboutGuestAdditionsAreNotActive(QWidget *pParent = 0) const;
+    void remindAboutGuestAdditionsAreNotActive() const;
 
     /* API: Network management warnings: */
@@ -356 +356 @@
     /* API: Static helpers: */
     static QString formatRC(HRESULT rc);
+    static QString formatErrorInfo(const CProgress &progress);
     static QString formatErrorInfo(const COMErrorInfo &info, HRESULT wrapperRC = S_OK);
     static QString formatErrorInfo(const CVirtualBoxErrorInfo &info);

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

@@ -4809 +4809 @@
      * otherwise we better show the progress... */
     int iSpawningDuration = 60000;
-    msgCenter().showModalProgressDialog(progress, machine.GetName(), "", msgCenter().mainWindowShown(), iSpawningDuration);
+    msgCenter().showModalProgressDialog(progress, machine.GetName(),
+                                        ":/progress_start_90px.png", 0, iSpawningDuration);
     if (!progress.isOk() || progress.GetResultCode() != 0)
         msgCenter().cannotOpenSession(progress, machine.GetName());

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -330 +330 @@
                 {
                     /* Show machine power down progress: */
-                    msgCenter().showModalProgressDialog(progress, strMachineName, ":/progress_poweroff_90px.png", activeMachineWindow());
+                    msgCenter().showModalProgressDialog(progress, strMachineName, ":/progress_poweroff_90px.png");
                     if (!progress.isOk() || progress.GetResultCode() != 0)
                         msgCenter().cannotPowerDownMachine(progress, strMachineName);
@@ -1034 +1034 @@
             {
                 /* Show the take-snapshot progress: */
-                msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_create_90px.png", activeMachineWindow());
+                msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_create_90px.png");
                 if (!progress.isOk() || progress.GetResultCode() != 0)
-                    msgCenter().cannotTakeSnapshot(progress, machine.GetName(), activeMachineWindow());
+                    msgCenter().cannotTakeSnapshot(progress, machine.GetName());
             }
             else
-                msgCenter().cannotTakeSnapshot(console, machine.GetName(), activeMachineWindow());
+                msgCenter().cannotTakeSnapshot(console, machine.GetName());
         }
     }
@@ -1226 +1226 @@
     /* Do not process if additions are not loaded! */
     if (!uisession()->isGuestAdditionsActive())
-        msgCenter().remindAboutGuestAdditionsAreNotActive(activeMachineWindow());
+        msgCenter().remindAboutGuestAdditionsAreNotActive();
 
     /* Open VM settings : Shared folders page: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -221 +221 @@
     if (isSaved())
     {
-        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", mainMachineWindow(), 0);
+        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", 0, 0);
         /* If restoring from saved state, guest MachineView
            should be notified about host MachineWindow geometry change */
@@ -227 +227 @@
     }
     else
-        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_start_90px.png", mainMachineWindow());
+        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_start_90px.png");
 
     /* Check for a progress failure: */
@@ -280 +280 @@
                     uimachine()->machineLogic()->setPreventAutoClose(true);
                 /* Show the power down progress dialog */
-                msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png", mainMachineWindow());
+                msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png");
                 if (!progress.isOk() || progress.GetResultCode() != 0)
                     msgCenter().cannotPowerDownMachine(progress, machine.GetName());
@@ -320 +320 @@
     {
         /* Show the saving progress: */
-        msgCenter().showModalProgressDialog(progress, machine.GetName(),
-                                            ":/progress_state_save_90px.png",
-                                            machineLogic()->activeMachineWindow());
+        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_save_90px.png");
         if (!progress.isOk() || progress.GetResultCode() != 0)
         {
@@ -370 +368 @@
     {
         /* Show the power-off progress: */
-        msgCenter().showModalProgressDialog(progress, machine.GetName(),
-                                            ":/progress_poweroff_90px.png",
-                                            machineLogic()->activeMachineWindow());
+        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png");
         if (progress.GetResultCode() == 0)
         {
@@ -384 +380 @@
                 {
                     /* Show the snapshot-discard progress: */
-                    msgCenter().showModalProgressDialog(progress, machine.GetName(),
-                                                        ":/progress_snapshot_discard_90px.png",
-                                                        machineLogic()->activeMachineWindow());
+                    msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_discard_90px.png");
                     if (progress.GetResultCode() != 0)
                     {
                         /* Failed in progress: */
-                        msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName(), machine.GetName(), machineLogic()->activeMachineWindow());
+                        msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName(), machine.GetName());
                         return false;
                     }
@@ -397 +391 @@
                 {
                     /* Failed in console: */
-                    msgCenter().cannotRestoreSnapshot(console, snapshot.GetName(), machine.GetName(), machineLogic()->activeMachineWindow());
+                    msgCenter().cannotRestoreSnapshot(console, snapshot.GetName(), machine.GetName());
                     return false;
                 }
@@ -505 +499 @@
     if (fResult)
     {
-        msgCenter().showModalProgressDialog(progressInstall, tr("Updating Guest Additions"), ":/progress_install_guest_additions_90px.png",
-                                            machineLogic()->activeMachineWindow(), 500 /* 500ms delay. */);
+        msgCenter().showModalProgressDialog(progressInstall, tr("Updating Guest Additions"),
+                                            ":/progress_install_guest_additions_90px.png",
+                                            0, 500 /* 500ms delay. */);
         if (progressInstall.GetCanceled())
             return;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -750 +750 @@
     if (!sharedFolder.isNull())
     {
-        /* Get machine-name: */
-        QString strMachineName(m_machine.GetName());
         /* Remove existing shared folder: */
         switch(sharedFoldersType)
@@ -763 +761 @@
                     setFailed(true);
                     /* Show error message: */
-                    msgCenter().cannotRemoveSharedFolder(m_machine, strMachineName, strName, strPath, this);
+                    msgCenter().cannotRemoveSharedFolder(m_machine, strName, strPath, this);
                     /* Finish early: */
                     return false;
@@ -777 +775 @@
                     setFailed(true);
                     /* Show error message: */
-                    msgCenter().cannotRemoveSharedFolder(m_console, strMachineName, strName, strPath, this);
+                    msgCenter().cannotRemoveSharedFolder(m_console, strName, strPath, this);
                     /* Finish early: */
                     return false;
@@ -809 +807 @@
     if (sharedFolder.isNull())
     {
-        /* Get machine-name: */
-        QString strMachineName(m_machine.GetName());
         /* Create new shared folder: */
         switch(sharedFoldersType)
@@ -822 +818 @@
                     setFailed(true);
                     /* Show error message: */
-                    msgCenter().cannotCreateSharedFolder(m_machine, strMachineName, strName, strPath, this);
+                    msgCenter().cannotCreateSharedFolder(m_machine, strName, strPath, this);
                     /* Finish early: */
                     return false;
@@ -837 +833 @@
                     setFailed(true);
                     /* Show error message: */
-                    msgCenter().cannotCreateSharedFolder(m_console, strMachineName, strName, strPath, this);
+                    msgCenter().cannotCreateSharedFolder(m_console, strName, strPath, this);
                     /* Finish early: */
                     return false;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

@@ -67 +67 @@
             {
                 /* Show some progress, so the user know whats going on */
-                msgCenter().showModalProgressDialog(progress, tr("Reading Appliance ..."), "", this);
+                msgCenter().showModalProgressDialog(progress, tr("Reading Appliance ..."), ":/shared_folder_32px.png", this);
                 if (!progress.isOk() || progress.GetResultCode() != 0)
                     fResult = false;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -86 +86 @@
     {
         /* Show some progress, so the user know whats going on: */
-        msgCenter().showModalProgressDialog(progress, QApplication::translate("UIWizardExportApp", "Checking files ..."), "", this);
+        msgCenter().showModalProgressDialog(progress, QApplication::translate("UIWizardExportApp", "Checking files ..."),
+                                            ":/refresh_32px.png", this);
         if (progress.GetCanceled())
             return false;
@@ -107 +108 @@
         {
             /* Show some progress, so the user know whats going on: */
-            msgCenter().showModalProgressDialog(progress1, QApplication::translate("UIWizardExportApp", "Removing files ..."), "", this);
+            msgCenter().showModalProgressDialog(progress1, QApplication::translate("UIWizardExportApp", "Removing files ..."),
+                                                ":/vm_delete_32px.png", this);
             if (progress1.GetCanceled())
                 return false;