Changeset 45282 in vbox for trunk/src

Timestamp:

Apr 2, 2013 11:29:53 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center cleanup (part 16): Make sure VM selector actions confirmation dialogs have valid parents.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (5 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -588 +588 @@
     message(mainWindowShown(),
             MessageType_Error,
-            tr("Failed to remove the virtual machine <b>%1</b>.").arg(machine.GetName()),
+            tr("Failed to remove the virtual machine <b>%1</b>.")
+               .arg(machine.GetName()),
             !machine.isOk() ? formatErrorInfo(machine) : formatErrorInfo(res));
 }
@@ -596 +597 @@
     message(mainWindowShown(),
             MessageType_Error,
-            tr("Failed to remove the virtual machine <b>%1</b>.").arg(machine.GetName()),
+            tr("Failed to remove the virtual machine <b>%1</b>.")
+               .arg(machine.GetName()),
             formatErrorInfo(progress.GetErrorInfo()));
+}
+
+bool UIMessageCenter::remindAboutInaccessibleMedia()
+{
+    return messageOkCancel(mainWindowShown(), MessageType_Warning,
+                           tr("<p>One or more virtual hard disks, CD/DVD or "
+                              "floppy media are not currently accessible. As a result, you will "
+                              "not be able to operate virtual machines that use these media until "
+                              "they become accessible later.</p>"
+                              "<p>Press <b>Check</b> to open the Virtual Media Manager window and "
+                              "see what media are inaccessible, or press <b>Ignore</b> to "
+                              "ignore this message.</p>"),
+                           "remindAboutInaccessibleMedia",
+                           tr("Check", "inaccessible media message box"));
 }
 
@@ -612 +628 @@
 }
 
+bool UIMessageCenter::confirmVMReset(const QString &strNames)
+{
+    return messageOkCancel(mainWindowShown(), 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 "
+                              "in applications running inside it to be lost.</p>")
+                              .arg(strNames),
+                           "confirmVMReset" /* pcszAutoConfirmId */,
+                           tr("Reset", "machine"));
+}
+
+bool UIMessageCenter::confirmVMACPIShutdown(const QString &strNames)
+{
+    return messageOkCancel(mainWindowShown(), 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>")
+                              .arg(strNames),
+                           "confirmVMACPIShutdown" /* pcszAutoConfirmId */,
+                           tr("ACPI Shutdown", "machine"));
+}
+
+bool UIMessageCenter::confirmVMPowerOff(const QString &strNames)
+{
+    return messageOkCancel(mainWindowShown(), 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 "
+                              "running inside it to be lost.</p>")
+                              .arg(strNames),
+                           "confirmVMPowerOff" /* pcszAutoConfirmId */,
+                           tr("Power Off", "machine"));
+}
+
 void UIMessageCenter::cannotDiscardSavedState(const CConsole &console)
 {
@@ -618 +666 @@
     /* Show the message: */
     message(mainWindowShown(), MessageType_Error,
-            tr("Failed to discard the saved state of the virtual machine <b>%1</b>.").arg(console.GetMachine().GetName()),
+            tr("Failed to discard the saved state of the virtual machine <b>%1</b>.")
+               .arg(console.GetMachine().GetName()),
             formatErrorInfo(res));
 }
 
-bool UIMessageCenter::remindAboutInaccessibleMedia()
-{
-    int rc = message(&vboxGlobal().selectorWnd(), MessageType_Warning,
-        tr("<p>One or more virtual hard disks, CD/DVD or "
-           "floppy media are not currently accessible. As a result, you will "
-           "not be able to operate virtual machines that use these media until "
-           "they become accessible later.</p>"
-           "<p>Press <b>Check</b> to open the Virtual Media Manager window and "
-           "see what media are inaccessible, or press <b>Ignore</b> to "
-           "ignore this message.</p>"),
-        "remindAboutInaccessibleMedia",
-        QIMessageBox::Ok | QIMessageBox::Default,
-        QIMessageBox::Ignore | QIMessageBox::Escape,
-        0,
-        tr("Check", "inaccessible media message box"));
-
-    return rc == QIMessageBox::Ok; /* implies !AutoConfirmed */
-}
-
-bool UIMessageCenter::confirmVMReset(const QString &strNames)
-{
-    return messageOkCancel(mainMachineWindowShown(), 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 "
-           "in applications running inside it to be lost.</p>")
-           .arg(strNames),
-        "confirmVMReset" /* pcszAutoConfirmId */,
-        tr("Reset", "machine"));
-}
-
-bool UIMessageCenter::confirmVMACPIShutdown(const QString &strNames)
-{
-    return messageOkCancel(mainMachineWindowShown(), 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>")
-           .arg(strNames),
-        "confirmVMACPIShutdown" /* pcszAutoConfirmId */,
-        tr("ACPI Shutdown", "machine"));
-}
-
-bool UIMessageCenter::confirmVMPowerOff(const QString &strNames)
-{
-    return messageOkCancel(mainMachineWindowShown(), 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 "
-           "running inside it to be lost.</p>")
-           .arg(strNames),
-        "confirmVMPowerOff" /* pcszAutoConfirmId */,
-        tr("Power Off", "machine"));
+void UIMessageCenter::cannotStopMachine(const CConsole &console)
+{
+    /* Preserve error-info: */
+    COMResult res(console);
+    /* Show the message: */
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to stop the virtual machine <b>%1</b>.")
+               .arg(console.GetMachine().GetName()),
+            formatErrorInfo(res));
 }
 
@@ -1671 +1680 @@
         formatErrorInfo(progress.GetErrorInfo())
     );
-}
-
-void UIMessageCenter::cannotStopMachine(const CConsole &console)
-{
-    /* preserve the current error info before calling the object again */
-    COMResult res(console);
-
-    message(mainWindowShown(), MessageType_Error,
-        tr("Failed to stop the virtual machine <b>%1</b>.")
-            .arg(console.GetMachine().GetName()),
-        formatErrorInfo(res));
 }
 

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

@@ -219 +219 @@
     void cannotRemoveMachine(const CMachine &machine);
     void cannotRemoveMachine(const CMachine &machine, const CProgress &progress);
+    bool remindAboutInaccessibleMedia();
     bool confirmDiscardSavedState(const QString &strNames);
-    void cannotDiscardSavedState(const CConsole &console);
-    bool remindAboutInaccessibleMedia();
     bool confirmVMReset(const QString &strNames);
     bool confirmVMACPIShutdown(const QString &strNames);
     bool confirmVMPowerOff(const QString &strNames);
+    void cannotDiscardSavedState(const CConsole &console);
+    void cannotStopMachine(const CConsole &console);
 
     /* API: Snapshot warnings: */
@@ -309 +310 @@
     void cannotTakeSnapshot(const CConsole &console);
     void cannotTakeSnapshot(const CProgress &progress);
-    void cannotStopMachine(const CConsole &console);
     void cannotStopMachine(const CProgress &progress);
     void cannotSendACPIToMachine();

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

@@ -692 +692 @@
         /* Power Off: */
         console.PowerDown();
+        if (!console.isOk())
+            msgCenter().cannotStopMachine(console);
 
         /* Unlock machine finally: */