Changeset 90456 in vbox

Timestamp:

Aug 1, 2021 12:26:40 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for snapshot delete progress which should now go to center instead of modal dialogs; Also a tiny refactoring for previous commit r146059.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (4 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• 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"
 
 
@@ -988 +989 @@
 QString UINotificationProgressSnapshotTake::details() const
 {
-    return UINotificationProgress::tr("<b>VM Name:</b> %1<br><b>Snapshot Name:</b> %2").arg(m_strName, m_strSnapshotName);
+    return UINotificationProgress::tr("<b>VM Name:</b> %1<br><b>Snapshot Name:</b> %2").arg(m_strMachineName, m_strSnapshotName);
 }
 
@@ -1002 +1003 @@
 
     /* Acquire VM name: */
-    m_strName = m_comMachine.GetName();
+    m_strMachineName = m_comMachine.GetName();
     if (!m_comMachine.isOk())
     {
@@ -1046 +1047 @@
 
 void UINotificationProgressSnapshotTake::sltHandleProgressFinished()
+{
+    m_comSession.UnlockMachine();
+}
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressSnapshotDelete implementation.                                                                   *
+*********************************************************************************************************************************/
+
+UINotificationProgressSnapshotDelete::UINotificationProgressSnapshotDelete(const CMachine &comMachine,
+                                                                           const QUuid &uSnapshotId)
+    : m_comMachine(comMachine)
+    , m_uSnapshotId(uSnapshotId)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressSnapshotDelete::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressSnapshotDelete::name() const
+{
+    return UINotificationProgress::tr("Deleting snapshot ...");
+}
+
+QString UINotificationProgressSnapshotDelete::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1<br><b>Snapshot Name:</b> %2").arg(m_strMachineName, m_strSnapshotName);
+}
+
+CProgress UINotificationProgressSnapshotDelete::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: */
+    CSnapshot comSnapshot = m_comMachine.FindSnapshot(m_uSnapshotId.toString());
+    if (!m_comMachine.isOk())
+    {
+        comResult = m_comMachine;
+        return CProgress();
+    }
+
+    /* Acquire snapshot name: */
+    m_strSnapshotName = comSnapshot.GetName();
+    if (!comSnapshot.isOk())
+    {
+        comResult = 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.DeleteSnapshot(m_uSnapshotId);
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressSnapshotDelete::sltHandleProgressFinished()
 {
     m_comSession.UnlockMachine();

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

@@ -782 +782 @@
     QString   m_strSnapshotDescription;
     /** Holds the machine name. */
-    QString   m_strName;
+    QString   m_strMachineName;
+    /** Holds the session being opened. */
+    CSession  m_comSession;
+};
+
+/** UINotificationProgress extension for snapshot delete functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressSnapshotDelete : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs snapshot delete notification-progress.
+      * @param  comMachine   Brings the machine we are deleting snapshot from.
+      * @param  uSnapshotId  Brings the ID of snapshot being deleted. */
+    UINotificationProgressSnapshotDelete(const CMachine &comMachine,
+                                         const QUuid &uSnapshotId);
+
+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 deleting snapshot from. */
+    CMachine  m_comMachine;
+    /** Holds the ID of snapshot being deleted. */
+    QUuid     m_uSnapshotId;
+    /** Holds the machine name. */
+    QString   m_strMachineName;
+    /** Holds the snapshot name. */
+    QString   m_strSnapshotName;
     /** Holds the session being opened. */
     CSession  m_comSession;

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

@@ -1580 +1580 @@
 bool UISnapshotPane::deleteSnapshot(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 ask if user really wants to remove the selected snapshot: */
-        if (!fAutomatically && !msgCenter().confirmSnapshotRemoval(comSnapshot.GetName()))
-            break;
-
-        /** @todo check available space on the target filesystem etc etc. */
+    /* 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 ask if user really wants to remove the selected snapshot: */
+    if (!fAutomatically && !msgCenter().confirmSnapshotRemoval(comSnapshot.GetName()))
+        return false;
+
 #if 0
-        if (!msgCenter().warnAboutSnapshotRemovalFreeSpace(comSnapshot.GetName(),
-                                                           "/home/juser/.VirtualBox/Machines/SampleVM/Snapshots/{01020304-0102-0102-0102-010203040506}.vdi",
-                                                           "59 GiB",
-                                                           "15 GiB"))
-            break;
+    /** @todo check available space on the target filesystem etc etc. */
+    if (!msgCenter().warnAboutSnapshotRemovalFreeSpace(comSnapshot.GetName(),
+                                                       "/home/juser/.VirtualBox/Machines/SampleVM/Snapshots/{01020304-0102-0102-0102-010203040506}.vdi",
+                                                       "59 GiB",
+                                                       "15 GiB"))
+        return false;
 #endif
 
-        /* Open a session (this call will handle all errors): */
-        CSession comSession;
-        if (m_enmSessionState != KSessionState_Unlocked)
-            comSession = uiCommon().openExistingSession(m_uMachineId);
-        else
-            comSession = uiCommon().openSession(m_uMachineId);
-        if (comSession.isNull())
-            break;
-
-        /* Simulate try-catch block: */
-        do
-        {
-            /* Remove chosen snapshot: */
-            CMachine comMachine = comSession.GetMachine();
-            CProgress comProgress = comMachine.DeleteSnapshot(pSnapshotItem->snapshotID());
-            if (!comMachine.isOk())
-            {
-                msgCenter().cannotRemoveSnapshot(comMachine,  comSnapshot.GetName(), m_comMachine.GetName());
-                break;
-            }
-
-            /* Show snapshot removing progress: */
-            msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_discard_90px.png");
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotRemoveSnapshot(comProgress,  comSnapshot.GetName(), m_comMachine.GetName());
-                break;
-            }
-
-            /* Mark snapshot removing successful: */
-            fSuccess = true;
-        }
-        while (0);
-
-        /* Cleanup try-catch block: */
-        comSession.UnlockMachine();
-    }
-    while (0);
-
-    /* Adjust snapshot tree: */
-    adjustTreeWidget();
+    /* Delete snapshot: */
+    UINotificationProgressSnapshotDelete *pNotification = new UINotificationProgressSnapshotDelete(m_comMachine,
+                                                                                                   pSnapshotItem->snapshotID());
+    notificationCenter().append(pNotification);
 
     /* Return result: */
-    return fSuccess;
+    return true;
 }