Changeset 88000 in vbox

Timestamp:

Mar 8, 2021 8:29:00 AM (4 years ago)

Author:

vboxsync

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

143123

Message:

FE/Qt: bugref:9950. Creating the vm from expert page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVM.h (modified) (1 diff)
• UIWizardNewVMPageBasic4.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

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

@@ -230 +230 @@
 }
 
+void UIWizardNewVM::deleteVirtualDisk()
+{
+    CMedium comDisk = virtualDisk();
+    /* Make sure virtual-disk valid: */
+    if (comDisk.isNull())
+        return;
+
+    /* Remember virtual-disk attributes: */
+    QString strLocation = comDisk.GetLocation();
+    /* Prepare delete storage progress: */
+    CProgress progress = comDisk.DeleteStorage();
+    if (comDisk.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);
+    }
+    else
+        msgCenter().cannotDeleteHardDiskStorage(comDisk, strLocation, this);
+
+    /* Detach virtual-disk anyway: */
+    comDisk.detach();
+}
+
 void UIWizardNewVM::configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType)
 {

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

@@ -101 +101 @@
     bool createVM();
     bool createVirtualDisk();
+    void deleteVirtualDisk();
 
     void configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType);

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

@@ -419 +419 @@
             return fResult;
     }
+
     fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
+    /* Try to delete the hard disk: */
+    if (!fResult)
+        qobject_cast<UIWizardNewVM*>(wizard())->deleteVirtualDisk();
+
     endProcessing();
 

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

@@ -38 +38 @@
 #include "UIMedium.h"
 #include "UIMediumSizeEditor.h"
+#include "UIMessageCenter.h"
 #include "UINameAndSystemEditor.h"
 #include "UIToolBox.h"
@@ -528 +529 @@
 bool UIWizardNewVMPageExpert::validatePage()
 {
-    /* Initial result: */
     bool fResult = true;
 
-    /* Lock finish button: */
+    if (selectedDiskSource() == SelectedDiskSource_New)
+    {
+        /* Check if the path we will be using for hard drive creation exists: */
+        const QString strMediumPath(fieldImp("mediumPath").toString());
+        fResult = !QFileInfo(strMediumPath).exists();
+        if (!fResult)
+        {
+            msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
+            return fResult;
+        }
+        /* Check FAT size limitation of the host hard drive: */
+        fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
+                                                             fieldImp("mediumPath").toString(),
+                                                             fieldImp("mediumSize").toULongLong());
+        if (!fResult)
+        {
+            msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
+            return fResult;
+        }
+    }
+
     startProcessing();
-
-    /* Try to create machine folder: */
-    if (fResult)
-        fResult = createMachineFolder();
-
-    /* Try to assign boot virtual-disk: */
-    if (fResult)
-    {
-        /* Ensure there is no virtual-disk created yet: */
-        Assert(m_virtualDisk.isNull());
-        if (fResult)
-        {
-            if (m_pDiskNew->isChecked())
-            {
-            }
-        }
-    }
-
-    /* Try to create VM: */
-    if (fResult)
-        fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
-
-    /* Unlock finish button: */
+    if (selectedDiskSource() == SelectedDiskSource_New)
+    {
+        /* Try to create the hard drive:*/
+        fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVirtualDisk();
+        /*Don't show any error message here since UIWizardNewVM::createVirtualDisk already does so: */
+        if (!fResult)
+            return fResult;
+    }
+
+    fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
+    /* Try to delete the hard disk: */
+    if (!fResult)
+        qobject_cast<UIWizardNewVM*>(wizard())->deleteVirtualDisk();
+
     endProcessing();
 
-    /* Return result: */
     return fResult;
 }