Changeset 87903 in vbox for trunk/src/VBox

Timestamp:

Mar 1, 2021 5:48:20 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. warning user about the empty disk

Location:

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

Files:

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

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

@@ -309 +309 @@
 }
 
-// bool UIWizardNewVMPageBasic4::validatePage()
-// {
-//     /* Initial result: */
-//     bool fResult = true;
-
-//     /* Ensure unused virtual-disk is deleted: */
-//     if (m_pDiskEmpty->isChecked() || m_pDiskNew->isChecked() || (!m_virtualDisk.isNull() && m_uVirtualDiskId != m_virtualDisk.GetId()))
-//         ensureNewVirtualDiskDeleted();
-
-//     if (m_pDiskEmpty->isChecked())
-//     {
-//         /* Ask user about disk-less machine unless that's the recommendation: */
-//         if (!m_fRecommendedNoDisk)
-//             fResult = msgCenter().confirmHardDisklessMachine(thisImp());
-//     }
-//     else if (m_pDiskNew->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()
+{
+    bool fResult = true;
+    if (selectedDiskSource() == SelectedDiskSource_Empty)
+    {
+        /* Ask user about disk-less machine unless that's the recommendation: */
+        if (!m_fRecommendedNoDisk)
+            fResult = msgCenter().confirmHardDisklessMachine(thisImp());
+    }
+    return fResult;
+}

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

@@ -122 +122 @@
 
     bool isComplete() const;
+    bool validatePage();
 
     QIRichTextLabel *m_pLabel;

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

@@ -166 +166 @@
 
     startProcessing();
-
     SelectedDiskSource enmDiskSource = field("selectedDiskSource").value<SelectedDiskSource>();
     if (enmDiskSource == SelectedDiskSource_New)