Changeset 90856 in vbox

Timestamp:

Aug 24, 2021 6:08:54 PM (4 years ago)

Author:

vboxsync

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

146491

Message:

FE/Qt: bugref:10067: Notification signature for virtual machine save-state progress (in Runtime UI) which should now go to center instead of modal dialogs, s.a. r145993.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -966 +966 @@
     if (m_comSession.isNotNull())
         m_comSession.UnlockMachine();
+
+    /* Notifies listeners: */
+    emit sigMachineStateSaved(error().isEmpty());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -523 +523 @@
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about machine state saved.
+      * @param  fSuccess  Brings whether state was saved successfully. */
+    void sigMachineStateSaved(bool fSuccess);
+
 public:
 

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

@@ -404 +404 @@
 void UIMachineLogic::saveState()
 {
-    /* Enable 'manual-override',
-     * preventing automatic Runtime UI closing: */
-    setManualOverrideMode(true);
-
-    /* Was the step successful? */
-    bool fSuccess = true;
-    /* If VM is not paused, we should pause it: */
-    bool fWasPaused = uisession()->isPaused();
-    if (fSuccess && !fWasPaused)
-        fSuccess = uisession()->pause();
-    /* Save-state: */
-    if (fSuccess)
-    {
+    /* 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: */
+        setManualOverrideMode(true);
+
+        /* Saving VM state: */
         LogRel(("GUI: Passing request to save VM state from machine-logic to UI session.\n"));
-        fSuccess = uisession()->saveState();
-    }
-
-    /* Disable 'manual-override' finally: */
-    setManualOverrideMode(false);
-
-    /* Manually close Runtime UI: */
-    if (fSuccess)
-        closeRuntimeUI();
+        UINotificationProgressMachineSaveState *pNotification = new UINotificationProgressMachineSaveState(machine());
+        connect(pNotification, &UINotificationProgressMachineSaveState::sigMachineStateSaved,
+                this, &UIMachineLogic::sltHandleMachineStateSaved);
+        gpNotificationCenter->append(pNotification);
+    }
 }
 
@@ -1943 +1941 @@
 }
 
+void UIMachineLogic::sltHandleMachineStateSaved(bool fSuccess)
+{
+    /* Disable 'manual-override' finally: */
+    setManualOverrideMode(false);
+
+    /* Close Runtime UI if state was saved: */
+    if (fSuccess)
+        closeRuntimeUI();
+}
+
 void UIMachineLogic::sltShutdown()
 {

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

@@ -294 +294 @@
     void sltDetach();
     void sltSaveState();
+    /** Handles machine state saved. */
+    void sltHandleMachineStateSaved(bool fSuccess);
     void sltShutdown();
     void sltPowerOff();

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

@@ -325 +325 @@
 {
     /* Nothing here for now: */
-    return true;
-}
-
-bool UISession::saveState()
-{
-    /* Prepare the saving progress: */
-    CProgress progress = machine().SaveState();
-    if (machine().isOk())
-    {
-        /* Show the saving progress: */
-        msgCenter().showModalProgressDialog(progress, machineName(), ":/progress_state_save_90px.png");
-        if (!progress.isOk() || progress.GetResultCode() != 0)
-        {
-            /* Failed in progress: */
-            msgCenter().cannotSaveMachineState(progress, machineName());
-            return false;
-        }
-    }
-    else
-    {
-        /* Failed in console: */
-        msgCenter().cannotSaveMachineState(machine());
-        return false;
-    }
-    /* Passed: */
     return true;
 }

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

@@ -77 +77 @@
     bool powerUp();
     bool detach();
-    bool saveState();
     bool shutdown();
     bool powerOff(bool fIncludingDiscard, bool &fServerCrashed);