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

Timestamp:

Apr 5, 2013 1:46:55 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center: Parent choosing rule simplification.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (110 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• net/UIDownloaderAdditions.cpp (modified) (1 diff)
• net/UIUpdateManager.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (2 diffs)
• selector/VBoxSnapshotsWgt.cpp (modified) (2 diffs)

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

@@ -317 +317 @@
 {
     /* It may happen that this method is called during VBoxGlobal
-     * initialization or even after it failed (for example, to show some
-     * error message). Return no main window in this case: */
+     * initialization or even after it failed (for example, to show some error message).
+     * Return no main window in this case: */
     if (!vboxGlobal().isValid())
         return 0;
 
+    /* For VM console process: */
     if (vboxGlobal().isVMConsoleProcess())
     {
-        if (vboxGlobal().vmWindow() && vboxGlobal().vmWindow()->isVisible()) /* VM window is visible */
-            return vboxGlobal().vmWindow(); /* return that window */
-    }
+        /* It will be currently active machine window if visible: */
+        if (vboxGlobal().vmWindow()->isVisible())
+            return vboxGlobal().vmWindow();
+    }
+    /* Otherwise: */
     else
     {
-        if (vboxGlobal().selectorWnd().isVisible()) /* VM selector is visible */
-            return &vboxGlobal().selectorWnd(); /* return that window */
-    }
-
+        /* It will be the selector window if visible: */
+        if (vboxGlobal().selectorWnd().isVisible())
+            return &vboxGlobal().selectorWnd();
+    }
+
+    /* Nothing by default: */
     return 0;
 }
 
-QWidget* UIMessageCenter::mainMachineWindowShown() const
-{
-    /* It may happen that this method is called during VBoxGlobal
-     * initialization or even after it failed (for example, to show some
-     * error message). Return no main window in this case: */
-    if (!vboxGlobal().isValid())
-        return 0;
-
-    if (vboxGlobal().vmWindow() && vboxGlobal().vmWindow()->isVisible()) /* VM window is visible */
-        return vboxGlobal().vmWindow(); /* return that window */
-
-    return 0;
-}
-
 QWidget* UIMessageCenter::networkManagerOrMainWindowShown() const
 {
     return gNetworkManager->window()->isVisible() ? gNetworkManager->window() : mainWindowShown();
-}
-
-QWidget* UIMessageCenter::networkManagerOrMainMachineWindowShown() const
-{
-    return gNetworkManager->window()->isVisible() ? gNetworkManager->window() : mainMachineWindowShown();
 }
 
@@ -877 +863 @@
 void UIMessageCenter::cannotTakeSnapshot(const CConsole &console, const QString &strMachineName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create a snapshot of the virtual machine <b>%1</b>.")
              .arg(strMachineName),
@@ -885 +871 @@
 void UIMessageCenter::cannotTakeSnapshot(const CProgress &progress, const QString &strMachineName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create a snapshot of the virtual machine <b>%1</b>.")
              .arg(strMachineName),
@@ -893 +879 @@
 void UIMessageCenter::cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
              .arg(strSnapshotName, strMachineName),
@@ -901 +887 @@
 void UIMessageCenter::cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
              .arg(strSnapshotName, strMachineName),
@@ -925 +911 @@
 bool UIMessageCenter::confirmHostInterfaceRemoval(const QString &strName, QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           tr("<p>Deleting this host-only network will remove "
                              "the host-only interface this network is based on. Do you want to "
@@ -941 +927 @@
 void UIMessageCenter::cannotCreateHostInterface(const CHost &host, QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create the host network interface."),
           formatErrorInfo(host));
@@ -948 +934 @@
 void UIMessageCenter::cannotCreateHostInterface(const CProgress &progress, QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create the host network interface."),
           !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
@@ -955 +941 @@
 void UIMessageCenter::cannotRemoveHostInterface(const CHost &host, const QString &strName, QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to remove the host network interface <b>%1</b>.")
              .arg(strName),
@@ -963 +949 @@
 void UIMessageCenter::cannotRemoveHostInterface(const CProgress &progress, const QString &strName, QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to remove the host network interface <b>%1</b>.")
              .arg(strName),
@@ -971 +957 @@
 void UIMessageCenter::cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Critical,
+    error(pParent, MessageType_Critical,
           tr("Failed to set global VirtualBox properties."),
           formatErrorInfo(properties));
@@ -985 +971 @@
         return;
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), res.isWarning() ? MessageType_Warning : MessageType_Error,
+    error(pParent, res.isWarning() ? MessageType_Warning : MessageType_Error,
           tr("Failed to access the USB subsystem."),
           formatErrorInfo(res),
@@ -997 +983 @@
     setWarningShown("warnAboutUnsupportedUSB2", true);
 
-    alert(pParent ? pParent : mainMachineWindowShown(), MessageType_Warning,
+    alert(pParent, MessageType_Warning,
           tr("<p>USB 2.0 is currently enabled for this virtual machine. "
              "However, this requires the <b><nobr>%1</nobr></b> to be installed.</p>"
@@ -1015 +1001 @@
     setWarningShown("warnAboutStateChange", true);
     /* Show the error: */
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Warning,
+    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. "
@@ -1025 +1011 @@
 bool UIMessageCenter::confirmSettingsReloading(QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           tr("<p>The machine settings were changed while you were editing them. "
                              "You currently have unsaved setting changes.</p>"
@@ -1035 +1021 @@
 int UIMessageCenter::confirmHardDiskAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
 {
-    return questionTrinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionTrinary(pParent, MessageType_Question,
                            tr("<p>You are about to add a virtual hard disk to controller <b>%1</b>.</p>"
                               "<p>Would you like to create a new, empty file to hold the disk contents or select an existing one?</p>")
@@ -1046 +1032 @@
 int UIMessageCenter::confirmOpticalAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
 {
-    return questionTrinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionTrinary(pParent, MessageType_Question,
                            tr("<p>You are about to add a new CD/DVD drive to controller <b>%1</b>.</p>"
                               "<p>Would you like to choose a virtual CD/DVD disk to put in the drive "
@@ -1058 +1044 @@
 int UIMessageCenter::confirmFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
 {
-    return questionTrinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionTrinary(pParent, MessageType_Question,
                            tr("<p>You are about to add a new floppy drive to controller <b>%1</b>.</p>"
                               "<p>Would you like to choose a virtual floppy disk to put in the drive "
@@ -1070 +1056 @@
 int UIMessageCenter::confirmRemovingOfLastDVDDevice(QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Info,
+    return questionBinary(pParent, MessageType_Info,
                           tr("<p>Are you sure you want to delete the CD/DVD-ROM device?</p>"
                              "<p>You will not be able to mount any CDs or ISO images "
@@ -1106 +1092 @@
             break;
     }
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           strMessage, formatErrorInfo(machine));
 }
@@ -1112 +1098 @@
 void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent /*= 0*/) const
 {
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    alert(pParent, MessageType_Error,
           tr("The current port forwarding rules are not valid. "
              "None of the host or guest port values may be set to zero."));
@@ -1119 +1105 @@
 bool UIMessageCenter::confirmCancelingPortForwardingDialog(QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           tr("<p>There are unsaved changes in the port forwarding configuration.</p>"
                              "<p>If you proceed your changes will be discarded.</p>"));
@@ -1128 +1114 @@
                                                QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+    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>.")
@@ -1139 +1125 @@
                                                QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+    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>.")
@@ -1150 +1136 @@
                                                QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("<p>Failed to remove the shared folder <b>%1</b> (pointing to "
              "<nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p>"
@@ -1163 +1149 @@
                                                QWidget *pParent /*= 0*/)
 {
-    error(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("<p>Failed to remove the shared folder <b>%1</b> (pointing to "
              "<nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p>"
@@ -1177 +1163 @@
     COMResult res(machine);
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_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()),
@@ -1186 +1172 @@
                                              QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("<p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p>")
              .arg(gpConverter->toString(oldMediumType)).arg(gpConverter->toString(newMediumType)),
@@ -1220 +1206 @@
     }
     /* Show the question: */
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           strMessage.arg(medium.location(), strUsage),
                           0 /* auto-confirm id */, tr("Release", "detach medium"));
@@ -1270 +1256 @@
     }
     /* Show the question: */
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           strMessage.arg(medium.location()),
                           "confirmMediumRemoval" /* auto-confirm id */, tr("Remove", "medium"));
@@ -1277 +1263 @@
 int UIMessageCenter::confirmDeleteHardDiskStorage(const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    return questionTrinary(pParent ? pParent : mainWindowShown(), MessageType_Question,
+    return questionTrinary(pParent, MessageType_Question,
                            tr("<p>Do you want to delete the storage unit of the hard disk "
                               "<nobr><b>%1</b></nobr>?</p>"
@@ -1295 +1281 @@
 void UIMessageCenter::cannotDeleteHardDiskStorage(const CMedium &medium, const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to delete the storage unit of the hard disk <b>%1</b>.")
              .arg(strLocation),
@@ -1303 +1289 @@
 void UIMessageCenter::cannotDeleteHardDiskStorage(const CProgress &progress, const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to delete the storage unit of the hard disk <b>%1</b>.")
              .arg(strLocation),
@@ -1339 +1325 @@
     }
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           strMessage, strErrorInfo);
 }
@@ -1388 +1374 @@
     /* Show the messsage: */
     if (fRetry)
-        return errorWithQuestion(pParent ? pParent : mainWindowShown(), MessageType_Question,
+        return errorWithQuestion(pParent, MessageType_Question,
                                  strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location()).arg(machine.GetName()),
                                  strErrorInfo,
                                  0 /* Auto Confirm ID */,
                                  tr("Force Unmount"));
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location()).arg(machine.GetName()),
           strErrorInfo);
@@ -1424 +1410 @@
     }
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           strMessage.arg(strLocation), formatErrorInfo(vbox));
 }
@@ -1453 +1439 @@
     }
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           strMessage.arg(medium.location()), formatErrorInfo(rc));
 }
@@ -1459 +1445 @@
 bool UIMessageCenter::confirmHardDisklessMachine(QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Warning,
+    return questionBinary(pParent, MessageType_Warning,
                           tr("You are about to create a new virtual machine without a hard drive. "
                              "You will not be able to install an operating system on the machine "
@@ -1471 +1457 @@
 void UIMessageCenter::cannotCreateMachine(const CVirtualBox &vbox, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create a new virtual machine."),
           formatErrorInfo(vbox));
@@ -1478 +1464 @@
 void UIMessageCenter::cannotRegisterMachine(const CVirtualBox &vbox, const QString &strMachineName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to register the virtual machine <b>%1</b>.")
              .arg(strMachineName),
@@ -1489 +1475 @@
     QString strErrorInfo = formatErrorInfo(machine);
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to clone the virtual machine <b>%1</b>.")
              .arg(machine.GetName()),
@@ -1497 +1483 @@
 void UIMessageCenter::cannotCreateClone(const CProgress &progress, const QString &strMachineName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to clone the virtual machine <b>%1</b>.")
              .arg(strMachineName),
@@ -1505 +1491 @@
 void UIMessageCenter::cannotOverwriteHardDiskStorage(const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Info,
+    alert(pParent, MessageType_Info,
           tr("<p>The hard disk storage unit at location <b>%1</b> already exists. "
              "You cannot create a new virtual hard disk that uses this location "
@@ -1515 +1501 @@
 void UIMessageCenter::cannotCreateHardDiskStorage(const CVirtualBox &vbox, const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create the hard disk storage <nobr><b>%1</b>.</nobr>")
              .arg(strLocation),
@@ -1523 +1509 @@
 void UIMessageCenter::cannotCreateHardDiskStorage(const CMedium &medium, const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create the hard disk storage <nobr><b>%1</b>.</nobr>")
              .arg(strLocation),
@@ -1531 +1517 @@
 void UIMessageCenter::cannotCreateHardDiskStorage(const CProgress &progress, const QString &strLocation, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to create the hard disk storage <nobr><b>%1</b>.</nobr>")
              .arg(strLocation),
@@ -1540 +1526 @@
 {
     QFileInfo fi(strFolderName);
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Critical,
+    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>")
@@ -1549 +1535 @@
 {
     QFileInfo fi(strFolderName);
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Critical,
+    alert(pParent, MessageType_Critical,
           tr("<p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p>"
              "<p>This folder already exists and possibly belongs to another machine.</p>")
@@ -1558 +1544 @@
 {
     QFileInfo fi(strFolderName);
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Critical,
+    alert(pParent, MessageType_Critical,
           tr("<p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p>"
              "<p>Please check that the parent really exists and that you have permissions to create the machine folder.</p>")
@@ -1575 +1561 @@
         strWarningInfo = "<br />" + strWarningInfo;
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to open/interpret appliance <b>%1</b>.")
              .arg(appliance.GetPath()),
@@ -1583 +1569 @@
 void UIMessageCenter::cannotImportAppliance(const CProgress &progress, const QString &strPath, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to import appliance <b>%1</b>.")
              .arg(strPath),
@@ -1591 +1577 @@
 void UIMessageCenter::cannotCheckFiles(const CProgress &progress, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to check files."),
           !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
@@ -1598 +1584 @@
 void UIMessageCenter::cannotRemoveFiles(const CProgress &progress, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to remove file."),
           !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
@@ -1605 +1591 @@
 bool UIMessageCenter::confirmExportMachinesInSaveState(const QStringList &machineNames, QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(), MessageType_Warning,
+    return questionBinary(pParent, MessageType_Warning,
                           tr("<p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p>"
                              "<p>If you continue the runtime state of the exported machine(s) will be discarded. "
@@ -1622 +1608 @@
     QString strErrorInfo = formatErrorInfo(appliance);
     /* Show the error: */
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to prepare the export of the appliance <b>%1</b>.")
              .arg(appliance.GetPath()),
@@ -1630 +1616 @@
 void UIMessageCenter::cannotExportAppliance(const CMachine &machine, const QString &strPath, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to prepare the export of the appliance <b>%1</b>.")
              .arg(strPath),
@@ -1638 +1624 @@
 void UIMessageCenter::cannotExportAppliance(const CProgress &progress, const QString &strPath, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to export appliance <b>%1</b>.")
              .arg(strPath),
@@ -1646 +1632 @@
 void UIMessageCenter::cannotFindSnapshotByName(const CMachine &machine, const QString &strName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Can't find snapshot named <b>%1</b>.")
              .arg(strName),
@@ -1713 +1699 @@
     if (type == MessageType_Critical)
     {
-        error(mainMachineWindowShown(), type,
+        error(mainWindowShown(), 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 "
@@ -1721 +1707 @@
     else if (type == MessageType_Error)
     {
-        error(mainMachineWindowShown(), type,
+        error(mainWindowShown(), type,
               tr("<p>An error has occurred during virtual machine execution! "
                  "The error details are shown below. You may try to correct the error "
@@ -1729 +1715 @@
     else
     {
-        error(mainMachineWindowShown(), type,
+        error(mainWindowShown(), 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>"),
@@ -1746 +1732 @@
 bool UIMessageCenter::remindAboutGuruMeditation(const QString &strLogFolder)
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_GuruMeditation,
+    return questionBinary(mainWindowShown(), MessageType_GuruMeditation,
                           tr("<p>A critical error has occurred while running the virtual "
                              "machine and the machine execution has been stopped.</p>"
@@ -1773 +1759 @@
 {
     if (fHWVirtExSupported)
-        return questionBinary(mainMachineWindowShown(), MessageType_Error,
+        return questionBinary(mainWindowShown(), 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 "
@@ -1782 +1768 @@
                               tr("Close VM"), tr("Continue"));
     else
-        return questionBinary(mainMachineWindowShown(), MessageType_Error,
+        return questionBinary(mainWindowShown(), 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 "
@@ -1793 +1779 @@
 {
     if (fHWVirtExSupported)
-        return questionBinary(mainMachineWindowShown(), MessageType_Error,
+        return questionBinary(mainWindowShown(), 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>"
@@ -1800 +1786 @@
                               tr("Close VM"), tr("Continue"));
     else
-        return questionBinary(mainMachineWindowShown(), MessageType_Error,
+        return questionBinary(mainWindowShown(), 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>"),
@@ -1809 +1795 @@
 bool UIMessageCenter::cannotStartWithoutNetworkIf(const QString &strMachineName, const QString &strIfNames) const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Error,
+    return questionBinary(mainWindowShown(), 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>"
@@ -1820 +1806 @@
 void UIMessageCenter::cannotStartMachine(const CConsole &console, const QString &strName) const
 {
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to start the virtual machine <b>%1</b>.")
              .arg(strName),
@@ -1828 +1814 @@
 void UIMessageCenter::cannotStartMachine(const CProgress &progress, const QString &strName) const
 {
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to start the virtual machine <b>%1</b>.")
              .arg(strName),
@@ -1836 +1822 @@
 void UIMessageCenter::cannotSendACPIToMachine() const
 {
-    alert(mainMachineWindowShown(),  MessageType_Warning,
+    alert(mainWindowShown(),  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."));
@@ -1843 +1829 @@
 bool UIMessageCenter::confirmInputCapture(bool &fAutoConfirmed) const
 {
-    int rc = question(mainMachineWindowShown(), MessageType_Info,
+    int rc = question(mainWindowShown(), 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 "
@@ -1868 +1854 @@
 void UIMessageCenter::remindAboutAutoCapture() const
 {
-    alert(mainMachineWindowShown(), MessageType_Info,
+    alert(mainWindowShown(), 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> "
@@ -1903 +1889 @@
     if (fSupportsAbsolute)
     {
-        alert(mainMachineWindowShown(), MessageType_Info,
+        alert(mainWindowShown(), 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 -- "
@@ -1917 +1903 @@
     else
     {
-        alert(mainMachineWindowShown(), MessageType_Info,
+        alert(mainWindowShown(), 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 "
@@ -1930 +1916 @@
 void UIMessageCenter::remindAboutPausedVMInput() const
 {
-    alert(mainMachineWindowShown(), MessageType_Info,
+    alert(mainWindowShown(), 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 "
@@ -1940 +1926 @@
 bool UIMessageCenter::confirmGoingFullscreen(const QString &strHotKey) const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Info,
+    return questionBinary(mainWindowShown(), 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>"
@@ -1953 +1939 @@
 bool UIMessageCenter::confirmGoingSeamless(const QString &strHotKey) const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Info,
+    return questionBinary(mainWindowShown(), 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>"
@@ -1966 +1952 @@
 bool UIMessageCenter::confirmGoingScale(const QString &strHotKey) const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Info,
+    return questionBinary(mainWindowShown(), 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>"
@@ -1979 +1965 @@
 bool UIMessageCenter::cannotEnterFullscreenMode(ULONG /* uWidth */, ULONG /* uHeight */, ULONG /* uBpp */, ULONG64 uMinVRAM) const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Warning,
+    return questionBinary(mainWindowShown(), 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>"
@@ -1990 +1976 @@
 void UIMessageCenter::cannotEnterSeamlessMode(ULONG /* uWidth */, ULONG /* uHeight */, ULONG /* uBpp */, ULONG64 uMinVRAM) const
 {
-    alert(mainMachineWindowShown(), MessageType_Error,
+    alert(mainWindowShown(), MessageType_Error,
           tr("<p>Could not enter seamless mode due to insufficient guest "
              "video memory.</p>"
@@ -2000 +1986 @@
 bool UIMessageCenter::cannotSwitchScreenInFullscreen(quint64 uMinVRAM) const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Warning,
+    return questionBinary(mainWindowShown(), 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>"
@@ -2011 +1997 @@
 void UIMessageCenter::cannotSwitchScreenInSeamless(quint64 uMinVRAM) const
 {
-    alert(mainMachineWindowShown(), MessageType_Error,
+    alert(mainWindowShown(), MessageType_Error,
           tr("<p>Could not change the guest screen to this host screen "
              "due to insufficient guest video memory.</p>"
@@ -2024 +2010 @@
     QString strErrorInfo = formatErrorInfo(console);
     /* Show the error: */
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.")
              .arg(strDevice, console.GetMachine().GetName()),
@@ -2032 +2018 @@
 void UIMessageCenter::cannotAttachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const
 {
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.")
              .arg(strDevice, strMachineName),
@@ -2043 +2029 @@
     QString strErrorInfo = formatErrorInfo(console);
     /* Show the error: */
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.")
              .arg(strDevice, console.GetMachine().GetName()),
@@ -2051 +2037 @@
 void UIMessageCenter::cannotDetachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const
 {
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.")
              .arg(strDevice, strMachineName),
@@ -2059 +2045 @@
 void UIMessageCenter::remindAboutGuestAdditionsAreNotActive(QWidget *pParent /*= 0*/) const
 {
-    alert(pParent ? pParent : mainMachineWindowShown(), MessageType_Warning,
+    alert(pParent, 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, "
@@ -2101 +2087 @@
 bool UIMessageCenter::cannotFindGuestAdditions() const
 {
-    return questionBinary(mainMachineWindowShown(), MessageType_Question,
+    return questionBinary(mainWindowShown(), 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>"),
@@ -2111 +2097 @@
 {
     QLocale loc(VBoxGlobal::languageId());
-    return questionBinary(networkManagerOrMainMachineWindowShown(), MessageType_Question,
+    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>")
@@ -2121 +2107 @@
 void UIMessageCenter::cannotSaveGuestAdditions(const QString &strURL, const QString &strTarget) const
 {
-    alert(networkManagerOrMainMachineWindowShown(), MessageType_Error,
+    alert(networkManagerOrMainWindowShown(), MessageType_Error,
           tr("<p>The <b>VirtualBox Guest Additions</b> CD image has been successfully downloaded "
              "from <nobr><a href=\"%1\">%1</a></nobr> "
@@ -2131 +2117 @@
 bool UIMessageCenter::proposeMountGuestAdditions(const QString &strUrl, const QString &strSrc) const
 {
-    return questionBinary(networkManagerOrMainMachineWindowShown(), MessageType_Question,
+    return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question,
                           tr("<p>The <b>VirtualBox Guest Additions</b> CD image has been successfully downloaded "
                              "from <nobr><a href=\"%1\">%1</a></nobr> "
@@ -2143 +2129 @@
 void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
 {
-    alert(mainMachineWindowShown(), MessageType_Error,
+    alert(mainWindowShown(), 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 "
@@ -2152 +2138 @@
 void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress) const
 {
-    error(mainMachineWindowShown(), MessageType_Error,
+    error(mainWindowShown(), MessageType_Error,
           tr("Failed to update Guest Additions. "
              "The Guest Additions installation image will be mounted to provide a manual installation."),
@@ -2245 +2231 @@
                                                   const QString &strPackDescription, QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(),
-                          MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           tr("<p>You are about to install a VirtualBox extension pack. "
                              "Extension packs complement the functionality of VirtualBox and can contain system level software "
@@ -2279 +2264 @@
     bool fRc;
     if (iVerCmp > 0)
-        fRc = questionBinary(pParent ? pParent : mainWindowShown(),
-                             MessageType_Question,
+        fRc = questionBinary(pParent, MessageType_Question,
                              tr("<p>An older version of the extension pack is already installed, would you like to upgrade? "
                                 "<p>%1</p>"
@@ -2293 +2277 @@
                              tr("&Upgrade"));
     else if (iVerCmp < 0)
-        fRc = questionBinary(pParent ? pParent : mainWindowShown(),
-                             MessageType_Question,
+        fRc = questionBinary(pParent, MessageType_Question,
                              tr("<p>An newer version of the extension pack is already installed, would you like to downgrade? "
                                 "<p>%1</p>"
@@ -2307 +2290 @@
                              tr("&Downgrade"));
     else
-        fRc = questionBinary(pParent ? pParent : mainWindowShown(),
-                             MessageType_Question,
+        fRc = questionBinary(pParent, MessageType_Question,
                              tr("<p>The extension pack is already installed with the same version, would you like reinstall it? "
                                 "<p>%1</p>"
@@ -2324 +2306 @@
 bool UIMessageCenter::confirmRemoveExtensionPack(const QString &strPackName, QWidget *pParent /*= 0*/) const
 {
-    return questionBinary(pParent ? pParent : mainWindowShown(),
-                          MessageType_Question,
+    return questionBinary(pParent, MessageType_Question,
                           tr("<p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p>"
                              "<p>Are you sure you want to proceed?</p>")
@@ -2335 +2316 @@
 void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename),
           formatErrorInfo(extPackManager));
@@ -2342 +2323 @@
 void UIMessageCenter::warnAboutBadExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename),
           "<!--EOM-->" + extPackFile.GetWhyUnusable());
@@ -2349 +2330 @@
 void UIMessageCenter::cannotInstallExtPack(const CExtPackFile &extPackFile, const QString &strFilename, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to install the Extension Pack <b>%1</b>.")
              .arg(strFilename),
@@ -2357 +2338 @@
 void UIMessageCenter::cannotInstallExtPack(const CProgress &progress, const QString &strFilename, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to install the Extension Pack <b>%1</b>.")
              .arg(strFilename),
@@ -2365 +2346 @@
 void UIMessageCenter::cannotUninstallExtPack(const CExtPackManager &extPackManager, const QString &strPackName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to uninstall the Extension Pack <b>%1</b>.")
              .arg(strPackName),
@@ -2373 +2354 @@
 void UIMessageCenter::cannotUninstallExtPack(const CProgress &progress, const QString &strPackName, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to uninstall the Extension Pack <b>%1</b>.")
              .arg(strPackName),
@@ -2381 +2362 @@
 void UIMessageCenter::warnAboutExtPackInstalled(const QString &strPackName, QWidget *pParent /*= 0*/) const
 {
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Info,
+    alert(pParent, MessageType_Info,
           tr("The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.")
              .arg(strPackName));
@@ -2389 +2370 @@
 void UIMessageCenter::cannotDropData(const CGuest &guest, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to drop data."),
           formatErrorInfo(guest));
@@ -2396 +2377 @@
 void UIMessageCenter::cannotDropData(const CProgress &progress, QWidget *pParent /*= 0*/) const
 {
-    error(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    error(pParent, MessageType_Error,
           tr("Failed to drop data."),
           !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
@@ -2404 +2385 @@
 void UIMessageCenter::cannotOpenLicenseFile(const QString &strPath, QWidget *pParent /*= 0*/) const
 {
-    alert(pParent ? pParent : mainWindowShown(), MessageType_Error,
+    alert(pParent, MessageType_Error,
           tr("Failed to open the license file <nobr><b>%1</b></nobr>. Check file permissions.")
              .arg(strPath));
@@ -2642 +2623 @@
     }
 
-    alert(mainMachineWindowShown(), MessageType_Info,
+    alert(mainWindowShown(), MessageType_Info,
           tr("<p>The virtual machine window is optimized to work in "
              "<b>%1&nbsp;bit</b> color mode but the "
@@ -2850 +2831 @@
 
     /* Create message-box: */
-    QWidget *pMessageBoxParent = mwManager().realParentWindow(pParent);
+    QWidget *pMessageBoxParent = mwManager().realParentWindow(pParent ? pParent : mainWindowShown());
     QPointer<QIMessageBox> pMessageBox = new QIMessageBox(title, strMessage, icon,
                                                           iButton1, iButton2, iButton3,

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

@@ -155 +155 @@
     /* API: Main window stuff: */
     QWidget* mainWindowShown() const;
-    QWidget* mainMachineWindowShown() const;
     QWidget* networkManagerOrMainWindowShown() const;
-    QWidget* networkManagerOrMainMachineWindowShown() const;
 
     /* API: Main (startup) warnings: */

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

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

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

@@ -103 +103 @@
         /* Ask the user for another location for the additions-image file: */
         QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(),
-                                                               msgCenter().networkManagerOrMainMachineWindowShown(),
+                                                               msgCenter().networkManagerOrMainWindowShown(),
                                                                tr("Select folder to save Guest Additions image to"), true);
 

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

@@ -443 +443 @@
         /* Warn the user about extension pack was downloaded and saved, propose to install it: */
         if (msgCenter().proposeInstallExtentionPack(GUI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget)))
-            UIGlobalSettingsExtension::doInstallation(strTarget, strDigest, msgCenter().mainWindowShown(), NULL);
+            UIGlobalSettingsExtension::doInstallation(strTarget, strDigest, msgCenter().networkManagerOrMainWindowShown(), NULL);
     }
 };

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

@@ -506 +506 @@
     {
         msgCenter().showModalProgressDialog(progressInstall, tr("Updating Guest Additions"), ":/progress_install_guest_additions_90px.png",
-                                            mainMachineWindow(), 500 /* 500ms delay. */);
+                                            machineLogic()->activeMachineWindow(), 500 /* 500ms delay. */);
         if (progressInstall.GetCanceled())
             return;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -609 +609 @@
             /* Show machine state saving progress: */
             CMachine machine = session.GetMachine();
-            msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_save_90px.png", this);
+            msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_save_90px.png");
             if (!progress.isOk() || progress.GetResultCode() != 0)
                 msgCenter().cannotSaveMachineState(progress, machine.GetName());
@@ -699 +699 @@
             /* Show machine power down progress: */
             CMachine machine = session.GetMachine();
-            msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png", this);
+            msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png");
             if (!progress.isOk() || progress.GetResultCode() != 0)
                 msgCenter().cannotPowerDownMachine(progress, machine.GetName());

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -607 +607 @@
     if (console.isOk())
     {
-        msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_restore_90px.png",
-                                            msgCenter().mainWindowShown(), true);
+        msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_restore_90px.png");
         if (progress.GetResultCode() != 0)
             msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName(), mMachine.GetName());
@@ -656 +655 @@
     {
         /* Show the progress dialog */
-        msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_discard_90px.png",
-                                            msgCenter().mainWindowShown(), true);
+        msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_discard_90px.png");
 
         if (progress.GetResultCode() != 0)