Changeset 45213 in vbox

Timestamp:

Mar 27, 2013 4:47:45 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84578

Message:

FE/Qt: Runtime UI: Close-event rework/cleanup (part 2).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

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

@@ -312 +312 @@
         delete pCloseDlg;
 
-        /* Was dialog accepted? */
+        /* Was the dialog accepted? */
         if (dialogResult != UIVMCloseDialog::ResultCode_Cancel)
         {
-            /* Process decision: */
-            CConsole console = session().GetConsole();
             switch (dialogResult)
             {
                 case UIVMCloseDialog::ResultCode_Save:
                 {
-                    /* Prepare the saving progress: */
-                    CProgress progress = console.SaveState();
-                    fSuccess = console.isOk();
-                    if (fSuccess)
-                    {
-                        /* Show the saving progress dialog: */
-                        msgCenter().showModalProgressDialog(progress, machineCopy.GetName(), ":/progress_state_save_90px.png", this);
-                        fSuccess = progress.GetResultCode() == 0;
-                        if (fSuccess)
-                            fShutdownSession = true;
-                        else
-                            msgCenter().cannotSaveMachineState(progress);
-                    }
-                    else
-                        msgCenter().cannotSaveMachineState(console);
+                    fSuccess = uisession()->saveState();
+                    fShutdownSession = fSuccess;
                     break;
                 }
                 case UIVMCloseDialog::ResultCode_Shutdown:
                 {
-                    /* Unpause VM to let it grab the ACPI shutdown event: */
-                    fSuccess = uisession()->unpause();
+                    fSuccess = uisession()->shutDown();
                     if (fSuccess)
-                    {
-                        /* Prevent subsequent unpause request: */
                         fWasPaused = true;
-                        /* Signal ACPI shutdown (if there is no ACPI device, the operation will fail): */
-                        console.PowerButton();
-                        fSuccess = console.isOk();
-                        if (!fSuccess)
-                            msgCenter().cannotACPIShutdownMachine(console);
-                    }
                     break;
                 }
@@ -357 +333 @@
                 case UIVMCloseDialog::ResultCode_PowerOff_With_Discarding:
                 {
-                    /* Prepare the power down progress: */
-                    CProgress progress = console.PowerDown();
-                    fSuccess = console.isOk();
-                    if (fSuccess)
-                    {
-                        /* Show the power down progress: */
-                        msgCenter().showModalProgressDialog(progress, machineCopy.GetName(), ":/progress_poweroff_90px.png", this);
-                        fSuccess = progress.GetResultCode() == 0;
-                        if (fSuccess)
-                        {
-                            /* Discard the current state if requested: */
-                            if (dialogResult == UIVMCloseDialog::ResultCode_PowerOff_With_Discarding)
-                            {
-                                /* Prepare the snapshot discard progress: */
-                                CSnapshot snapshot = machineCopy.GetCurrentSnapshot();
-                                CProgress progress = console.RestoreSnapshot(snapshot);
-                                fSuccess = console.isOk();
-                                if (fSuccess)
-                                {
-                                    /* Show the snapshot discard progress: */
-                                    msgCenter().showModalProgressDialog(progress, machineCopy.GetName(), ":/progress_snapshot_discard_90px.png", this);
-                                    fSuccess = progress.GetResultCode() == 0;
-                                    if (!fSuccess)
-                                        msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName());
-                                }
-                                else
-                                    msgCenter().cannotRestoreSnapshot(console, snapshot.GetName());
-                            }
-                            if (fSuccess)
-                                fShutdownSession = true;
-                        }
-                        else
-                            msgCenter().cannotStopMachine(progress);
-                    }
-                    else
-                    {
-                        /* This can happen if VBoxSVC is not running: */
-                        COMResult res(console);
-                        if (FAILED_DEAD_INTERFACE(res.rc()))
-                            fShutdownSession = true;
-                        else
-                            msgCenter().cannotStopMachine(console);
-                    }
+                    bool fServerCrashed = false;
+                    fSuccess = uisession()->powerOff(dialogResult == UIVMCloseDialog::ResultCode_PowerOff_With_Discarding,
+                                                     fServerCrashed);
+                    fShutdownSession = fSuccess || fServerCrashed;
                     break;
                 }

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

@@ -68 +68 @@
 #include "CVRDEServer.h"
 #include "CUSBController.h"
+#include "CSnapshot.h"
 
 UISession::UISession(UIMachine *pMachine, CSession &sessionReference)
@@ -313 +314 @@
 }
 
+bool UISession::saveState()
+{
+    /* Prepare the saving progress: */
+    CMachine machine = m_session.GetMachine();
+    CConsole console = m_session.GetConsole();
+    CProgress progress = console.SaveState();
+    if (console.isOk())
+    {
+        /* Show the saving progress: */
+        msgCenter().showModalProgressDialog(progress, machine.GetName(),
+                                            ":/progress_state_save_90px.png",
+                                            machineLogic()->activeMachineWindow());
+        if (progress.GetResultCode() != 0)
+        {
+            /* Failed in progress: */
+            msgCenter().cannotSaveMachineState(progress);
+            return false;
+        }
+    }
+    else
+    {
+        /* Failed in console: */
+        msgCenter().cannotSaveMachineState(console);
+        return false;
+    }
+    /* Passed: */
+    return true;
+}
+
+bool UISession::shutDown()
+{
+    /* Resume VM to let it grab the ACPI shutdown signal: */
+    if (!unpause())
+    {
+        /* Failed in console: */
+        return false;
+    }
+    /* Send ACPI shutdown signal if possible: */
+    CConsole console = m_session.GetConsole();
+    console.PowerButton();
+    if (!console.isOk())
+    {
+        /* Failed in console: */
+        msgCenter().cannotACPIShutdownMachine(console);
+        return false;
+    }
+    /* Passed: */
+    return true;
+}
+
+bool UISession::powerOff(bool fIncludingDiscard, bool &fServerCrashed)
+{
+    /* Prepare the power-off progress: */
+    CMachine machine = m_session.GetMachine();
+    CConsole console = m_session.GetConsole();
+    CProgress progress = console.PowerDown();
+    if (console.isOk())
+    {
+        /* Show the power-off progress: */
+        msgCenter().showModalProgressDialog(progress, machine.GetName(),
+                                            ":/progress_poweroff_90px.png",
+                                            machineLogic()->activeMachineWindow());
+        if (progress.GetResultCode() == 0)
+        {
+            /* Discard the current state if requested: */
+            if (fIncludingDiscard)
+            {
+                /* Prepare the snapshot-discard progress: */
+                CSnapshot snapshot = machine.GetCurrentSnapshot();
+                CProgress progress = console.RestoreSnapshot(snapshot);
+                if (console.isOk())
+                {
+                    /* Show the snapshot-discard progress: */
+                    msgCenter().showModalProgressDialog(progress, machine.GetName(),
+                                                        ":/progress_snapshot_discard_90px.png",
+                                                        machineLogic()->activeMachineWindow());
+                    if (progress.GetResultCode() != 0)
+                    {
+                        /* Failed in progress: */
+                        msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName());
+                        return false;
+                    }
+                }
+                else
+                {
+                    /* Failed in console: */
+                    msgCenter().cannotRestoreSnapshot(console, snapshot.GetName());
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            /* Failed in progress: */
+            msgCenter().cannotStopMachine(progress);
+            return false;
+        }
+    }
+    else
+    {
+        /* Failed in console: */
+        COMResult res(console);
+        /* This can happen if VBoxSVC is not running: */
+        if (FAILED_DEAD_INTERFACE(res.rc()))
+            fServerCrashed = true;
+        else
+            msgCenter().cannotStopMachine(console);
+        return false;
+    }
+    /* Passed: */
+    return true;
+}
+
 UIMachineLogic* UISession::machineLogic() const
 {

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

@@ -89 +89 @@
     /* Common members: */
     void powerUp();
+    bool saveState();
+    bool shutDown();
+    bool powerOff(bool fIncludingDiscard, bool &fServerCrashed);
 
     /* Common getters: */