Changeset 90855 in vbox

Timestamp:

Aug 24, 2021 5:51:34 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Reworking r145993; UINotificationProgressMachineSaveState should now be usable from within Runtime UI as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1680 +1680 @@
         /* Sanity check: */
         AssertPtrReturnVoid(pItem);
+        AssertPtrReturnVoid(pItem->toLocal());
 
         /* Check if current item could be saved: */
@@ -1686 +1687 @@
 
         /* Saving VM state: */
-        UINotificationProgressMachineSaveState *pNotification = new UINotificationProgressMachineSaveState(pItem->id());
+        UINotificationProgressMachineSaveState *pNotification = new UINotificationProgressMachineSaveState(pItem->toLocal()->machine());
         gpNotificationCenter->append(pNotification);
     }

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

@@ -859 +859 @@
 *********************************************************************************************************************************/
 
-UINotificationProgressMachineSaveState::UINotificationProgressMachineSaveState(const QUuid &uId)
-    : m_uId(uId)
+UINotificationProgressMachineSaveState::UINotificationProgressMachineSaveState(const CMachine &comMachine)
+    : m_comMachine(comMachine)
 {
     connect(this, &UINotificationProgress::sigProgressFinished,
@@ -878 +878 @@
 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;
+    /* Acquire VM id: */
+    const QUuid uId = m_comMachine.GetId();
+    if (!m_comMachine.isOk())
+    {
+        comResult = m_comMachine;
+        return CProgress();
+    }
+
+    /* Acquire VM name: */
+    m_strName = m_comMachine.GetName();
+    if (!m_comMachine.isOk())
+    {
+        comResult = m_comMachine;
+        return CProgress();
+    }
+
+    /* Prepare machine to save: */
+    CMachine comMachine = m_comMachine;
+
+    /* For Manager UI: */
+    switch (uiCommon().uiType())
+    {
+        case UICommon::UIType_SelectorUI:
+        {
+            /* Open a session thru which we will modify the machine: */
+            m_comSession = uiCommon().openExistingSession(uId);
+            if (m_comSession.isNull())
+                return CProgress();
+
+            /* Get session machine: */
+            comMachine = m_comSession.GetMachine();
+            if (!m_comSession.isOk())
+            {
+                comResult = m_comSession;
+                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();
+                }
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = comMachine.SaveState();
+    /* Store COM result: */
+    comResult = comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressMachineSaveState::sltHandleProgressFinished()
+{
+    /* Unlock session finally: */
+    if (m_comSession.isNotNull())
         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: */
-    m_comSession.UnlockMachine();
 }
 

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

@@ -526 +526 @@
 
     /** Constructs machine save-state notification-progress.
-      * @param  uId  Brings the machine id. */
-    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;
+      * @param  comMachine  Brings the machine being saved. */
+    UINotificationProgressMachineSaveState(const CMachine &comMachine);
+
+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 being saved. */
+    CMachine  m_comMachine;
     /** Holds the session being opened. */
     CSession  m_comSession;