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

Timestamp:

Feb 2, 2022 3:44:53 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt, Main/Unattended. ​​​bugref:9515, ​​​bugref:9781. Adding windows image selection widget to the guided version of the new vm wizard.

Location:

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

Files:

• editors/UIWizardNewVMEditors.cpp (modified) (1 diff)
• newvm/UIWizardNewVMUnattendedPage.cpp (modified) (5 diffs)
• newvm/UIWizardNewVMUnattendedPage.h (modified) (3 diffs)

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

@@ -448 +448 @@
 void UIWindowsISOImageSelector::retranslateUi()
 {
-    setTitle(UIWizardNewVM::tr("Available OS Versions from ISO"));
+    setTitle(UIWizardNewVM::tr("Available OS Editions from the ISO"));
     if (m_pLabel)
         m_pLabel->setText(UIWizardNewVM::tr("ISO Images"));

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

@@ -41 +41 @@
     , m_pGAInstallationISOContainer(0)
     , m_pUserNamePasswordGroupBox(0)
+    , m_pWindowsISOImageSelector(0)
 {
     prepare();
@@ -65 +66 @@
     pMainLayout->addWidget(m_pGAInstallationISOContainer, 2, 0, 1, 2);
 
-    pMainLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding), 3, 0, 1, 2);
+    m_pWindowsISOImageSelector = new UIWindowsISOImageSelector;
+    AssertReturnVoid(m_pWindowsISOImageSelector);
+    pMainLayout->addWidget(m_pWindowsISOImageSelector, 3, 0, 1, 2);
+
+    pMainLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding), 4, 0, 1, 2);
 
     createConnections();
@@ -96 +101 @@
                 this, &UIWizardNewVMUnattendedPage::sltStartHeadlessChanged);
     }
+
+    if (m_pWindowsISOImageSelector)
+        connect(m_pWindowsISOImageSelector, &UIWindowsISOImageSelector::sigSelectedWindowsImageChanged,
+                this, &UIWizardNewVMUnattendedPage::sltSelectedWindowsImageChanged);
 }
 
@@ -155 +164 @@
         m_pGAInstallationISOContainer->blockSignals(false);
     }
+    if (m_pWindowsISOImageSelector)
+    {
+        m_pWindowsISOImageSelector->setImageNamesAndIndices(pWizard->detectedWindowsImageNames(),
+                                                            pWizard->detectedWindowsImageIndices());
+        m_pWindowsISOImageSelector->setEnabled(!m_pWindowsISOImageSelector->isEmpty());
+    }
 }
 
@@ -236 +251 @@
         m_pGAInstallationISOContainer->mark();
 }
+
+void UIWizardNewVMUnattendedPage::sltSelectedWindowsImageChanged(ulong uImageIndex)
+{
+    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
+    wizardWindow<UIWizardNewVM>()->setSelectedWindowImageIndex(uImageIndex);
+}

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

@@ -30 +30 @@
 class UIGAInstallationGroupBox;
 class UIUserNamePasswordGroupBox;
+class UIWindowsISOImageSelector;
 
 namespace UIWizardNewVMUnattendedCommon
@@ -54 +55 @@
     void sltProductKeyChanged(const QString &strProductKey);
     void sltStartHeadlessChanged(bool fStartHeadless);
+    void sltSelectedWindowsImageChanged(ulong uImageIndex);
 
 private:
@@ -73 +75 @@
         UIGAInstallationGroupBox *m_pGAInstallationISOContainer;
         UIUserNamePasswordGroupBox *m_pUserNamePasswordGroupBox;
+        UIWindowsISOImageSelector *m_pWindowsISOImageSelector;
     /** @} */
     QSet<QString> m_userModifiedParameters;