Changeset 90082 in vbox

Timestamp:

Jul 8, 2021 5:51:59 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: isComplete stuff for disk page

Location:

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

Files:

• UIWizardNewVMDiskPageBasic.cpp (modified) (3 diffs)
• UIWizardNewVMDiskPageBasic.h (modified) (1 diff)

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

@@ -108 +108 @@
     return uMediumId;
 }
-
-
-// QWidget *UIWizardNewVMDiskPage::createNewDiskWidgets()
-// {
-//     return new QWidget();
-// }
-
-// registerField("mediumFormat", this, "mediumFormat");
-// registerField("mediumVariant" /* KMediumVariant */, this, "mediumVariant");
-// registerField("mediumPath", this, "mediumPath");
-// registerField("mediumSize", this, "mediumSize");
 
 UIWizardNewVMDiskPageBasic::UIWizardNewVMDiskPageBasic()
@@ -137 +126 @@
     , m_fRecommendedNoDisk(false)
     , m_fVDIFormatFound(false)
+    , m_uMediumSizeMin(_4M)
+    , m_uMediumSizeMax(uiCommon().virtualBox().GetSystemProperties().GetInfoVDSize())
 {
     prepare();
-    // qRegisterMetaType<CMedium>();
-    // qRegisterMetaType<SelectedDiskSource>();
-
 }
 
@@ -392 +380 @@
 bool UIWizardNewVMDiskPageBasic::isComplete() const
 {
-    // if (selectedDiskSource() == SelectedDiskSource_New)
-    //     return mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
-    // UIWizardNewVM *pWizard = wizardImp();
-    // AssertReturn(pWizard, false);
-    // if (selectedDiskSource() == SelectedDiskSource_Existing)
-    //     return !pWizard->virtualDisk().isNull();
-
-    // if (m_pDiskNew && m_pDiskNew->isChecked())
-    // {
-    //     qulonglong uSize = field("mediumSize").toULongLong();
-    //     if (uSize <= 0)
-    //         return false;
-    // }
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    AssertReturn(pWizard, false);
+
+    const qulonglong uSize = pWizard->mediumSize();
+    if (m_enmSelectedDiskSource == SelectedDiskSource_New)
+        return uSize >= m_uMediumSizeMin && uSize <= m_uMediumSizeMax;
+
+    if (m_enmSelectedDiskSource == SelectedDiskSource_Existing)
+        return !pWizard->virtualDisk().isNull();
+
+    if (m_pDiskNew && m_pDiskNew->isChecked() && uSize <= 0)
+        return false;
 
     return true;

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

@@ -129 +129 @@
     bool m_fRecommendedNoDisk;
 
-    QString m_strDefaultExtension;
     QSet<QString> m_userModifiedParameters;
     bool m_fVDIFormatFound;
+    qulonglong m_uMediumSizeMin;
+    qulonglong m_uMediumSizeMax;
+
 };