Changeset 90922 in vbox

Timestamp:

Aug 26, 2021 4:17:20 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -977 +977 @@
 
 UINotificationProgressMachinePowerOff::UINotificationProgressMachinePowerOff(const CMachine &comMachine,
-                                                                             const CConsole &comConsole /* = CConsole() */)
+                                                                             const CConsole &comConsole /* = CConsole() */,
+                                                                             bool fIncludingDiscard /* = false */)
     : m_comMachine(comMachine)
     , m_comConsole(comConsole)
+    , m_fIncludingDiscard(fIncludingDiscard)
 {
     connect(this, &UINotificationProgress::sigProgressFinished,
@@ -1082 +1084 @@
     if (m_comSession.isNotNull())
         m_comSession.UnlockMachine();
+
+    /* Notifies listeners: */
+    emit sigMachinePoweredOff(error().isEmpty(), m_fIncludingDiscard);
 }
 

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

@@ -564 +564 @@
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about machine powered off.
+      * @param  fSuccess           Brings whether power off sequence successfully.
+      * @param  fIncludingDiscard  Brings whether machine state should be discarded. */
+    void sigMachinePoweredOff(bool fSuccess, bool fIncludingDiscard);
+
 public:
 
@@ -571 +578 @@
       * @param  fIncludingDiscard  Brings whether machine state should be discarded. */
     UINotificationProgressMachinePowerOff(const CMachine &comMachine,
-                                          const CConsole &comConsole = CConsole());
+                                          const CConsole &comConsole = CConsole(),
+                                          bool fIncludingDiscard = false);
 
 protected:
@@ -593 +601 @@
     /** Holds the console of machine being powered off. */
     CConsole  m_comConsole;
+    /** Holds whether machine state should be discarded. */
+    bool      m_fIncludingDiscard;
     /** Holds the session being opened. */
     CSession  m_comSession;

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

@@ -371 +371 @@
 void UISession::powerOff(bool fIncludingDiscard)
 {
-    /* Prepare result: */
-    bool fSuccess = false;
-
     /* Enable 'manual-override',
      * preventing automatic Runtime UI closing: */
     setManualOverrideMode(true);
 
-    /* Prepare the power-off progress: */
+    /* Now, do the magic: */
     LogRel(("GUI: Powering VM off..\n"));
-    CProgress comProgress = console().PowerDown();
-    if (!console().isOk())
-    {
-        /* Check the console state, it might be already gone: */
-        if (!console().isNull())
-        {
-            /* This can happen if VBoxSVC is not running: */
-            COMResult res(console());
-            if (FAILED_DEAD_INTERFACE(res.rc()))
-               fSuccess = true;
-        }
-
-        if (!fSuccess)
-            msgCenter().cannotPowerOffMachine(console());
-    }
-    else
-    {
-        /* Show the power-off progress: */
-        msgCenter().showModalProgressDialog(comProgress, machineName(), ":/progress_poweroff_90px.png");
-        if (comProgress.isOk() && comProgress.GetResultCode() == 0)
-        {
-            fSuccess = true;
-
-            /* Discard the current state if requested: */
-            if (fIncludingDiscard)
-                uiCommon().restoreCurrentSnapshot(uiCommon().managedVMUuid());
-        }
-        else
-            msgCenter().cannotPowerOffMachine(comProgress, machineName());
-    }
-
-    /* Disable 'manual-override' finally: */
-    setManualOverrideMode(false);
-
-    /* Manually close Runtime UI: */
-    if (fSuccess)
-        closeRuntimeUI();
+    UINotificationProgressMachinePowerOff *pNotification =
+        new UINotificationProgressMachinePowerOff(machine(), console(), fIncludingDiscard);
+    connect(pNotification, &UINotificationProgressMachinePowerOff::sigMachinePoweredOff,
+            this, &UISession::sltHandleMachinePoweredOff);
+    gpNotificationCenter->append(pNotification);
 }
 
@@ -850 +815 @@
     if (fSuccess)
         closeRuntimeUI();
+}
+
+void UISession::sltHandleMachinePoweredOff(bool fSuccess, bool fIncludingDiscard)
+{
+    /* Disable 'manual-override' finally: */
+    setManualOverrideMode(false);
+
+    /* Do we have other tasks? */
+    if (fSuccess)
+    {
+        if (fIncludingDiscard)
+            uiCommon().restoreCurrentSnapshot(uiCommon().managedVMUuid());
+        closeRuntimeUI();
+    }
 }
 

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

@@ -403 +403 @@
       * @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);
 
 private: