Changeset 90405 in vbox

Timestamp:

Jul 29, 2021 1:02:54 PM (4 years ago)

Author:

vboxsync

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

145993

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1707 +1707 @@
             continue;
 
-        /* Open a session to modify VM state: */
-        CSession comSession = uiCommon().openExistingSession(pItem->id());
-        if (comSession.isNull())
-            return;
-
-        /* Get session console: */
-        CConsole comConsole = comSession.GetConsole();
-        /* Get session machine: */
-        CMachine comMachine = comSession.GetMachine();
-
-        /* Get local machine item state: */
-        UIVirtualMachineItemLocal *pLocalItem = pItem->toLocal();
-        AssertPtrReturnVoid(pLocalItem);
-        const KMachineState enmState = pLocalItem->machineState();
-
-        /* Pause VM first if necessary: */
-        if (enmState != KMachineState_Paused)
-            comConsole.Pause();
-        if (comConsole.isOk())
-        {
-            /* Prepare machine state saving progress: */
-            CProgress comProgress = comMachine.SaveState();
-            if (comMachine.isOk())
-            {
-                /* Show machine state saving progress: */
-                msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_state_save_90px.png");
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotSaveMachineState(comProgress, comMachine.GetName());
-            }
-            else
-                msgCenter().cannotSaveMachineState(comMachine);
-        }
-        else
-            msgCenter().cannotPauseMachine(comConsole);
-
-        /* Unlock machine finally: */
-        comSession.UnlockMachine();
+        /* Saving VM state: */
+        UINotificationProgressMachineSaveState *pNotification = new UINotificationProgressMachineSaveState(pItem->id());
+        notificationCenter().append(pNotification);
     }
 }

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

@@ -24 +24 @@
 #include "UINotificationObjects.h"
 
+/* COM includes: */
+#include "CConsole.h"
+
 
 /*********************************************************************************************************************************
@@ -295 +298 @@
 
 void UINotificationProgressMachineMove::sltHandleProgressFinished()
+{
+    /* Unlock session finally: */
+    m_comSession.UnlockMachine();
+}
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressMachineSaveState implementation.                                                                 *
+*********************************************************************************************************************************/
+
+UINotificationProgressMachineSaveState::UINotificationProgressMachineSaveState(const QUuid &uId)
+    : m_uId(uId)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressMachineSaveState::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressMachineSaveState::name() const
+{
+    return UINotificationProgress::tr("Saving VM state ...");
+}
+
+QString UINotificationProgressMachineSaveState::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressMachineSaveState::createProgress(COMResult &comResult)
+{
+    /* Open a session thru which we will modify the machine: */
+    m_comSession = uiCommon().openExistingSession(m_uId);
+    if (m_comSession.isNull())
+        return CProgress();
+
+    /* Get session machine: */
+    CMachine comMachine = m_comSession.GetMachine();
+    if (!m_comSession.isOk())
+    {
+        comResult = m_comSession;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
+    /* Acquire VM name: */
+    m_strName = comMachine.GetName();
+    if (!comMachine.isOk())
+    {
+        comResult = comMachine;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
+    /* Get machine state: */
+    const KMachineState enmState = comMachine.GetState();
+    if (!comMachine.isOk())
+    {
+        comResult = comMachine;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
+    /* If VM isn't yet paused: */
+    if (enmState != KMachineState_Paused)
+    {
+        /* Get session console: */
+        CConsole comConsole = m_comSession.GetConsole();
+        if (!m_comSession.isOk())
+        {
+            comResult = m_comSession;
+            m_comSession.UnlockMachine();
+            return CProgress();
+        }
+
+        /* Pause VM first: */
+        comConsole.Pause();
+        if (!comConsole.isOk())
+        {
+            comResult = comConsole;
+            m_comSession.UnlockMachine();
+            return CProgress();
+        }
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = comMachine.SaveState();
+    /* Store COM result: */
+    comResult = comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressMachineSaveState::sltHandleProgressFinished()
 {
     /* Unlock session finally: */

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

@@ -180 +180 @@
 public:
 
-    /** Constructs medium move notification-progress.
+    /** Constructs machine copy notification-progress.
       * @param  comSource     Brings the machine being copied.
       * @param  comTarget     Brings the machine being the target.
@@ -263 +263 @@
 };
 
+/** UINotificationProgress extension for machine save-state functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressMachineSaveState : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs machine save-state notification-progress.
+      * @param  comMachine  Brings the machine being saved. */
+    UINotificationProgressMachineSaveState(const QUuid &uId);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private slots:
+
+    /** Handles signal about progress being finished. */
+    void sltHandleProgressFinished();
+
+private:
+
+    /** Holds the machine id. */
+    QUuid     m_uId;
+    /** Holds the session being opened. */
+    CSession  m_comSession;
+    /** Holds the machine name. */
+    QString   m_strName;
+};
+
 /** UINotificationProgress extension for machine media remove functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressMachineMediaRemove : public UINotificationProgress