Changeset 91108 in vbox for trunk/src/VBox

Timestamp:

Sep 3, 2021 3:28:52 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Reviving vm creation.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (2 diffs)
• UIWizardNewVM.h (modified) (2 diffs)
• UIWizardNewVMDiskPage.cpp (modified) (3 diffs)
• UIWizardNewVMDiskPage.h (modified) (1 diff)
• UIWizardNewVMSummaryPage.cpp (modified) (1 diff)

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

@@ -71 +71 @@
     , m_uMediumSize(0)
     , m_enmDiskSource(SelectedDiskSource_New)
+    , m_fEmptyDiskRecommended(false)
 {
 #ifndef VBOX_WS_MAC
@@ -898 +899 @@
 }
 
+bool UIWizardNewVM::emptyDiskRecommended() const
+{
+    return m_fEmptyDiskRecommended;
+}
+
+void UIWizardNewVM::setEmptyDiskRecommended(bool fEmptyDiskRecommended)
+{
+    m_fEmptyDiskRecommended = fEmptyDiskRecommended;
+}
+
 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
 {

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

@@ -160 +160 @@
         SelectedDiskSource diskSource() const;
         void setDiskSource(SelectedDiskSource enmDiskSource);
+
+        bool emptyDiskRecommended() const;
+        void setEmptyDiskRecommended(bool fEmptyDiskRecommended);
     /** @} */
 
@@ -231 +234 @@
        qulonglong m_uMediumSize;
        SelectedDiskSource m_enmDiskSource;
+       bool m_fEmptyDiskRecommended;
     /** @} */
 };

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

@@ -72 +72 @@
     , m_pFixedLabel(0)
     , m_pFixedCheckBox(0)
-    , m_fRecommendedNoDisk(false)
     , m_fVDIFormatFound(false)
     , m_uMediumSizeMin(_4M)
@@ -259 +258 @@
             }
             pWizard->setDiskSource(SelectedDiskSource_New);
-            m_fRecommendedNoDisk = false;
+            pWizard->setEmptyDiskRecommended(false);
         }
         else
@@ -269 +268 @@
             }
             pWizard->setDiskSource(SelectedDiskSource_Empty);
-            m_fRecommendedNoDisk = true;
+            pWizard->setEmptyDiskRecommended(true);
         }
     }

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

@@ -105 +105 @@
 
     /** @name Variables
-     * @{ */
-      bool m_fRecommendedNoDisk;
-      QSet<QString> m_userModifiedParameters;
-      bool m_fVDIFormatFound;
-      qulonglong m_uMediumSizeMin;
-      qulonglong m_uMediumSizeMax;
+      * @{ */
+        QSet<QString> m_userModifiedParameters;
+        bool m_fVDIFormatFound;
+        qulonglong m_uMediumSizeMin;
+        qulonglong m_uMediumSizeMax;
     /** @} */
 };

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

@@ -92 +92 @@
     {
         /* Ask user about disk-less machine unless that's the recommendation: */
-        // if (!m_fRecommendedNoDisk)
-        // {
-        //     if (!msgCenter().confirmHardDisklessMachine(this))
-        //         return false;
-        // }
+        if (!pWizard->emptyDiskRecommended())
+        {
+            if (!msgCenter().confirmHardDisklessMachine(this))
+                return false;
+        }
     }
     else if (pWizard->diskSource() == SelectedDiskSource_New)