Changeset 87865 in vbox

Timestamp:

Feb 24, 2021 6:35:22 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Put back hdd page in between

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)

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

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

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

@@ -62 +62 @@
         Page1,
         Page2,
+        Page4,
         Page8,
-        //Page4,
         PageMax
     };

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

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

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

@@ -297 +297 @@
 }
 
-bool UIWizardNewVMPageBasic4::validatePage()
-{
-    /* Initial result: */
-    bool fResult = true;
-
-    /* Ensure unused virtual-disk is deleted: */
-    if (m_pDiskSkip->isChecked() || m_pDiskCreate->isChecked() || (!m_virtualDisk.isNull() && m_uVirtualDiskId != m_virtualDisk.GetId()))
-        ensureNewVirtualDiskDeleted();
-
-    if (m_pDiskSkip->isChecked())
-    {
-        /* Ask user about disk-less machine unless that's the recommendation: */
-        if (!m_fRecommendedNoDisk)
-            fResult = msgCenter().confirmHardDisklessMachine(thisImp());
-    }
-    else if (m_pDiskCreate->isChecked())
-    {
-        /* Show the New Virtual Hard Drive wizard: */
-        fResult = getWithNewVirtualDiskWizard();
-    }
-
-    if (fResult)
-    {
-        /* Lock finish button: */
-        startProcessing();
-
-        /* Try to create VM: */
-        fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
-
-        /* Unlock finish button: */
-        endProcessing();
-    }
-
-    /* Return result: */
-    return fResult;
-}
+
+// bool UIWizardNewVMPageBasic4::validatePage()
+// {
+//     /* Initial result: */
+//     bool fResult = true;
+
+//     /* Ensure unused virtual-disk is deleted: */
+//     if (m_pDiskSkip->isChecked() || m_pDiskCreate->isChecked() || (!m_virtualDisk.isNull() && m_uVirtualDiskId != m_virtualDisk.GetId()))
+//         ensureNewVirtualDiskDeleted();
+
+//     if (m_pDiskSkip->isChecked())
+//     {
+//         /* Ask user about disk-less machine unless that's the recommendation: */
+//         if (!m_fRecommendedNoDisk)
+//             fResult = msgCenter().confirmHardDisklessMachine(thisImp());
+//     }
+//     else if (m_pDiskCreate->isChecked())
+//     {
+//         /* Show the New Virtual Hard Drive wizard: */
+//         fResult = getWithNewVirtualDiskWizard();
+//     }
+
+//     if (fResult)
+//     {
+//         /* Lock finish button: */
+//         startProcessing();
+
+//         /* Try to create VM: */
+//         fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
+
+//         /* Unlock finish button: */
+//         endProcessing();
+//     }
+
+//     /* Return result: */
+//     return fResult;
+// }

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

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