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

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@93546 cfe28804-0f27-0410-a406-dd0f0b0b656f

3 files changed, 26 insertions, 2 deletions

diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp
index bf475f36949..b40593f0fb2 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp
@@ -447,7 +447,7 @@ bool UIWindowsISOImageSelector::isEmpty() const
 
 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"));
 
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp
index cd9263a2acf..a11ad593318 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp
@@ -40,6 +40,7 @@ UIWizardNewVMUnattendedPage::UIWizardNewVMUnattendedPage()
     , m_pAdditionalOptionsContainer(0)
     , m_pGAInstallationISOContainer(0)
     , m_pUserNamePasswordGroupBox(0)
+    , m_pWindowsISOImageSelector(0)
 {
     prepare();
 }
@@ -64,7 +65,11 @@ void UIWizardNewVMUnattendedPage::prepare()
     AssertReturnVoid(m_pGAInstallationISOContainer);
     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();
 }
@@ -95,6 +100,10 @@ void UIWizardNewVMUnattendedPage::createConnections()
         connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigStartHeadlessChanged,
                 this, &UIWizardNewVMUnattendedPage::sltStartHeadlessChanged);
     }
+
+    if (m_pWindowsISOImageSelector)
+        connect(m_pWindowsISOImageSelector, &UIWindowsISOImageSelector::sigSelectedWindowsImageChanged,
+                this, &UIWizardNewVMUnattendedPage::sltSelectedWindowsImageChanged);
 }
 
 
@@ -154,6 +163,12 @@ void UIWizardNewVMUnattendedPage::initializePage()
         m_pGAInstallationISOContainer->setPath(pWizard->guestAdditionsISOPath());
         m_pGAInstallationISOContainer->blockSignals(false);
     }
+    if (m_pWindowsISOImageSelector)
+    {
+        m_pWindowsISOImageSelector->setImageNamesAndIndices(pWizard->detectedWindowsImageNames(),
+                                                            pWizard->detectedWindowsImageIndices());
+        m_pWindowsISOImageSelector->setEnabled(!m_pWindowsISOImageSelector->isEmpty());
+    }
 }
 
 bool UIWizardNewVMUnattendedPage::isComplete() const
@@ -235,3 +250,9 @@ void UIWizardNewVMUnattendedPage::markWidgets() const
     if (pWizard && pWizard->installGuestAdditions() && m_pGAInstallationISOContainer)
         m_pGAInstallationISOContainer->mark();
 }
+
+void UIWizardNewVMUnattendedPage::sltSelectedWindowsImageChanged(ulong uImageIndex)
+{
+    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
+    wizardWindow<UIWizardNewVM>()->setSelectedWindowImageIndex(uImageIndex);
+}
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.h b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.h
index 341c196a5aa..fd61cfa93a2 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.h
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.h
@@ -29,6 +29,7 @@ class QIRichTextLabel;
 class UIAdditionalUnattendedOptions;
 class UIGAInstallationGroupBox;
 class UIUserNamePasswordGroupBox;
+class UIWindowsISOImageSelector;
 
 namespace UIWizardNewVMUnattendedCommon
 {
@@ -53,6 +54,7 @@ private slots:
     void sltHostnameDomainNameChanged(const QString &strHostnameDomainName);
     void sltProductKeyChanged(const QString &strProductKey);
     void sltStartHeadlessChanged(bool fStartHeadless);
+    void sltSelectedWindowsImageChanged(ulong uImageIndex);
 
 private:
 
@@ -72,6 +74,7 @@ private:
         UIAdditionalUnattendedOptions *m_pAdditionalOptionsContainer;
         UIGAInstallationGroupBox *m_pGAInstallationISOContainer;
         UIUserNamePasswordGroupBox *m_pUserNamePasswordGroupBox;
+        UIWindowsISOImageSelector *m_pWindowsISOImageSelector;
     /** @} */
     QSet<QString> m_userModifiedParameters;
 };