Changeset 90757 in vbox

Timestamp:

Aug 20, 2021 9:27:57 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: New VM wizard: Handle internal disk storage creation and removal via UIProgressObject, not UIProgressDialog.

File:

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

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

@@ -22 +22 @@
 /* GUI includes: */
 #include "UICommon.h"
+#include "UIProgressObject.h"
 #include "UIWizardNewVM.h"
 #include "UIWizardNewVMNameOSTypePageBasic.h"
@@ -174 +175 @@
 bool UIWizardNewVM::createVirtualDisk()
 {
+    /* Prepare result: */
+    bool fResult = false;
+
     /* Check attributes: */
     AssertReturn(!m_strMediumPath.isNull(), false);
     AssertReturn(m_uMediumSize > 0, false);
 
-    CVirtualBox vbox = uiCommon().virtualBox();
+    /* Acquire VBox: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
 
     /* Create new virtual hard-disk: */
-    CMedium newVirtualDisk = vbox.CreateMedium(m_comMediumFormat.GetName(), m_strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
-    if (!vbox.isOk())
-    {
-        msgCenter().cannotCreateHardDiskStorage(vbox, m_strMediumPath, this);
-        return false;
+    CMedium newVirtualDisk = comVBox.CreateMedium(m_comMediumFormat.GetName(), m_strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
+    if (!comVBox.isOk())
+    {
+        msgCenter().cannotCreateHardDiskStorage(comVBox, m_strMediumPath, this);
+        return fResult;
     }
 
@@ -198 +203 @@
 
     /* Create base storage for the new virtual-disk: */
-    CProgress progress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, variants);
+    CProgress comProgress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, variants);
     if (!newVirtualDisk.isOk())
-    {
         msgCenter().cannotCreateHardDiskStorage(newVirtualDisk, m_strMediumPath, this);
-        return false;
-    }
-
-    /* Show creation progress: */
-    msgCenter().showModalProgressDialog(progress, windowTitle(), ":/progress_media_create_90px.png", this);
-    if (progress.GetCanceled())
-        return false;
-    if (!progress.isOk() || progress.GetResultCode() != 0)
-    {
-        msgCenter().cannotCreateHardDiskStorage(progress, m_strMediumPath, this);
-        return false;
-    }
-
-    /* Inform UICommon about it: */
-    uiCommon().createMedium(UIMedium(newVirtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
-
-    /* Remember created virtual-disk: */
-    m_virtualDisk = newVirtualDisk;
-
-    return true;
+    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;
+        }
+    }
+
+    /* Return result: */
+    return fResult;
 }
 
@@ -232 +260 @@
     /* Remember virtual-disk attributes: */
     QString strLocation = m_virtualDisk.GetLocation();
-    /* Prepare delete storage progress: */
-    CProgress progress = m_virtualDisk.DeleteStorage();
-    if (m_virtualDisk.isOk())
-    {
-        /* Show delete storage progress: */
-        msgCenter().showModalProgressDialog(progress, windowTitle(), ":/progress_media_delete_90px.png", this);
-        if (!progress.isOk() || progress.GetResultCode() != 0)
-            msgCenter().cannotDeleteHardDiskStorage(progress, strLocation, this);
-    }
+    if (!m_virtualDisk.isOk())
+    {
+        msgCenter().cannotAcquireMediumAttribute(m_virtualDisk, this);
+        return;
+    }
+
+    /* Delete storage of existing disk: */
+    CProgress comProgress = m_virtualDisk.DeleteStorage();
+    if (!m_virtualDisk.isOk())
+        msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, this);
     else
-        msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, this);
-
-    /* Detach virtual-disk anyway: */
-    m_virtualDisk.detach();
+    {
+        /* 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();
+        }
+    }
 }