Changeset 90276 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 21, 2021 2:53:03 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Fixing medium source selection connections.

Location:

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

Files:

• UIWizardNewVMDiskPageBasic.cpp (modified) (4 diffs)
• UIWizardNewVMDiskPageBasic.h (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (4 diffs)
• UIWizardNewVMPageExpert.h (modified) (1 diff)

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

@@ -234 +234 @@
 void UIWizardNewVMDiskPageBasic::sltSelectedDiskSourceChanged()
 {
-    if (!m_pDiskSourceButtonGroup)
-        return;
+    AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup);
 
     if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
@@ -242 +241 @@
     {
         m_enmSelectedDiskSource = SelectedDiskSource_Existing;
-        setVirtualDiskFromDiskCombo();
+        newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     }
     else
@@ -255 +254 @@
 void UIWizardNewVMDiskPageBasic::sltMediaComboBoxIndexChanged()
 {
-    setVirtualDiskFromDiskCombo();
+    AssertReturnVoid(m_pDiskSelector);
+    newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     emit completeChanged();
 }
@@ -512 +512 @@
     if (m_pFixedCheckBox)
         m_pFixedCheckBox->setEnabled(fEnable);
-}
-
-void UIWizardNewVMDiskPageBasic::setVirtualDiskFromDiskCombo()
-{
-    AssertReturnVoid(m_pDiskSelector);
-    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    AssertReturnVoid(pWizard);
-    pWizard->setVirtualDisk(m_pDiskSelector->id());
 }
 

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

@@ -99 +99 @@
     void cleanupPage();
     void setEnableNewDiskWidgets(bool fEnable);
-    void setVirtualDiskFromDiskCombo();
     QWidget *createDiskWidgets();
     QWidget *createMediumVariantWidgets(bool fWithLabels);

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

@@ -683 +683 @@
 void UIWizardNewVMPageExpert::sltMediaComboBoxIndexChanged()
 {
+    AssertReturnVoid(m_pDiskSelector);
     /* Make sure to set m_virtualDisk: */
-    setVirtualDiskFromDiskCombo();
+    newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     emit completeChanged();
 }
@@ -690 +691 @@
 void UIWizardNewVMPageExpert::sltSelectedDiskSourceChanged()
 {
-    if (!m_pDiskSourceButtonGroup)
-        return;
+    AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup);
+
     m_userModifiedParameters << "SelectedDiskSource";
     if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
@@ -698 +699 @@
     {
         m_enmSelectedDiskSource = SelectedDiskSource_Existing;
-        setVirtualDiskFromDiskCombo();
+        newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     }
     else
@@ -820 +821 @@
         m_pDiskVariantGroupBox->setEnabled(fEnable);
 }
-
-void UIWizardNewVMPageExpert::setVirtualDiskFromDiskCombo()
-{
-    // AssertReturnVoid(m_pDiskSelector);
-    // UIWizardNewVM *pWizard = wizardImp();
-    // AssertReturnVoid(pWizard);
-    // pWizard->setVirtualDisk(m_pDiskSelector->id());
-}
-
 
 QWidget *UIWizardNewVMPageExpert::createNameOSTypeWidgets()

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

@@ -139 +139 @@
     void updateHostnameDomainNameFromMachineName();
     void setEnableNewDiskWidgets(bool fEnable);
-    void setVirtualDiskFromDiskCombo();
     void setSkipCheckBoxEnable();
     bool isUnattendedEnabled() const;