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

Timestamp:

Oct 17, 2008 1:01:44 PM (16 years ago)

Author:

vboxsync

Message:

Main, FE/Qt: Added IProgress::PowerDownAsync() (#3242).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -170 +170 @@
     void cannotTakeSnapshot (const CProgress &progress);
     void cannotStopMachine (const CConsole &console);
+    void cannotStopMachine (const CProgress &progress);
     void cannotDeleteMachine (const CVirtualBox &vbox, const CMachine &machine);
     void cannotDiscardSavedState (const CConsole &console);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1302 +1302 @@
                 if (dlg.rbPowerOff->isChecked())
                 {
-                    cconsole.PowerDown();
-                    if (!cconsole.isOk())
+                    CProgress progress = cconsole.PowerDownAsync();
+
+                    if (cconsole.isOk())
                     {
-                        /// @todo (dmik) add an option to close the GUI anyway
-                        //  and handle it
-                        vboxProblem().cannotStopMachine (cconsole);
+                        /* show the power down progress dialog */
+                        vboxProblem()
+                            .showModalProgressDialog (progress, cmachine.GetName(),
+                                                      this, 0);
+                        if (progress.GetResultCode() != 0)
+                            vboxProblem().cannotStopMachine (progress);
+                        else
+                            success = true;
                     }
                     else
+                        vboxProblem().cannotStopMachine (cconsole);
+
+                    if (success)
                     {
-                        /*
-                         *  set success to true even if we fail to discard the
-                         *  current state later -- the console window will be
-                         *  closed anyway
-                         */
-                        success = true;
+                        /* Note: leave success = true even if we fail to
+                         * discard the current state later -- the console window
+                         * will closed anyway */
 
                         /* discard the current state if requested */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -811 +811 @@
 }
 
+void VBoxProblemReporter::cannotStopMachine (const CProgress &progress)
+{
+    AssertWrapperOk (progress);
+    CConsole console = CProgress (progress).GetInitiator();
+    AssertWrapperOk (console);
+
+    message (mainWindowShown(), Error,
+        tr ("Failed to stop the virtual machine <b>%1</b>.")
+            .arg (console.GetMachine().GetName()),
+        formatErrorInfo (progress.GetErrorInfo()));
+}
+
 void VBoxProblemReporter::cannotDeleteMachine (const CVirtualBox &vbox,
                                                const CMachine &machine)