Changeset 90923 in vbox

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Reworking r146061; UINotificationProgressSnapshotRestore should now be usable from within Runtime UI as well; Snapshot can now be NULL which means current one will be used.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

• UINotificationObjects.cpp (modified) (5 diffs)
• UINotificationObjects.h (modified) (1 diff)

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

@@ -1639 +1639 @@
 *********************************************************************************************************************************/
 
+UINotificationProgressSnapshotRestore::UINotificationProgressSnapshotRestore(const QUuid &uMachineId,
+                                                                             const CSnapshot &comSnapshot /* = CSnapshot() */)
+    : m_uMachineId(uMachineId)
+    , m_comSnapshot(comSnapshot)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressSnapshotRestore::sltHandleProgressFinished);
+}
+
 UINotificationProgressSnapshotRestore::UINotificationProgressSnapshotRestore(const CMachine &comMachine,
-                                                                             const CSnapshot &comSnapshot)
+                                                                             const CSnapshot &comSnapshot /* = CSnapshot() */)
     : m_comMachine(comMachine)
     , m_comSnapshot(comSnapshot)
@@ -1660 +1669 @@
 CProgress UINotificationProgressSnapshotRestore::createProgress(COMResult &comResult)
 {
-    /* Acquire VM id: */
-    const QUuid uId = m_comMachine.GetId();
-    if (!m_comMachine.isOk())
-    {
-        comResult = m_comMachine;
-        return CProgress();
-    }
-
-    /* Acquire VM name: */
-    m_strMachineName = m_comMachine.GetName();
-    if (!m_comMachine.isOk())
-    {
-        comResult = m_comMachine;
-        return CProgress();
-    }
+    /* Make sure machine ID defined: */
+    if (m_uMachineId.isNull())
+    {
+        /* Acquire VM id: */
+        AssertReturn(m_comMachine.isNotNull(), CProgress());
+        m_uMachineId = m_comMachine.GetId();
+        if (!m_comMachine.isOk())
+        {
+            comResult = m_comMachine;
+            return CProgress();
+        }
+    }
+
+    /* Make sure machine defined: */
+    if (m_comMachine.isNull())
+    {
+        /* Acquire VM: */
+        AssertReturn(!m_uMachineId.isNull(), CProgress());
+        CVirtualBox comVBox = uiCommon().virtualBox();
+        m_comMachine = comVBox.FindMachine(m_uMachineId.toString());
+        if (!comVBox.isOk())
+        {
+            comResult = comVBox;
+            return CProgress();
+        }
+    }
+
+    /* Make sure snapshot is defined: */
+    if (m_comSnapshot.isNull())
+        m_comSnapshot = m_comMachine.GetCurrentSnapshot();
 
     /* Acquire snapshot name: */
@@ -1694 +1718 @@
     /* Open a session thru which we will modify the machine: */
     if (enmSessionState != KSessionState_Unlocked)
-        m_comSession = uiCommon().openExistingSession(uId);
+        m_comSession = uiCommon().openExistingSession(m_uMachineId);
     else
-        m_comSession = uiCommon().openSession(uId);
+        m_comSession = uiCommon().openSession(m_uMachineId);
     if (m_comSession.isNull())
         return CProgress();
@@ -1709 +1733 @@
     }
 
+    /* Acquire VM name: */
+    m_strMachineName = comMachine.GetName();
+    if (!comMachine.isOk())
+    {
+        comResult = comMachine;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
     /* Initialize progress-wrapper: */
     CProgress comProgress = comMachine.RestoreSnapshot(m_comSnapshot);
     /* Store COM result: */
-    comResult = m_comMachine;
+    comResult = comMachine;
     /* Return progress-wrapper: */
     return comProgress;
@@ -1719 +1752 @@
 void UINotificationProgressSnapshotRestore::sltHandleProgressFinished()
 {
+    /* Unlock session finally: */
     m_comSession.UnlockMachine();
 }

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

@@ -1031 +1031 @@
 
     /** Constructs snapshot restore notification-progress.
+      * @param  uMachineId   Brings the ID of machine we are restoring snapshot for.
+      * @param  comSnapshot  Brings the snapshot being restored. */
+    UINotificationProgressSnapshotRestore(const QUuid &uMachineId,
+                                          const CSnapshot &comSnapshot = CSnapshot());
+    /** Constructs snapshot restore notification-progress.
       * @param  comMachine   Brings the machine we are restoring snapshot for.
       * @param  comSnapshot  Brings the snapshot being restored. */
     UINotificationProgressSnapshotRestore(const CMachine &comMachine,
-                                          const CSnapshot &comSnapshot);
-
-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:
-
+                                          const CSnapshot &comSnapshot = CSnapshot());
+
+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 ID of machine we are restoring snapshot for. */
+    QUuid      m_uMachineId;
     /** Holds the machine we are restoring snapshot for. */
     CMachine   m_comMachine;