Changeset 92022 in vbox for trunk

Timestamp:

Oct 25, 2021 10:26:10 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UIWizardNewVM: Migrate intermediate progress related to storage creating/deleting to notification-center.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -32 +32 @@
 #include "UIMessageCenter.h"
 #include "UIMedium.h"
+#include "UINotificationCenter.h"
 
 /* COM includes: */
@@ -191 +192 @@
 
     /* Create base storage for the new virtual-disk: */
-    CProgress comProgress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, mediumVariants());
-    if (!newVirtualDisk.isOk())
-        msgCenter().cannotCreateHardDiskStorage(newVirtualDisk, m_strMediumPath, this);
-    else
-    {
-        /* Make sure progress initially valid: */
-        if (!comProgress.isNull() && !comProgress.GetCompleted())
-        {
-            /* Create take snapshot progress object: */
-            QPointer<UIProgressObject> pObject = new UIProgressObject(comProgress, this);
-            if (pObject)
-            {
-                connect(pObject.data(), &UIProgressObject::sigProgressChange,
-                        this, &UIWizardNewVM::sltHandleProgressChange);
-                connect(pObject.data(), &UIProgressObject::sigProgressComplete,
-                        this, &UIWizardNewVM::sltHandleProgressFinished);
-                sltHandleProgressStarted();
-                pObject->exec();
-                if (pObject)
-                    delete pObject;
-                else
-                {
-                    // Premature application shutdown,
-                    // exit immediately:
-                    return fResult;
-                }
-            }
-        }
-
-        /* Check for progress errors: */
-        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            msgCenter().cannotCreateHardDiskStorage(comProgress, m_strMediumPath, this);
-        else
-        {
-            /* Inform UICommon about it: */
-            uiCommon().createMedium(UIMedium(newVirtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
-
-            /* Remember created virtual-disk: */
-            m_virtualDisk = newVirtualDisk;
-
-            /* True finally: */
-            fResult = true;
-        }
-    }
+    UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(newVirtualDisk,
+                                                                                               m_uMediumSize,
+                                                                                               mediumVariants());
+    if (!handleNotificationProgressNow(pNotification))
+        return fResult;
+
+    /* Inform UICommon about it: */
+    uiCommon().createMedium(UIMedium(newVirtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
+
+    /* Remember created virtual-disk: */
+    m_virtualDisk = newVirtualDisk;
+
+    /* True finally: */
+    fResult = true;
 
     /* Return result: */
@@ -246 +217 @@
         return;
 
-    /* Remember virtual-disk attributes: */
-    QString strLocation = m_virtualDisk.GetLocation();
-    if (!m_virtualDisk.isOk())
-    {
-        msgCenter().cannotAcquireHardDiskLocation(m_virtualDisk, this);
+    /* Delete storage of existing disk: */
+    UINotificationProgressMediumDeletingStorage *pNotification = new UINotificationProgressMediumDeletingStorage(m_virtualDisk);
+    if (!handleNotificationProgressNow(pNotification))
         return;
-    }
-
-    /* Delete storage of existing disk: */
-    CProgress comProgress = m_virtualDisk.DeleteStorage();
-    if (!m_virtualDisk.isOk())
-        msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, this);
-    else
-    {
-        /* Make sure progress initially valid: */
-        if (!comProgress.isNull() && !comProgress.GetCompleted())
-        {
-            /* Create take snapshot progress object: */
-            QPointer<UIProgressObject> pObject = new UIProgressObject(comProgress, this);
-            if (pObject)
-            {
-                connect(pObject.data(), &UIProgressObject::sigProgressChange,
-                        this, &UIWizardNewVM::sltHandleProgressChange);
-                connect(pObject.data(), &UIProgressObject::sigProgressComplete,
-                        this, &UIWizardNewVM::sltHandleProgressFinished);
-                sltHandleProgressStarted();
-                pObject->exec();
-                if (pObject)
-                    delete pObject;
-                else
-                {
-                    // Premature application shutdown,
-                    // exit immediately:
-                    return;
-                }
-            }
-        }
-
-        /* Check for progress errors: */
-        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            msgCenter().cannotDeleteHardDiskStorage(comProgress, strLocation, this);
-        else
-        {
-            /* Detach virtual-disk anyway: */
-            m_virtualDisk.detach();
-        }
-    }
+
+    /* Detach virtual-disk finally: */
+    m_virtualDisk.detach();
 }