Changeset 90457 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 1, 2021 1:11:31 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for snapshot restore progress which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• snapshots/UISnapshotPane.cpp (modified) (1 diff)

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

@@ -26 +26 @@
 /* COM includes: */
 #include "CConsole.h"
-#include "CSnapshot.h"
 
 
@@ -1053 +1052 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressSnapshotRestore implementation.                                                                  *
+*********************************************************************************************************************************/
+
+UINotificationProgressSnapshotRestore::UINotificationProgressSnapshotRestore(const CMachine &comMachine,
+                                                                             const CSnapshot &comSnapshot)
+    : m_comMachine(comMachine)
+    , m_comSnapshot(comSnapshot)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressSnapshotRestore::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressSnapshotRestore::name() const
+{
+    return UINotificationProgress::tr("Restoring snapshot ...");
+}
+
+QString UINotificationProgressSnapshotRestore::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1<br><b>Snapshot Name:</b> %2").arg(m_strMachineName, m_strSnapshotName);
+}
+
+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();
+    }
+
+    /* Acquire snapshot name: */
+    m_strSnapshotName = m_comSnapshot.GetName();
+    if (!m_comSnapshot.isOk())
+    {
+        comResult = m_comSnapshot;
+        return CProgress();
+    }
+
+    /* Acquire session state: */
+    const KSessionState enmSessionState = m_comMachine.GetSessionState();
+    if (!m_comMachine.isOk())
+    {
+        comResult = m_comMachine;
+        return CProgress();
+    }
+
+    /* Open a session thru which we will modify the machine: */
+    if (enmSessionState != KSessionState_Unlocked)
+        m_comSession = uiCommon().openExistingSession(uId);
+    else
+        m_comSession = uiCommon().openSession(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();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = comMachine.RestoreSnapshot(m_comSnapshot);
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressSnapshotRestore::sltHandleProgressFinished()
+{
+    m_comSession.UnlockMachine();
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressSnapshotDelete implementation.                                                                   *
 *********************************************************************************************************************************/

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

@@ -38 +38 @@
 #include "CMedium.h"
 #include "CSession.h"
+#include "CSnapshot.h"
 #include "CVirtualSystemDescription.h"
 
@@ -787 +788 @@
 };
 
+/** UINotificationProgress extension for snapshot restore functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressSnapshotRestore : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** 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:
+
+    /** Holds the machine we are restoring snapshot for. */
+    CMachine   m_comMachine;
+    /** Holds the snapshot being restored. */
+    CSnapshot  m_comSnapshot;
+    /** Holds the machine name. */
+    QString    m_strMachineName;
+    /** Holds the snapshot name. */
+    QString    m_strSnapshotName;
+    /** Holds the session being opened. */
+    CSession   m_comSession;
+};
+
 /** UINotificationProgress extension for snapshot delete functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressSnapshotDelete : public UINotificationProgress

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -1612 +1612 @@
 bool UISnapshotPane::restoreSnapshot(bool fAutomatically /* = false */)
 {
-    /* Simulate try-catch block: */
-    bool fSuccess = false;
-    do
-    {
-        /* Acquire "current snapshot" item: */
-        const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
-        AssertPtr(pSnapshotItem);
-        if (!pSnapshotItem)
-            break;
-
-        /* Get corresponding snapshot: */
-        const CSnapshot comSnapshot = pSnapshotItem->snapshot();
-        Assert(!comSnapshot.isNull());
-        if (comSnapshot.isNull())
-            break;
-
-        /* In manual mode we should check whether current state is changed: */
-        if (!fAutomatically && m_comMachine.GetCurrentStateModified())
+    /* Acquire "current snapshot" item: */
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
+    AssertPtrReturn(pSnapshotItem, false);
+
+    /* Get corresponding snapshot: */
+    const CSnapshot comSnapshot = pSnapshotItem->snapshot();
+    AssertReturn(!comSnapshot.isNull(), false);
+
+    /* In manual mode we should check whether current state is changed: */
+    if (!fAutomatically && m_comMachine.GetCurrentStateModified())
+    {
+        /* Ask if user really wants to restore the selected snapshot: */
+        int iResultCode = msgCenter().confirmSnapshotRestoring(comSnapshot.GetName(), m_comMachine.GetCurrentStateModified());
+        if (iResultCode & AlertButton_Cancel)
+            return false;
+
+        /* Ask if user also wants to create new snapshot of current state which is changed: */
+        if (iResultCode & AlertOption_CheckBox)
         {
-            /* Ask if user really wants to restore the selected snapshot: */
-            int iResultCode = msgCenter().confirmSnapshotRestoring(comSnapshot.GetName(), m_comMachine.GetCurrentStateModified());
-            if (iResultCode & AlertButton_Cancel)
-                break;
-
-            /* Ask if user also wants to create new snapshot of current state which is changed: */
-            if (iResultCode & AlertOption_CheckBox)
-            {
-                /* Take snapshot of changed current state: */
-                m_pSnapshotTree->setCurrentItem(m_pCurrentStateItem);
-                if (!takeSnapshot())
-                    break;
-            }
+            /* Take snapshot of changed current state: */
+            m_pSnapshotTree->setCurrentItem(m_pCurrentStateItem);
+            if (!takeSnapshot())
+                return false;
         }
-
-        /* Open a direct session (this call will handle all errors): */
-        CSession comSession = uiCommon().openSession(m_uMachineId);
-        if (comSession.isNull())
-            break;
-
-        /* Simulate try-catch block: */
-        do
-        {
-            /* Restore chosen snapshot: */
-            CMachine comMachine = comSession.GetMachine();
-            CProgress comProgress = comMachine.RestoreSnapshot(comSnapshot);
-            if (!comMachine.isOk())
-            {
-                msgCenter().cannotRestoreSnapshot(comMachine, comSnapshot.GetName(), m_comMachine.GetName());
-                break;
-            }
-
-            /* Show snapshot restoring progress: */
-            msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_restore_90px.png");
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotRestoreSnapshot(comProgress, comSnapshot.GetName(), m_comMachine.GetName());
-                break;
-            }
-
-            /* Mark snapshot restoring successful: */
-            fSuccess = true;
-        }
-        while (0);
-
-        /* Cleanup try-catch block: */
-        comSession.UnlockMachine();
-    }
-    while (0);
-
-    /* Adjust snapshot tree: */
-    adjustTreeWidget();
+    }
+
+    /* Restore snapshot: */
+    UINotificationProgressSnapshotRestore *pNotification = new UINotificationProgressSnapshotRestore(m_comMachine, comSnapshot);
+    notificationCenter().append(pNotification);
 
     /* Return result: */
-    return fSuccess;
+    return true;
 }