Changeset 87974 in vbox

Timestamp:

Mar 5, 2021 3:37:10 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Handling medium size change in the expert mpde page

Location:

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

Files:

• UIWizardNewVMPageBasic4.cpp (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (8 diffs)
• UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -343 +343 @@
     m_strDefaultName = strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName;
     m_strDefaultPath = fieldImp("machineFolder").toString();
+    /* Set the recommended disk size if user has already not done so: */
     if (m_pSizeEditor && !m_fUserSetSize)
     {
@@ -349 +350 @@
         m_pSizeEditor->blockSignals(false);
     }
-
 }
 

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

@@ -97 +97 @@
     registerField("mediumPath", this, "mediumPath");
     registerField("mediumFormat", this, "mediumFormat");
+    registerField("mediumSize", this, "mediumSize");
+
 
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
@@ -121 +123 @@
 void UIWizardNewVMPageExpert::sltOsTypeChanged()
 {
-    /* Call to base-class: */
     onOsTypeChanged();
-
     setOSTypeDependedValues();
-
-    /* Broadcast complete-change: */
     emit completeChanged();
 }
@@ -276 +274 @@
         connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
                 this, &UIWizardNewVMPageExpert::sltMediumFormatChanged);
+    if (m_pSizeEditor)
+        connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
+                this, &UIWizardNewVMPageExpert::sltMediumSizeChanged);
 }
 
@@ -301 +302 @@
         m_pEFICheckBox->blockSignals(false);
     }
-
+    LONG64 recommendedDiskSize = type.GetRecommendedHDD();
     /* Prepare initial disk choice: */
     if (!m_userSetWidgets.contains(m_pDiskNew) &&
@@ -307 +308 @@
         !m_userSetWidgets.contains(m_pDiskExisting))
     {
-        if (type.GetRecommendedHDD() != 0)
+        if (recommendedDiskSize != 0)
         {
             if (m_pDiskNew)
@@ -327 +328 @@
         if (m_pDiskSelector)
             m_pDiskSelector->setCurrentIndex(0);
+    }
+
+    if (m_pSizeEditor  && !m_userSetWidgets.contains(m_pSizeEditor))
+    {
+        m_pSizeEditor->blockSignals(true);
+        setMediumSize(recommendedDiskSize);
+        m_pSizeEditor->blockSignals(false);
     }
 
@@ -494 +502 @@
         }
     }
+
+     // return !mediumFormat().isNull() &&
+     //       mediumVariant() != (qulonglong)KMediumVariant_Max &&
+     //       !m_pLocationEditor->text().trimmed().isEmpty() &&
+     //       mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
+
     return fIsComplete;
 }
@@ -568 +582 @@
 }
 
+void UIWizardNewVMPageExpert::sltMediumSizeChanged()
+{
+    if (!m_pSizeEditor)
+        return;
+    m_userSetWidgets << m_pSizeEditor;
+    completeChanged();
+}
+
 void UIWizardNewVMPageExpert::updateVirtualDiskPathFromMachinePathName()
 {

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

@@ -73 +73 @@
     // Q_PROPERTY(qulonglong mediumVariant READ mediumVariant WRITE setMediumVariant);
     Q_PROPERTY(QString mediumPath READ mediumPath);
-    // Q_PROPERTY(qulonglong mediumSize READ mediumSize WRITE setMediumSize);
+    Q_PROPERTY(qulonglong mediumSize READ mediumSize WRITE setMediumSize);
 
 public:
@@ -102 +102 @@
     void sltValueModified();
     void sltMediumFormatChanged();
+    void sltMediumSizeChanged();
 
 private: