Changeset 90645 in vbox

Timestamp:

Aug 12, 2021 9:49:54 AM (4 years ago)

Author:

vboxsync

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

146257

Message:

FE/Qt: bugref:10067: Notification signature for snapshot take progress which should now go to center instead of modal dialogs; Used in Runtime UI. S.a. r146059.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)

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

@@ -1015 +1015 @@
     }
 
-    /* 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();
+    CMachine comMachine;
+
+    /* For Manager UI: */
+    switch (uiCommon().uiType())
+    {
+        case UICommon::UIType_SelectorUI:
+        {
+            /* 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: */
+            comMachine = m_comSession.GetMachine();
+            if (!m_comSession.isOk())
+            {
+                comResult = m_comSession;
+                m_comSession.UnlockMachine();
+                return CProgress();
+            }
+
+            break;
+        }
+        case UICommon::UIType_RuntimeUI:
+        {
+            /* Get passed machine: */
+            comMachine = m_comMachine;
+
+            break;
+        }
     }
 
@@ -1053 +1072 @@
 void UINotificationProgressSnapshotTake::sltHandleProgressFinished()
 {
-    m_comSession.UnlockMachine();
+    if (m_comSession.isNotNull())
+        m_comSession.UnlockMachine();
 }
 

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

@@ -1803 +1803 @@
 
     /* Search for the max available filter index: */
-    QString strNameTemplate = UITakeSnapshotDialog::tr("Snapshot %1");
+    const QString strNameTemplate = UITakeSnapshotDialog::tr("Snapshot %1");
     int iMaxSnapshotIndex = searchMaxSnapshotIndex(machine(), machine().FindSnapshot(QString()), strNameTemplate);
     pDlg->setName(strNameTemplate.arg(++ iMaxSnapshotIndex));
 
     /* Exec the dialog: */
-    bool fDialogAccepted = pDlg->exec() == QDialog::Accepted;
+    const bool fDialogAccepted = pDlg->exec() == QDialog::Accepted;
 
     /* Make sure dialog still valid: */
@@ -1815 +1815 @@
 
     /* Acquire variables: */
-    QString strSnapshotName = pDlg->name().trimmed();
-    QString strSnapshotDescription = pDlg->description();
+    const QString strSnapshotName = pDlg->name().trimmed();
+    const QString strSnapshotDescription = pDlg->description();
 
     /* Destroy dialog early: */
@@ -1822 +1822 @@
 
     /* Was the dialog accepted? */
-    if (fDialogAccepted)
-    {
-        QUuid uSnapshotId;
-        /* Prepare the take-snapshot progress: */
-        CProgress progress = machine().TakeSnapshot(strSnapshotName, strSnapshotDescription, true, uSnapshotId);
-        if (machine().isOk())
-        {
-            /* Show the take-snapshot progress: */
-            const bool fStillValid = msgCenter().showModalProgressDialog(progress, machineName(), ":/progress_snapshot_create_90px.png");
-            if (!fStillValid)
-                return;
-            if (!progress.isOk() || progress.GetResultCode() != 0)
-                msgCenter().cannotTakeSnapshot(progress, machineName());
-        }
-        else
-            msgCenter().cannotTakeSnapshot(machine(), machineName());
-    }
+    if (!fDialogAccepted)
+        return;
+
+    /* Take snapshot: */
+    UINotificationProgressSnapshotTake *pNotification = new UINotificationProgressSnapshotTake(machine(),
+                                                                                               strSnapshotName,
+                                                                                               strSnapshotDescription);
+    gpNotificationCenter->append(pNotification);
 }