Changeset 107915 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 23, 2025 3:16:27 PM (3 months ago)

Author:

vboxsync

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

167146

Message:

FE/Qt. bugref:10839. When edition selector is enabled disable other OS type selectors.

Location:

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

Files:

• UIWizardNewVMExpertPage.cpp (modified) (4 diffs)
• UIWizardNewVMExpertPage.h (modified) (1 diff)
• UIWizardNewVMNameOSTypePage.cpp (modified) (6 diffs)
• UIWizardNewVMNameOSTypePage.h (modified) (1 diff)

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

@@ -180 +180 @@
     /* Populate the editions selector: */
     if (m_pNameAndSystemEditor)
+    {
         m_pNameAndSystemEditor->setEditionNameAndIndices(pWizard->detectedWindowsImageNames(),
                                                          pWizard->detectedWindowsImageIndices());
+    }
     setSkipCheckBoxEnable();
-    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
+    disableEnableUnattendedRelatedWidgets();
 
     /* Redetect the OS type using the name if detection or the step above failed: */
@@ -454 +456 @@
     setOSTypeDependedValues();
     setSkipCheckBoxEnable();
-    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
+    disableEnableUnattendedRelatedWidgets();
     updateDiskWidgetsAfterMediumFormatChange();
     sltRetranslateUI();
@@ -711 +713 @@
 }
 
-void UIWizardNewVMExpertPage::disableEnableUnattendedRelatedWidgets(bool fEnabled)
-{
+void UIWizardNewVMExpertPage::disableEnableUnattendedRelatedWidgets()
+{
+    bool fUnattendedEnabled = isUnattendedEnabled();
     if (m_pUserNamePasswordGroupBox)
-        m_pUserNamePasswordGroupBox->setEnabled(fEnabled);
+        m_pUserNamePasswordGroupBox->setEnabled(fUnattendedEnabled);
     if (m_pAdditionalOptionsContainer)
-        m_pAdditionalOptionsContainer->setEnabled(fEnabled);
+        m_pAdditionalOptionsContainer->setEnabled(fUnattendedEnabled);
     if (m_pGAInstallationISOContainer)
-        m_pGAInstallationISOContainer->setEnabled(fEnabled);
+        m_pGAInstallationISOContainer->setEnabled(fUnattendedEnabled);
     if (m_pNameAndSystemEditor)
-        m_pNameAndSystemEditor->setEditionSelectorEnabled(fEnabled && !m_pNameAndSystemEditor->isEditionsSelectorEmpty());
+        m_pNameAndSystemEditor->setEditionSelectorEnabled(fUnattendedEnabled && !m_pNameAndSystemEditor->isEditionsSelectorEmpty());
     m_pAdditionalOptionsContainer->disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
+    m_pNameAndSystemEditor->setOSTypeStuffEnabled(!fUnattendedEnabled || m_pNameAndSystemEditor->isEditionsSelectorEmpty());
 }
 
@@ -729 +733 @@
     m_userModifiedParameters << "UnattendedInstall";
     wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(!fSkip);
-    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
+    disableEnableUnattendedRelatedWidgets();
     emit completeChanged();
 }

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

@@ -122 +122 @@
 
     bool isProductKeyWidgetEnabled() const;
-    void disableEnableUnattendedRelatedWidgets(bool fEnabled);
+    void disableEnableUnattendedRelatedWidgets();
     void markWidgets() const;
     QWidget *createUnattendedWidgets();

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

@@ -625 +625 @@
                                            .arg(UIWizardNewVM::tr("This OS type can be installed unattendedly. "
                                                                   "The install will start after this wizard is closed."));
+
+
+
     }
 
@@ -646 +649 @@
         {
             m_pNameAndSystemEditor->setFocus();
-            setEditionSelectorEnabled();
+            setEditionAndOSTypeSelectorsEnabled();
         }
         setSkipCheckBoxEnable();
@@ -693 +696 @@
 
     setSkipCheckBoxEnable();
-    setEditionSelectorEnabled();
+    setEditionAndOSTypeSelectorsEnabled();
     updateInfoLabel();
 
@@ -699 +702 @@
     if (m_pNameAndSystemEditor)
     {
-        m_pNameAndSystemEditor->setOSTypeStuffEnabled(!fOsTypeFixed);
+
 
         /* Redetect the OS type using the name if detection or the step above failed: */
@@ -729 +732 @@
     m_userModifiedParameters << "SkipUnattendedInstall";
     wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(!fSkip);
-    setEditionSelectorEnabled();
+    setEditionAndOSTypeSelectorsEnabled();
     updateInfoLabel();
 }
@@ -819 +822 @@
 
 
-void  UIWizardNewVMNameOSTypePage::setEditionSelectorEnabled()
-{
+void  UIWizardNewVMNameOSTypePage::setEditionAndOSTypeSelectorsEnabled()
+{
+    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
+    AssertReturnVoid(pWizard);
     if (!m_pNameAndSystemEditor || !m_pUnattendedCheckBox)
         return;
     m_pNameAndSystemEditor->setEditionSelectorEnabled(   !m_pNameAndSystemEditor->isEditionsSelectorEmpty()
                                                       && m_pUnattendedCheckBox->isChecked());
-}
+    /* Disable OS type, version, subtype selectors if unattended is enabled and edition list is not empty: */
+    if (pWizard->isUnattendedEnabled() && !m_pNameAndSystemEditor->isEditionsSelectorEmpty())
+        m_pNameAndSystemEditor->setOSTypeStuffEnabled(false);
+    else
+        m_pNameAndSystemEditor->setOSTypeStuffEnabled(true);
+
+}

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

@@ -100 +100 @@
     bool isUnattendedEnabled() const;
     bool isUnattendedInstallSupported() const;
-    void setEditionSelectorEnabled();
+    void setEditionAndOSTypeSelectorsEnabled();
     void updateInfoLabel();