Changeset 87915 in vbox for trunk

Timestamp:

Mar 2, 2021 3:13:46 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Switching order of the pages. yet again

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVM.h (modified) (1 diff)
• UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic4.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic4.h (modified) (1 diff)
• UIWizardNewVMPageBasic8.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic8.h (modified) (1 diff)

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

@@ -85 +85 @@
             setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
             setPage(Page2, new UIWizardNewVMPageBasic2);
+            setPage(Page8, new UIWizardNewVMPageBasic8);
             setPage(Page4, new UIWizardNewVMPageBasic4);
-            setPage(Page8, new UIWizardNewVMPageBasic8);
 
             setStartId(Page1);

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

@@ -73 +73 @@
         Page1,
         Page2,
+        Page8,
         Page4,
-        Page5,
-        Page8,
         PageMax
     };

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

@@ -497 +497 @@
     if (isUnattendedEnabled())
         return UIWizardNewVM::Page2;
-    return UIWizardNewVM::Page4;
+    return UIWizardNewVM::Page8;
 }
 

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

@@ -380 +380 @@
 {
     bool fResult = true;
+
+    /* Make sure user really intents to creae a vm with no hard drive: */
     if (selectedDiskSource() == SelectedDiskSource_Empty)
     {
         /* Ask user about disk-less machine unless that's the recommendation: */
         if (!m_fRecommendedNoDisk)
-            fResult = msgCenter().confirmHardDisklessMachine(thisImp());
-    }
+        {
+            if (!msgCenter().confirmHardDisklessMachine(thisImp()))
+                return false;
+        }
+    }
+    else 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();
+    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();
+    endProcessing();
+
     return fResult;
 }

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

@@ -138 +138 @@
 
     bool isComplete() const;
-    bool validatePage();
+    virtual bool validatePage() /* override */;
 
     QIRichTextLabel *m_pLabel;

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

@@ -152 +152 @@
     return true;
 }
-
-bool UIWizardNewVMPageBasic8::validatePage()
-{
-    bool fResult = true;
-
-    const QString strMediumPath(fieldImp("mediumPath").toString());
-    fResult = !QFileInfo(strMediumPath).exists();
-    if (!fResult)
-    {
-        msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
-        return fResult;
-    }
-
-    startProcessing();
-    SelectedDiskSource enmDiskSource = field("selectedDiskSource").value<SelectedDiskSource>();
-    if (enmDiskSource == SelectedDiskSource_New)
-    {
-        fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVirtualDisk();
-        fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
-                                                             fieldImp("mediumPath").toString(),
-                                                             fieldImp("mediumSize").toULongLong());
-        if (!fResult)
-        {
-            msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
-            return fResult;
-        }
-    }
-    fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
-    endProcessing();
-
-    return fResult;
-}

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

@@ -106 +106 @@
 
     bool isComplete() const;
-    virtual bool validatePage() /* override */;
 
     /** Widgets. */