Changeset 90272 in vbox

Timestamp:

Jul 21, 2021 10:19:55 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145811

Message:

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

Location:

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

Files:

• editors/UIWizardDiskEditors.cpp (modified) (2 diffs)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (5 diffs)

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

@@ -380 +380 @@
 void UIMediumSizeAndPathGroupBox::setMediumPath(const QString &strMediumPath)
 {
-    if (m_pLocationEditor)
-        m_pLocationEditor->setText(strMediumPath);
+    if (!m_pLocationEditor)
+        return;
+    m_pLocationEditor->blockSignals(true);
+    m_pLocationEditor->setText(strMediumPath);
+    m_pLocationEditor->blockSignals(false);
 }
 
@@ -398 +401 @@
                                   arg(stripFormatExtension(fileInfo.fileName(), formatExtensions)).
                                   arg(strDefaultExtension));
-            m_pLocationEditor->setText(newFileInfo.absoluteFilePath());
+            setMediumPath(newFileInfo.absoluteFilePath());
         }
     }

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

@@ -126 +126 @@
         UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName);
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
-    if (!m_userModifiedParameters.contains("MediumPath"))
+    if (!m_userModifiedParameters.contains("MediumPath") && m_pSizeAndLocationGroup)
+    {
         updateVirtualMediumPathFromMachinePathName();
+        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
+    }
     if (!m_userModifiedParameters.contains("HostnameDomainName"))
         updateHostnameDomainNameFromMachineName();
@@ -137 +140 @@
     Q_UNUSED(strNewPath);
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
-    if (!m_userModifiedParameters.contains("MediumPath"))
+    if (!m_userModifiedParameters.contains("MediumPath") && m_pSizeAndLocationGroup)
+    {
         updateVirtualMediumPathFromMachinePathName();
+        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
+    }
 }
 
@@ -375 +381 @@
 void UIWizardNewVMPageExpert::initializePage()
 {
+    /* We need not to check existence of parameter within m_userModifiedParameters since initializePage() runs
+        once the page loads before user has a chance to modify parameters explicitly: */
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     AssertReturnVoid(pWizard);
@@ -390 +398 @@
         if (m_pFormatButtonGroup)
             newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
-        if (!m_userModifiedParameters.contains("MediumPath"))
-            updateVirtualMediumPathFromMachinePathName();
+        /* First set value for medium path in widget the wizard: */
+        updateVirtualMediumPathFromMachinePathName();
+        newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
     }
 
@@ -398 +407 @@
     {
         m_pUserNamePasswordGroupBox->blockSignals(true);
-        if (!m_userModifiedParameters.contains("UserName"))
-            m_pUserNamePasswordGroupBox->setUserName(pWizard->userName());
-        if (!m_userModifiedParameters.contains("Password"))
-            m_pUserNamePasswordGroupBox->setPassword(pWizard->password());
+        m_pUserNamePasswordGroupBox->setUserName(pWizard->userName());
+        m_pUserNamePasswordGroupBox->setPassword(pWizard->password());
         m_pUserNamePasswordGroupBox->blockSignals(false);
     }
-    if (!m_userModifiedParameters.contains("HostnameDomainName"))
-        updateHostnameDomainNameFromMachineName();
-
-    if (m_pGAInstallationISOContainer && !m_userModifiedParameters.contains("InstallGuestAdditions"))
+    updateHostnameDomainNameFromMachineName();
+
+    if (m_pGAInstallationISOContainer)
     {
         m_pGAInstallationISOContainer->blockSignals(true);