Changeset 90925 in vbox

Timestamp:

Aug 26, 2021 4:25:27 PM (4 years ago)

Author:

vboxsync

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

146562

Message:

FE/Qt: bugref:10067: Notification signature for snapshot restore progress (in Runtime UI) which should now go to center instead of modal dialogs, s.a. r146061.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2594 +2594 @@
 }
 
-void UICommon::restoreCurrentSnapshot(const QUuid &uMachineId)
-{
-    /* Open a session to modify VM: */
-    const bool fDirectSessionAvailable = (m_enmType == UIType_RuntimeUI) && isSeparateProcess();
-    CSession comSession = openSession(uMachineId, fDirectSessionAvailable ? KLockType_Write : KLockType_Shared);
-    if (!comSession.isNull())
-    {
-        /* Simulate try-catch block: */
-        do
-        {
-            /* Acquire session machine: */
-            CMachine comMachine = comSession.GetMachine();
-            if (!comSession.isOk())
-            {
-                msgCenter().cannotAcquireSessionParameter(comSession);
-                break;
-            }
-
-            /* Acquire machine name: */
-            const QString strMachineName = comMachine.GetName();
-            if (!comMachine.isOk())
-            {
-                msgCenter().cannotAcquireMachineParameter(comMachine);
-                break;
-            }
-
-            /* Acquire current snapshot: */
-            const CSnapshot comSnapshot = comMachine.GetCurrentSnapshot();
-            if (!comMachine.isOk())
-            {
-                msgCenter().cannotAcquireMachineParameter(comMachine);
-                break;
-            }
-
-            /* Acquire snapshot name: */
-            const QString strSnapshotName = comSnapshot.GetName();
-            if (!comSnapshot.isOk())
-            {
-                msgCenter().cannotAcquireSnapshotParameter(comSnapshot);
-                break;
-            }
-
-            /* Prepare the snapshot-discard progress: */
-            CProgress comProgress = comMachine.RestoreSnapshot(comSnapshot);
-            if (!comMachine.isOk())
-            {
-                msgCenter().cannotRestoreSnapshot(comMachine, strSnapshotName, strMachineName);
-                break;
-            }
-
-            /* Show the snapshot-discard progress: */
-            msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_snapshot_discard_90px.png");
-            if (comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotRestoreSnapshot(comProgress, strSnapshotName, strMachineName);
-                break;
-            }
-        }
-        while (0);
-
-        /* Unlock machine finally: */
-        comSession.UnlockMachine();
-    }
-}
-
 void UICommon::notifyCloudMachineUnregistered(const QString &strProviderShortName,
                                               const QString &strProfileName,

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -518 +518 @@
           * otherwise, no session will be created and machine will be left unchanged. */
         CSession tryToOpenSessionFor(CMachine &comMachine);
-
-        /** Restores current snapshot for machine with certain @a uMachineId. */
-        void restoreCurrentSnapshot(const QUuid &uMachineId);
     /** @} */
 

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

@@ -1754 +1754 @@
     /* Unlock session finally: */
     m_comSession.UnlockMachine();
+
+    /* Notifies listeners: */
+    emit sigSnapshotRestored(error().isEmpty());
 }
 

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

@@ -1028 +1028 @@
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about snapshot restored.
+      * @param  fSuccess  Brings whether snapshot restored successfully. */
+    void sigSnapshotRestored(bool fSuccess);
+
 public:
 

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

@@ -825 +825 @@
     if (fSuccess)
     {
-        if (fIncludingDiscard)
-            uiCommon().restoreCurrentSnapshot(uiCommon().managedVMUuid());
-        closeRuntimeUI();
-    }
+        if (!fIncludingDiscard)
+            closeRuntimeUI();
+        else
+        {
+            /* Now, do more magic! */
+            UINotificationProgressSnapshotRestore *pNotification =
+                new UINotificationProgressSnapshotRestore(uiCommon().managedVMUuid());
+            connect(pNotification, &UINotificationProgressSnapshotRestore::sigSnapshotRestored,
+                    this, &UISession::sltHandleSnapshotRestored);
+            gpNotificationCenter->append(pNotification);
+        }
+    }
+}
+
+void UISession::sltHandleSnapshotRestored(bool)
+{
+    /* Close Runtime UI independent of snapshot restoring state: */
+    closeRuntimeUI();
 }
 

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

@@ -407 +407 @@
       * @param  fIncludingDiscard  Brings whether machine state should be discarded. */
     void sltHandleMachinePoweredOff(bool fSuccess, bool fIncludingDiscard);
+    /** Handles signal about snapshot restored.
+      * @param  fSuccess  Brings whether machine was powered off successfully. */
+    void sltHandleSnapshotRestored(bool fSuccess);
 
 private: