Changeset 90888 in vbox for trunk/src

Timestamp:

Aug 25, 2021 4:33:13 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Runtime UI: Rework r146491 by moving save VM stuff to the place where it belongs (UISession).

Location:

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

Files:

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

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

@@ -400 +400 @@
     if (fSuccess)
         uisession()->closeRuntimeUI();
-}
-
-void UIMachineLogic::saveState()
-{
-    /* Do we save state? */
-    bool fSaveState = true;
-
-    /* If VM is not paused, we should pause it first: */
-    if (!uisession()->isPaused())
-        fSaveState = uisession()->pause();
-
-    /* Saving state: */
-    if (fSaveState)
-    {
-        /* Enable 'manual-override',
-         * preventing automatic Runtime UI closing: */
-        uisession()->setManualOverrideMode(true);
-
-        /* Saving VM state: */
-        LogRel(("GUI: Passing request to save VM state from machine-logic to UI session.\n"));
-        UINotificationProgressMachineSaveState *pNotification = new UINotificationProgressMachineSaveState(machine());
-        connect(pNotification, &UINotificationProgressMachineSaveState::sigMachineStateSaved,
-                this, &UIMachineLogic::sltHandleMachineStateSaved);
-        gpNotificationCenter->append(pNotification);
-    }
 }
 
@@ -1909 +1884 @@
 
     LogRel(("GUI: User requested to save VM state.\n"));
-    saveState();
-}
-
-void UIMachineLogic::sltHandleMachineStateSaved(bool fSuccess)
-{
-    /* Disable 'manual-override' finally: */
-    uisession()->setManualOverrideMode(false);
-
-    /* Close Runtime UI if state was saved: */
-    if (fSuccess)
-        uisession()->closeRuntimeUI();
+    uisession()->saveState();
 }
 

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

@@ -145 +145 @@
     /** Detach and close Runtime UI. */
     void detach();
-    /** Save VM state, then close Runtime UI. */
-    void saveState();
     /** Call for guest shutdown to close Runtime UI. */
     void shutdown();
@@ -285 +283 @@
     void sltDetach();
     void sltSaveState();
-    /** Handles machine state saved. */
-    void sltHandleMachineStateSaved(bool fSuccess);
     void sltShutdown();
     void sltPowerOff();

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

@@ -455 +455 @@
             /* Save VM state: */
             LogRel(("GUI: Request for close-action to save VM state.\n"));
-            machineLogic()->saveState();
+            uisession()->saveState();
             break;
         }

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

@@ -326 +326 @@
 }
 
+void UISession::saveState()
+{
+    /* Saving state? */
+    bool fSaveState = true;
+
+    /* If VM is not paused, we should pause it first: */
+    if (!isPaused())
+        fSaveState = pause();
+
+    /* Save state: */
+    if (fSaveState)
+    {
+        /* Enable 'manual-override',
+         * preventing automatic Runtime UI closing: */
+        setManualOverrideMode(true);
+
+        /* Now, do the magic: */
+        LogRel(("GUI: Saving VM state..\n"));
+        UINotificationProgressMachineSaveState *pNotification = new UINotificationProgressMachineSaveState(machine());
+        connect(pNotification, &UINotificationProgressMachineSaveState::sigMachineStateSaved,
+                this, &UISession::sltHandleMachineStateSaved);
+        gpNotificationCenter->append(pNotification);
+    }
+}
+
 bool UISession::shutdown()
 {
@@ -802 +827 @@
     /* Notify current machine-logic: */
     emit sigHostScreenAvailableAreaChange();
+}
+
+void UISession::sltHandleMachineStateSaved(bool fSuccess)
+{
+    /* Disable 'manual-override' finally: */
+    setManualOverrideMode(false);
+
+    /* Close Runtime UI if state was saved: */
+    if (fSuccess)
+        closeRuntimeUI();
 }
 

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

@@ -75 +75 @@
     /* API: Runtime UI stuff: */
     bool initialize();
+    /** Powers VM up. */
     bool powerUp();
+    /** Detaches and closes Runtime UI. */
     bool detach();
+    /** Saves VM state, then closes Runtime UI. */
+    void saveState();
+    /** Calls for guest shutdown to close Runtime UI. */
     bool shutdown();
+    /** Powers VM down, then closes Runtime UI. */
     bool powerOff(bool fIncludingDiscard, bool &fServerCrashed);
 
@@ -394 +400 @@
     void sltHandleHostScreenAvailableAreaChange();
 
+    /** Handles signal about machine state saved.
+      * @param  fSuccess  Brings whether state was saved successfully. */
+    void sltHandleMachineStateSaved(bool fSuccess);
+
 private: