Changeset 98617 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 17, 2023 11:44:48 AM (2 years ago)

Author:

vboxsync

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

155909

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CConsole wrapper usage step-by-step; This one is about save state, shutdown and power off stuff.

Location:

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

Files:

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

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

@@ -661 +661 @@
 void UIMachine::saveState()
 {
-    /* Prepare VM to be saved: */
-    if (!uisession()->prepareToBeSaved())
-        return;
-
-    /* Enable 'manual-override',
-     * preventing automatic Runtime UI closing: */
-    setManualOverrideMode(true);
-
-    /* Now, do the magic: */
-    LogRel(("GUI: Saving VM state..\n"));
-    UINotificationProgressMachineSaveState *pNotification =
-        new UINotificationProgressMachineSaveState(uisession()->machine());
-    connect(pNotification, &UINotificationProgressMachineSaveState::sigMachineStateSaved,
-            this, &UIMachine::sltHandleMachineStateSaved);
-    gpNotificationCenter->append(pNotification);
+    uisession()->saveState();
 }
 
 void UIMachine::shutdown()
 {
-    /* Prepare VM to be shutdowned: */
-    if (!uisession()->prepareToBeShutdowned())
-        return;
-
-    /* Now, do the magic: */
-    LogRel(("GUI: Sending ACPI shutdown signal..\n"));
-    CConsole comConsole = uisession()->console();
-    comConsole.PowerButton();
-    if (!comConsole.isOk())
-        UINotificationMessage::cannotACPIShutdownMachine(uisession()->console());
+    uisession()->shutdown();
 }
 
 void UIMachine::powerOff(bool fIncludingDiscard)
 {
-    /* Enable 'manual-override',
-     * preventing automatic Runtime UI closing: */
-    setManualOverrideMode(true);
-
-    /* Now, do the magic: */
-    LogRel(("GUI: Powering VM off..\n"));
-    UINotificationProgressMachinePowerOff *pNotification =
-        new UINotificationProgressMachinePowerOff(uisession()->machine(),
-                                                  uisession()->console(),
-                                                  fIncludingDiscard);
-    connect(pNotification, &UINotificationProgressMachinePowerOff::sigMachinePoweredOff,
-            this, &UIMachine::sltHandleMachinePoweredOff);
-    gpNotificationCenter->append(pNotification);
+    uisession()->powerOff(fIncludingDiscard);
 }
 
@@ -1045 +1010 @@
         emit sigCursorPositionChange();
     }
-}
-
-void UIMachine::sltHandleMachineStateSaved(bool fSuccess)
-{
-    /* Let user try again if saving failed: */
-    if (!fSuccess)
-    {
-        /* Disable 'manual-override' finally: */
-        setManualOverrideMode(false);
-    }
-    /* Close Runtime UI otherwise: */
-    else
-        closeRuntimeUI();
-}
-
-void UIMachine::sltHandleMachinePoweredOff(bool fSuccess, bool fIncludingDiscard)
-{
-    /* Let user try again if power off failed: */
-    if (!fSuccess)
-    {
-        /* Disable 'manual-override' finally: */
-        setManualOverrideMode(false);
-    }
-    /* Check for other tasks otherwise: */
-    else
-    {
-        if (fIncludingDiscard)
-        {
-            /* Now, do more magic! */
-            UINotificationProgressSnapshotRestore *pNotification =
-                new UINotificationProgressSnapshotRestore(uiCommon().managedVMUuid());
-            connect(pNotification, &UINotificationProgressSnapshotRestore::sigSnapshotRestored,
-                    this, &UIMachine::sltHandleSnapshotRestored);
-            gpNotificationCenter->append(pNotification);
-        }
-        else
-            closeRuntimeUI();
-    }
-}
-
-void UIMachine::sltHandleSnapshotRestored(bool)
-{
-    /* Close Runtime UI independent of snapshot restoring state: */
-    closeRuntimeUI();
 }
 

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

@@ -613 +613 @@
     /** @} */
 
-    /** @name Close stuff.
-     ** @{ */
-        /** Handles signal about machine state saved.
-          * @param  fSuccess  Brings whether state was saved successfully. */
-        void sltHandleMachineStateSaved(bool fSuccess);
-        /** Handles signal about machine powered off.
-          * @param  fSuccess           Brings whether machine was powered off successfully.
-          * @param  fIncludingDiscard  Brings whether machine state should be discarded. */
-        void sltHandleMachinePoweredOff(bool fSuccess, bool fIncludingDiscard);
-        /** Handles signal about snapshot restored.
-          * @param  fSuccess  Brings whether machine was powered off successfully. */
-        void sltHandleSnapshotRestored(bool fSuccess);
-    /** @} */
-
 private:
 

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

@@ -804 +804 @@
 }
 
-bool UISession::prepareToBeSaved()
-{
-    return    isPaused()
-           || (isRunning() && pause());
-}
-
-bool UISession::prepareToBeShutdowned()
-{
+void UISession::saveState()
+{
+    if (   isPaused()
+        || (isRunning() && pause()))
+    {
+        /* Enable 'manual-override',
+         * preventing automatic Runtime UI closing: */
+        uimachine()->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);
+    }
+}
+
+void UISession::shutdown()
+{
+    /* Check whether guest is in proper mode: */
     bool fValidMode = false;
     acquireWhetherGuestEnteredACPIMode(fValidMode);
     if (!fValidMode)
         UINotificationMessage::cannotSendACPIToMachine();
-    return fValidMode;
+    else
+    {
+        /* Now, do the magic: */
+        LogRel(("GUI: Sending ACPI shutdown signal..\n"));
+        CConsole comConsole = console();
+        comConsole.PowerButton();
+        if (!comConsole.isOk())
+            UINotificationMessage::cannotACPIShutdownMachine(comConsole);
+    }
+}
+
+void UISession::powerOff(bool fIncludingDiscard)
+{
+    /* Enable 'manual-override',
+     * preventing automatic Runtime UI closing: */
+    uimachine()->setManualOverrideMode(true);
+
+    /* Now, do the magic: */
+    LogRel(("GUI: Powering VM off..\n"));
+    UINotificationProgressMachinePowerOff *pNotification =
+        new UINotificationProgressMachinePowerOff(machine(),
+                                                  console(),
+                                                  fIncludingDiscard);
+    connect(pNotification, &UINotificationProgressMachinePowerOff::sigMachinePoweredOff,
+            this, &UISession::sltHandleMachinePoweredOff);
+    gpNotificationCenter->append(pNotification);
 }
 
@@ -889 +928 @@
     /* Notify listeners about GA state change event came: */
     emit sigAdditionsStateChange();
+}
+
+void UISession::sltHandleMachineStateSaved(bool fSuccess)
+{
+    /* Let user try again if saving failed: */
+    if (!fSuccess)
+    {
+        /* Disable 'manual-override' finally: */
+        uimachine()->setManualOverrideMode(false);
+    }
+    /* Close Runtime UI otherwise: */
+    else
+        uimachine()->closeRuntimeUI();
+}
+
+void UISession::sltHandleMachinePoweredOff(bool fSuccess, bool fIncludingDiscard)
+{
+    /* Let user try again if power off failed: */
+    if (!fSuccess)
+    {
+        /* Disable 'manual-override' finally: */
+        uimachine()->setManualOverrideMode(false);
+    }
+    /* Check for other tasks otherwise: */
+    else
+    {
+        if (fIncludingDiscard)
+        {
+            /* Now, do more magic! */
+            UINotificationProgressSnapshotRestore *pNotification =
+                new UINotificationProgressSnapshotRestore(uiCommon().managedVMUuid());
+            connect(pNotification, &UINotificationProgressSnapshotRestore::sigSnapshotRestored,
+                    this, &UISession::sltHandleSnapshotRestored);
+            gpNotificationCenter->append(pNotification);
+        }
+        else
+            uimachine()->closeRuntimeUI();
+    }
+}
+
+void UISession::sltHandleSnapshotRestored(bool)
+{
+    /* Close Runtime UI independent of snapshot restoring state: */
+    uimachine()->closeRuntimeUI();
 }
 

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

@@ -395 +395 @@
         bool acquireWhetherGuestEnteredACPIMode(bool &fEntered);
 
-        /** Prepares VM to be saved. */
-        bool prepareToBeSaved();
-        /** Returns whether VM can be shutdowned. */
-        bool prepareToBeShutdowned();
+        /** Saves VM state, then closes Runtime UI. */
+        void saveState();
+        /** Calls for guest shutdown to close Runtime UI. */
+        void shutdown();
+        /** Powers VM off, then closes Runtime UI. */
+        void powerOff(bool fIncludingDiscard);
     /** @} */
 
@@ -431 +433 @@
         /** Handles event about guest additions change. */
         void sltAdditionsChange();
+    /** @} */
+
+    /** @name Close stuff.
+     ** @{ */
+        /** Handles signal about machine state saved.
+          * @param  fSuccess  Brings whether state was saved successfully. */
+        void sltHandleMachineStateSaved(bool fSuccess);
+        /** Handles signal about machine powered off.
+          * @param  fSuccess           Brings whether machine was powered off successfully.
+          * @param  fIncludingDiscard  Brings whether machine state should be discarded. */
+        void sltHandleMachinePoweredOff(bool fSuccess, bool fIncludingDiscard);
+        /** Handles signal about snapshot restored.
+          * @param  fSuccess  Brings whether machine was powered off successfully. */
+        void sltHandleSnapshotRestored(bool fSuccess);
     /** @} */