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

Timestamp:

Jul 21, 2021 11:29:35 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. More fixes related to medium path updates. take 2

Location:

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

Files:

• editors/UIWizardDiskEditors.cpp (modified) (1 diff)
• newvm/UIWizardNewVM.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (8 diffs)
• newvm/UIWizardNewVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -382 +382 @@
     if (!m_pLocationEditor)
         return;
-    m_pLocationEditor->blockSignals(true);
     m_pLocationEditor->setText(strMediumPath);
-    m_pLocationEditor->blockSignals(false);
 }
 

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

@@ -812 +812 @@
 {
     m_strMediumPath = strMediumPath;
+    printf("%s\n", qPrintable(m_strMediumPath));
 }
 

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

@@ -91 +91 @@
     /* Register classes: */
     qRegisterMetaType<CMedium>();
-    //qRegisterMetaType<SelectedDiskSource>();
-
-    /* Register fields: */
-//     registerField("name*", m_pNameAndSystemEditor, "name", SIGNAL(sigNameChanged(const QString &)));
-//     registerField("type", m_pNameAndSystemEditor, "type", SIGNAL(sigOsTypeChanged()));
-//     registerField("machineFilePath", this, "machineFilePath");
-//     registerField("machineFolder", this, "machineFolder");
-//     registerField("machineBaseName", this, "machineBaseName");
-//     registerField("baseMemory", this, "baseMemory");
-//     registerField("guestOSFamiyId", this, "guestOSFamiyId");
-//     registerField("ISOFilePath", this, "ISOFilePath");
-//     registerField("isUnattendedEnabled", this, "isUnattendedEnabled");
-//     registerField("startHeadless", this, "startHeadless");
-//     registerField("detectedOSTypeId", this, "detectedOSTypeId");
-//     registerField("userName", this, "userName");
-//     registerField("password", this, "password");
-//     registerField("hostname", this, "hostname");
-//     registerField("installGuestAdditions", this, "installGuestAdditions");
-//     registerField("guestAdditionsISOPath", this, "guestAdditionsISOPath");
-//     registerField("productKey", this, "productKey");
-//     registerField("VCPUCount", this, "VCPUCount");
-//     registerField("EFIEnabled", this, "EFIEnabled");
-//     registerField("mediumPath", this, "mediumPath");
-//     registerField("mediumFormat", this, "mediumFormat");
-//     registerField("mediumSize", this, "mediumSize");
-//     registerField("selectedDiskSource", this, "selectedDiskSource");
-//     registerField("mediumVariant", this, "mediumVariant");
-
 }
 
@@ -126 +98 @@
         UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName);
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
-    if (!m_userModifiedParameters.contains("MediumPath") && m_pSizeAndLocationGroup)
-    {
+    if (!m_userModifiedParameters.contains("MediumPath"))
         updateVirtualMediumPathFromMachinePathName();
-        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
-    }
     if (!m_userModifiedParameters.contains("HostnameDomainName"))
         updateHostnameDomainNameFromMachineName();
@@ -140 +109 @@
     Q_UNUSED(strNewPath);
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
-    if (!m_userModifiedParameters.contains("MediumPath") && m_pSizeAndLocationGroup)
-    {
+    if (!m_userModifiedParameters.contains("MediumPath"))
         updateVirtualMediumPathFromMachinePathName();
-        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
-    }
 }
 
@@ -398 +364 @@
         if (m_pFormatButtonGroup)
             newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
-        /* First set value for medium path in widget the wizard: */
         updateVirtualMediumPathFromMachinePathName();
-        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
     }
 
@@ -422 +386 @@
     setOSTypeDependedValues();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
-    updateWidgetAfterMediumFormatChange();
+    updateDiskWidgetsAfterMediumFormatChange();
     // setSkipCheckBoxEnable();
     retranslateUi();
@@ -693 +657 @@
     m_userModifiedParameters << "MediumFormat";
     newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
-
-    updateWidgetAfterMediumFormatChange();
+    updateDiskWidgetsAfterMediumFormatChange();
     emit completeChanged();
 }
@@ -815 +778 @@
             UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDiskFileName,
                                                                                       strExtension), strMediumPath);
+        m_pSizeAndLocationGroup->blockSignals(true);
         m_pSizeAndLocationGroup->setMediumPath(strMediumFilePath);
-    }
-}
-
-void UIWizardNewVMPageExpert::updateWidgetAfterMediumFormatChange()
+        m_pSizeAndLocationGroup->blockSignals(false);
+        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
+    }
+}
+
+void UIWizardNewVMPageExpert::updateDiskWidgetsAfterMediumFormatChange()
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
@@ -825 +791 @@
     const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
     AssertReturnVoid(!comMediumFormat.isNull());
+
+    /* Block signals of the updated widgets to avoid calling corresponding slots since they add the parameters to m_userModifiedParameters: */
+    m_pDiskVariantGroupBox->blockSignals(true);
     m_pDiskVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
+    m_pDiskVariantGroupBox->blockSignals(false);
+
+    m_pSizeAndLocationGroup->blockSignals(true);
     m_pSizeAndLocationGroup->updateMediumPath(comMediumFormat, m_pFormatButtonGroup->formatExtensions());
+    m_pSizeAndLocationGroup->blockSignals(true);
+    /* Update the wizard parameters explicitly since we blocked th signals: */
+    newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
+    newVMWizardPropertySet(MediumVariant, m_pDiskVariantGroupBox->mediumVariant());
 }
 

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

@@ -135 +135 @@
 
     void updateVirtualMediumPathFromMachinePathName();
-    void updateWidgetAfterMediumFormatChange();
+    void updateDiskWidgetsAfterMediumFormatChange();
     void updateHostnameDomainNameFromMachineName();
     void setEnableNewDiskWidgets(bool fEnable);