Changeset 90230 in vbox

Timestamp:

Jul 16, 2021 11:56:03 AM (4 years ago)

Author:

vboxsync

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

145768

Message:

FE/Qt: bugref:9996. Some fixes

Location:

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

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.h

@@ -104 +104 @@
     QLabel *m_pGAISOPathLabel;
     UIFilePathSelector *m_pGAISOFilePathSelector;
-
 };
 

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

@@ -123 +123 @@
         UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName);
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
-    updateVirtualMediumPathFromMachinePathName();
+    if (!m_userModifiedParameters.contains("MediumPath"))
+        updateVirtualMediumPathFromMachinePathName();
     emit completeChanged();
 }
@@ -131 +132 @@
     Q_UNUSED(strNewPath);
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
-    updateVirtualMediumPathFromMachinePathName();
+    if (!m_userModifiedParameters.contains("MediumPath"))
+        updateVirtualMediumPathFromMachinePathName();
 }
 
@@ -169 +171 @@
 void UIWizardNewVMPageExpert::sltGAISOPathChanged(const QString &strPath)
 {
-    Q_UNUSED(strPath);
-    //emit completeChanged();
+    m_userModifiedParameters << "GuestAdditionsISOPath";
+    newVMWizardPropertySet(GuestAdditionsISOPath, strPath);
+    emit completeChanged();
 }
 
@@ -215 +218 @@
 {
     Q_UNUSED(fEnabled);
-    // disableEnableGAWidgets(fEnabled);
-    // emit completeChanged();
+    emit completeChanged();
 }
 
@@ -245 +247 @@
                 this, &UIWizardNewVMPageExpert::sltEFIEnabledChanged);
     }
-    // /* Connections for username, password, and hostname: */
+    /* Connections for username, password, and hostname, etc: */
+    if (m_pGAInstallationISOContainer)
+    {
+        connect(m_pGAInstallationISOContainer, &UIGAInstallationGroupBox::sigPathChanged,
+                this, &UIWizardNewVMPageExpert::sltGAISOPathChanged);
+        connect(m_pGAInstallationISOContainer, &UIGAInstallationGroupBox::toggled,
+                this, &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
+
+    }
     // if (m_pUserNamePasswordGroupBox)
     //     connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordEditor::sigSomeTextChanged,
     //             this, &UIWizardNewVMPageExpert::completeChanged);
-    // if (m_pGAISOFilePathSelector)
-    //     connect(m_pGAISOFilePathSelector, &UIFilePathSelector::pathChanged,
-    //             this, &UIWizardNewVMPageExpert::sltGAISOPathChanged);
-
-    // if (m_pGAInstallationISOContainer)
-    //     connect(m_pGAInstallationISOContainer, &QGroupBox::toggled,
-    //             this, &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
+
 
     // if (m_pFormatButtonGroup)
@@ -363 +367 @@
     if (m_pFormatButtonGroup)
         newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
-    updateVirtualMediumPathFromMachinePathName();
+    if (!m_userModifiedParameters.contains("MediumPath"))
+        updateVirtualMediumPathFromMachinePathName();
 
     // disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
@@ -601 +606 @@
     //     m_pGAInstallationISOContainer->setEnabled(fEnabled);
     // disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
-    // disableEnableGAWidgets(isGAInstallEnabled());
 }
 
@@ -684 +688 @@
     }
     QString strExtension = UIWizardNewVMDiskPage::defaultExtension(pWizard->mediumFormat());
-
-
     if (m_pSizeAndLocationGroup)
     {
-        QString strMediumPath =
+        QString strMediumFilePath =
             UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDiskFileName,
                                                                                       strExtension), strMediumPath);
-        m_pSizeAndLocationGroup->setMediumPath(strMediumPath);
+        m_pSizeAndLocationGroup->setMediumPath(strMediumFilePath);
     }
 }