Changeset 85055 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 3, 2020 12:41:08 PM (5 years ago)

Author:

vboxsync

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

138958

Message:

FE/Qt: bugref:9515. Merging 3 pages into a single one.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (4 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (28 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic1.h (modified) (6 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic2.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.cpp ) (10 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic2.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.h ) (6 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp (deleted)
• src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.h (deleted)
• src/wizards/newvm/UIWizardNewVMPageBasicProductKey.cpp (deleted)
• src/wizards/newvm/UIWizardNewVMPageBasicProductKey.h (deleted)
• src/wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -650 +650 @@
         src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h \
         src/wizards/newvm/UIWizardNewVM.h \
-        src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.h \
         src/wizards/newvm/UIWizardNewVMPageBasic1.h \
-        src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.h \
+        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
         src/wizards/newvm/UIWizardNewVMPageBasicHardware.h \
-        src/wizards/newvm/UIWizardNewVMPageBasicProductKey.h \
         src/wizards/newvm/UIWizardNewVMPageBasicDisk.h \
         src/wizards/newvm/UIWizardNewVMPageExpert.h \
@@ -1115 +1113 @@
         src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp \
         src/wizards/newvm/UIWizardNewVM.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasicProductKey.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicDisk.cpp \
         src/wizards/newvm/UIWizardNewVMPageExpert.cpp \

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

@@ -20 +20 @@
 #include "UIWizardNewVM.h"
 #include "UIWizardNewVMPageBasic1.h"
+#include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVMPageBasicHardware.h"
-#include "UIWizardNewVMPageBasicProductKey.h"
-#include "UIWizardNewVMPageBasicGAInstall.h"
 #include "UIWizardNewVMPageBasicDisk.h"
 #include "UIWizardNewVMPageExpert.h"
-#include "UIWizardNewVMPageBasicUserNameHostname.h"
 #include "UIMessageCenter.h"
 #include "UIMedium.h"
@@ -77 +75 @@
         case WizardMode_Basic:
         {
-            setPage(Page1, new UIWizardNewVMPageBasicNameType(m_strGroup));
-            setPage(PageUserNameHostname, new UIWizardNewVMPageBasicUserNameHostname);
-            setPage(PageGAInstall, new UIWizardNewVMPageBasicGAInstall);
-            setPage(PageProductKey, new UIWizardNewVMPageBasicProductKey);
+            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
+            setPage(Page2, new UIWizardNewVMPageBasic2);
             setPage(PageHardware, new UIWizardNewVMPageBasicHardware);
             setPage(PageDisk, new UIWizardNewVMPageBasicDisk);
@@ -406 +402 @@
         case WizardMode_Basic:
         {
-            UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*> (page(Page1));
+            UIWizardNewVMPageBasic1 *pPage = qobject_cast<UIWizardNewVMPageBasic1*> (page(Page1));
             /* Make sure that we were able to find the page that created the folder. */
             Assert(pPage);
@@ -427 +423 @@
 void UIWizardNewVM::sltHandleDetectedOSTypeChange()
 {
-    UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*>(page(Page1));
+    UIWizardNewVMPageBasic1 *pPage = qobject_cast<UIWizardNewVMPageBasic1*>(page(Page1));
     if (!pPage)
         return;

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

@@ -61 +61 @@
     {
         Page1,
-        PageUserNameHostname,
-        PageGAInstall,
-        PageProductKey,
+        Page2,
         PageHardware,
         PageDisk,

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicNameType class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasic1 class implementation.
  */
 
@@ -179 +179 @@
 };
 
-UIWizardNewVMPageNameType::UIWizardNewVMPageNameType(const QString &strGroup)
+UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup)
     : m_pButtonSimple(0)
     , m_pButtonUnattended(0)
@@ -194 +194 @@
 }
 
-void UIWizardNewVMPageNameType::onNameChanged(QString strNewName)
+void UIWizardNewVMPage1::onNameChanged(QString strNewName)
 {
     /* Do not forget about achitecture bits, if not yet specified: */
@@ -214 +214 @@
 }
 
-void UIWizardNewVMPageNameType::onOsTypeChanged()
+void UIWizardNewVMPage1::onOsTypeChanged()
 {
     /* If the user manually edited the OS type, we didn't want our automatic OS type guessing anymore.
@@ -222 +222 @@
 }
 
-bool UIWizardNewVMPageNameType::determineOSType(const QString &strISOPath)
+bool UIWizardNewVMPage1::determineOSType(const QString &strISOPath)
 {
     QFileInfo isoFileInfo(strISOPath);
@@ -250 +250 @@
 }
 
-void UIWizardNewVMPageNameType::composeMachineFilePath()
+void UIWizardNewVMPage1::composeMachineFilePath()
 {
     if (!m_pNameAndSystemEditor)
@@ -270 +270 @@
 }
 
-bool UIWizardNewVMPageNameType::checkISOFile() const
+bool UIWizardNewVMPage1::checkISOFile() const
 {
     if (m_pButtonUnattended && m_pButtonUnattended->isChecked())
@@ -281 +281 @@
 }
 
-bool UIWizardNewVMPageNameType::createMachineFolder()
+bool UIWizardNewVMPage1::createMachineFolder()
 {
     if (!m_pNameAndSystemEditor)
@@ -319 +319 @@
 }
 
-bool UIWizardNewVMPageNameType::cleanupMachineFolder(bool fWizardCancel /* = false */)
+bool UIWizardNewVMPage1::cleanupMachineFolder(bool fWizardCancel /* = false */)
 {
     /* Make sure folder was previosly created: */
@@ -338 +338 @@
 }
 
-QString UIWizardNewVMPageNameType::machineFilePath() const
+QString UIWizardNewVMPage1::machineFilePath() const
 {
     return m_strMachineFilePath;
 }
 
-void UIWizardNewVMPageNameType::setMachineFilePath(const QString &strMachineFilePath)
+void UIWizardNewVMPage1::setMachineFilePath(const QString &strMachineFilePath)
 {
     m_strMachineFilePath = strMachineFilePath;
 }
 
-QString UIWizardNewVMPageNameType::machineFolder() const
+QString UIWizardNewVMPage1::machineFolder() const
 {
     return m_strMachineFolder;
 }
 
-void UIWizardNewVMPageNameType::setMachineFolder(const QString &strMachineFolder)
+void UIWizardNewVMPage1::setMachineFolder(const QString &strMachineFolder)
 {
     m_strMachineFolder = strMachineFolder;
 }
 
-QString UIWizardNewVMPageNameType::machineBaseName() const
+QString UIWizardNewVMPage1::machineBaseName() const
 {
     return m_strMachineBaseName;
 }
 
-void UIWizardNewVMPageNameType::setMachineBaseName(const QString &strMachineBaseName)
+void UIWizardNewVMPage1::setMachineBaseName(const QString &strMachineBaseName)
 {
     m_strMachineBaseName = strMachineBaseName;
 }
 
-QString UIWizardNewVMPageNameType::guestOSFamiyId() const
+QString UIWizardNewVMPage1::guestOSFamiyId() const
 {
     if (!m_pNameAndSystemEditor)
@@ -375 +375 @@
 }
 
-QString UIWizardNewVMPageNameType::ISOFilePath() const
+QString UIWizardNewVMPage1::ISOFilePath() const
 {
     if (!m_pISOFilePathSelector)
@@ -382 +382 @@
 }
 
-bool UIWizardNewVMPageNameType::isUnattendedEnabled() const
+bool UIWizardNewVMPage1::isUnattendedEnabled() const
 {
     if (!m_pButtonUnattended)
@@ -389 +389 @@
 }
 
-bool UIWizardNewVMPageNameType::startHeadless() const
+bool UIWizardNewVMPage1::startHeadless() const
 {
     if (!m_pStartHeadlessCheckBox)
@@ -396 +396 @@
 }
 
-const QString &UIWizardNewVMPageNameType::detectedOSTypeId() const
+const QString &UIWizardNewVMPage1::detectedOSTypeId() const
 {
     return m_strDetectedOSTypeId;
 }
 
-UIWizardNewVMPageBasicNameType::UIWizardNewVMPageBasicNameType(const QString &strGroup)
-    : UIWizardNewVMPageNameType(strGroup)
+UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+    : UIWizardNewVMPage1(strGroup)
 {
     prepare();
 }
 
-void UIWizardNewVMPageBasicNameType::prepare()
+void UIWizardNewVMPageBasic1::prepare()
 {
     QGridLayout *pMainLayout = new QGridLayout(this);
@@ -439 +439 @@
             pButtonGroup->addButton(m_pButtonUnattended);
             connect(pButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
-                    this, &UIWizardNewVMPageBasicNameType::sltUnattendedCheckBoxToggle);
+                    this, &UIWizardNewVMPageBasic1::sltUnattendedCheckBoxToggle);
         }
 
@@ -458 +458 @@
             m_pISOFilePathSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
             m_pISOFilePathSelector->setEnabled(false);
-            connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasicNameType::sltISOPathChanged);
+            connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasic1::sltISOPathChanged);
             pMainLayout->addWidget(m_pISOFilePathSelector, 3, 2);
         }
@@ -484 +484 @@
         if (m_pNameAndSystemEditor)
         {
-            connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasicNameType::sltNameChanged);
-            connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasicNameType::sltPathChanged);
-            connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasicNameType::sltOsTypeChanged);
+            connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic1::sltNameChanged);
+            connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasic1::sltPathChanged);
+            connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasic1::sltOsTypeChanged);
             pMainLayout->addWidget(m_pNameAndSystemEditor, 6, 1, 1, 2);
         }
@@ -504 +504 @@
 }
 
-int UIWizardNewVMPageBasicNameType::nextId() const
+int UIWizardNewVMPageBasic1::nextId() const
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     if (!pWizard || !pWizard->isUnattendedInstallEnabled())
         return UIWizardNewVM::PageHardware;
-    return UIWizardNewVM::PageUserNameHostname;
-}
-
-void UIWizardNewVMPageBasicNameType::setTypeByISODetectedOSType(const QString &strDetectedOSType)
+    return UIWizardNewVM::Page2;
+}
+
+void UIWizardNewVMPageBasic1::setTypeByISODetectedOSType(const QString &strDetectedOSType)
 {
     if (!strDetectedOSType.isEmpty())
@@ -518 +518 @@
 }
 
-bool UIWizardNewVMPageBasicNameType::isComplete() const
+bool UIWizardNewVMPageBasic1::isComplete() const
 {
     if (m_pNameAndSystemEditor->name().isEmpty())
@@ -525 +525 @@
 }
 
-void UIWizardNewVMPageBasicNameType::sltNameChanged(const QString &strNewName)
+void UIWizardNewVMPageBasic1::sltNameChanged(const QString &strNewName)
 {
     onNameChanged(strNewName);
@@ -531 +531 @@
 }
 
-void UIWizardNewVMPageBasicNameType::sltPathChanged(const QString &strNewPath)
+void UIWizardNewVMPageBasic1::sltPathChanged(const QString &strNewPath)
 {
     Q_UNUSED(strNewPath);
@@ -537 +537 @@
 }
 
-void UIWizardNewVMPageBasicNameType::sltOsTypeChanged()
+void UIWizardNewVMPageBasic1::sltOsTypeChanged()
 {
     /* Call to base-class: */
@@ -543 +543 @@
 }
 
-void UIWizardNewVMPageBasicNameType::sltISOPathChanged(const QString &strPath)
+void UIWizardNewVMPageBasic1::sltISOPathChanged(const QString &strPath)
 {
     determineOSType(strPath);
@@ -550 +550 @@
 }
 
-void UIWizardNewVMPageBasicNameType::sltUnattendedCheckBoxToggle()
+void UIWizardNewVMPageBasic1::sltUnattendedCheckBoxToggle()
 {
     const bool fEnabled = m_pButtonUnattended->isChecked();
@@ -567 +567 @@
 
 
-void UIWizardNewVMPageBasicNameType::retranslateUi()
+void UIWizardNewVMPageBasic1::retranslateUi()
 {
     /* Translate page: */
@@ -617 +617 @@
 }
 
-void UIWizardNewVMPageBasicNameType::initializePage()
+void UIWizardNewVMPageBasic1::initializePage()
 {
     /* Translate page: */
@@ -625 +625 @@
 }
 
-void UIWizardNewVMPageBasicNameType::cleanupPage()
+void UIWizardNewVMPageBasic1::cleanupPage()
 {
     /* Cleanup: */
@@ -633 +633 @@
 }
 
-bool UIWizardNewVMPageBasicNameType::validatePage()
+bool UIWizardNewVMPageBasic1::validatePage()
 {
     /* Try to create machine folder: */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicNameType class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasic1 class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicNameType_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicNameType_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic1_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic1_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -34 +34 @@
 
 /* 1st page of the New Virtual Machine wizard (base part): */
-class UIWizardNewVMPageNameType : public UIWizardPageBase
+class UIWizardNewVMPage1 : public UIWizardPageBase
 {
 protected:
 
     /* Constructor: */
-    UIWizardNewVMPageNameType(const QString &strGroup);
+    UIWizardNewVMPage1(const QString &strGroup);
 
     /* Handlers: */
@@ -117 +117 @@
 
 /* 1st page of the New Virtual Machine wizard (basic extension): */
-class UIWizardNewVMPageBasicNameType : public UIWizardPage, public UIWizardNewVMPageNameType
+class UIWizardNewVMPageBasic1 : public UIWizardPage, public UIWizardNewVMPage1
 {
     Q_OBJECT;
@@ -133 +133 @@
 
     /* Constructor: */
-    UIWizardNewVMPageBasicNameType(const QString &strGroup);
+    UIWizardNewVMPageBasic1(const QString &strGroup);
     virtual int nextId() const /* override */;
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
@@ -170 +170 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicNameType_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic1_h */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicUserNameHostname class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasic2 class implementation.
  */
 
@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QCheckBox>
+#include <QFileInfo>
 #include <QGridLayout>
 #include <QLabel>
+#include <QToolBox>
 #include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QIRichTextLabel.h"
+#include "UIFilePathSelector.h"
 #include "UIUserNamePasswordEditor.h"
-#include "UIWizardNewVMPageBasicUserNameHostname.h"
+#include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVM.h"
 
 
-UIWizardNewVMPageUserNameHostname::UIWizardNewVMPageUserNameHostname()
-    : m_pUserNamePasswordEditor(0)
+UIWizardNewVMPage2::UIWizardNewVMPage2()
+    : m_pToolBox(0)
+    , m_pUserNamePasswordEditor(0)
     , m_pHostnameLineEdit(0)
     , m_pHostnameLabel(0)
-{
-}
-
-QString UIWizardNewVMPageUserNameHostname::userName() const
+    , m_pInstallGACheckBox(0)
+    , m_pISOPathLabel(0)
+    , m_pISOFilePathSelector(0)
+    , m_pProductKeyLineEdit(0)
+    , m_pProductKeyLabel(0)
+
+{
+}
+
+QString UIWizardNewVMPage2::userName() const
 {
     if (m_pUserNamePasswordEditor)
@@ -42 +53 @@
 }
 
-void UIWizardNewVMPageUserNameHostname::setUserName(const QString &strName)
+void UIWizardNewVMPage2::setUserName(const QString &strName)
 {
     if (m_pUserNamePasswordEditor)
@@ -48 +59 @@
 }
 
-QString UIWizardNewVMPageUserNameHostname::password() const
+QString UIWizardNewVMPage2::password() const
 {
     if (m_pUserNamePasswordEditor)
@@ -55 +66 @@
 }
 
-void UIWizardNewVMPageUserNameHostname::setPassword(const QString &strPassword)
+void UIWizardNewVMPage2::setPassword(const QString &strPassword)
 {
     if (m_pUserNamePasswordEditor)
@@ -61 +72 @@
 }
 
-QString UIWizardNewVMPageUserNameHostname::hostname() const
+QString UIWizardNewVMPage2::hostname() const
 {
     if (m_pHostnameLineEdit)
@@ -68 +79 @@
 }
 
-void UIWizardNewVMPageUserNameHostname::setHostname(const QString &strHostName)
+void UIWizardNewVMPage2::setHostname(const QString &strHostName)
 {
     if (m_pHostnameLineEdit)
@@ -74 +85 @@
 }
 
-UIWizardNewVMPageBasicUserNameHostname::UIWizardNewVMPageBasicUserNameHostname()
+bool UIWizardNewVMPage2::installGuestAdditions() const
+{
+    if (!m_pInstallGACheckBox)
+        return true;
+    return m_pInstallGACheckBox->isChecked();
+}
+
+void UIWizardNewVMPage2::setInstallGuestAdditions(bool fInstallGA)
+{
+    if (m_pInstallGACheckBox)
+        m_pInstallGACheckBox->setChecked(fInstallGA);
+}
+
+QString UIWizardNewVMPage2::guestAdditionsISOPath() const
+{
+    if (!m_pISOFilePathSelector)
+        return QString();
+    return m_pISOFilePathSelector->path();
+}
+
+void UIWizardNewVMPage2::setGuestAdditionsISOPath(const QString &strISOPath)
+{
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->setPath(strISOPath);
+}
+
+QString UIWizardNewVMPage2::productKey() const
+{
+    if (!m_pProductKeyLineEdit || !m_pProductKeyLineEdit->hasAcceptableInput())
+        return QString();
+    return m_pProductKeyLineEdit->text();
+}
+
+bool UIWizardNewVMPage2::checkGAISOFile() const
+{
+    if (m_pInstallGACheckBox && m_pInstallGACheckBox->isChecked())
+    {
+        QString strISOFilePath = m_pISOFilePathSelector ? m_pISOFilePathSelector->path() : QString();
+        if (!QFileInfo(strISOFilePath).exists())
+            return false;
+    }
+    return true;
+}
+
+UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
     : m_pLabel(0)
 {
+    prepare();
+}
+
+void UIWizardNewVMPageBasic2::prepare()
+{
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    m_pToolBox = new QToolBox;
+    pMainLayout->addWidget(m_pToolBox);
+
     {
         m_pLabel = new QIRichTextLabel(this);
-        QGridLayout *pGridLayout = new QGridLayout;
-        {
-            m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
-            pGridLayout->addWidget(m_pUserNamePasswordEditor, 0, 0, 3, 4);
-            connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
-                    this, &UIWizardNewVMPageBasicUserNameHostname::completeChanged);
-            m_pHostnameLabel = new QLabel;
-            m_pHostnameLineEdit = new QLineEdit;
-            pGridLayout->addWidget(m_pHostnameLabel, 3, 0, 1, 1, Qt::AlignRight);
-            pGridLayout->addWidget(m_pHostnameLineEdit, 3, 1, 1, 3);
-        }
         if (m_pLabel)
             pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addLayout(pGridLayout);
+        pMainLayout->addWidget(m_pToolBox);
         pMainLayout->addStretch();
     }
+
+    createUserNameHostNameWidgets();
+    createGAInstallWidgets();
+    createProductKeyWidgets();
 
     registerField("userName", this, "userName");
     registerField("password", this, "password");
     registerField("hostname", this, "hostname");
-}
-
-void UIWizardNewVMPageBasicUserNameHostname::retranslateUi()
+    registerField("installGuestAdditions", this, "installGuestAdditions");
+    registerField("guestAdditionsISOPath", this, "guestAdditionsISOPath");
+    registerField("productKey", this, "productKey");
+}
+
+void UIWizardNewVMPageBasic2::createUserNameHostNameWidgets()
+{
+    if (!m_pToolBox)
+        return;
+    QWidget *pContainer = new QWidget;
+    QGridLayout *pGridLayout = new QGridLayout(pContainer);
+
+    m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
+    pGridLayout->addWidget(m_pUserNamePasswordEditor, 0, 0, 3, 4);
+    connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
+            this, &UIWizardNewVMPageBasic2::completeChanged);
+    m_pHostnameLabel = new QLabel;
+    m_pHostnameLineEdit = new QLineEdit;
+    pGridLayout->addWidget(m_pHostnameLabel, 3, 0, 1, 1, Qt::AlignRight);
+    pGridLayout->addWidget(m_pHostnameLineEdit, 3, 1, 1, 3);
+
+    m_pToolBox->insertItem(Tabs_UserNameHostname, pContainer, QString());
+
+}
+
+void UIWizardNewVMPageBasic2::createGAInstallWidgets()
+{
+    if (!m_pToolBox)
+        return;
+    QWidget *pContainer = new QWidget;
+    QGridLayout *pContainerLayout = new QGridLayout(pContainer);
+
+    m_pInstallGACheckBox = new QCheckBox;
+    connect(m_pInstallGACheckBox, &QCheckBox::toggled, this, &UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle);
+    m_pISOPathLabel = new QLabel;
+    {
+        m_pISOPathLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+        m_pISOPathLabel->setEnabled(false);
+    }
+    m_pISOFilePathSelector = new UIFilePathSelector;
+    {
+        m_pISOFilePathSelector->setResetEnabled(false);
+        m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
+        m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
+        m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+        m_pISOFilePathSelector->setEnabled(false);
+        connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasic2::sltGAISOPathChanged);
+    }
+
+    pContainerLayout->addWidget(m_pInstallGACheckBox, 0, 0, 1, 5);
+    pContainerLayout->addWidget(m_pISOPathLabel, 1, 1, 1, 1);
+    pContainerLayout->addWidget(m_pISOFilePathSelector, 1, 2, 1, 4);
+
+    m_pToolBox->insertItem(Tabs_GAInstall, pContainer, QString());
+}
+
+void UIWizardNewVMPageBasic2::createProductKeyWidgets()
+{
+    if (!m_pToolBox)
+        return;
+    QWidget *pContainer = new QWidget;
+    QGridLayout *pGridLayout = new QGridLayout(pContainer);
+
+
+    m_pProductKeyLabel = new QLabel;
+    m_pProductKeyLineEdit = new QLineEdit;
+    m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
+    pGridLayout->addWidget(m_pProductKeyLabel, 0, 0, 1, 1, Qt::AlignRight);
+    pGridLayout->addWidget(m_pProductKeyLineEdit, 0, 1, 1, 3);
+
+    m_pToolBox->insertItem(Tabs_ProductKey, pContainer, QString());
+}
+
+void UIWizardNewVMPageBasic2::retranslateUi()
 {
     setTitle(UIWizardNewVM::tr("User Name/Password and Hostname Settings"));
@@ -110 +237 @@
     if (m_pHostnameLabel)
         m_pHostnameLabel->setText(UIWizardNewVM::tr("Hostname:"));
-}
-
-void UIWizardNewVMPageBasicUserNameHostname::initializePage()
+    if (m_pToolBox)
+    {
+        m_pToolBox->setItemText(Tabs_UserNameHostname, UIWizardNewVM::tr("UserName and hostname"));
+        m_pToolBox->setItemText(Tabs_GAInstall, UIWizardNewVM::tr("Guest additions install"));
+        m_pToolBox->setItemText(Tabs_ProductKey, UIWizardNewVM::tr("Product key"));
+    }
+    if (m_pInstallGACheckBox)
+        m_pInstallGACheckBox->setText(UIWizardNewVM::tr("Install guest additions"));
+    if (m_pISOPathLabel)
+        m_pISOPathLabel->setText(UIWizardNewVM::tr("Installation medium:"));
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->setToolTip(UIWizardNewVM::tr("Please select an installation medium (ISO file)"));
+    if (m_pProductKeyLabel)
+        m_pProductKeyLabel->setText(UIWizardNewVM::tr("Product Key:"));
+}
+
+void UIWizardNewVMPageBasic2::initializePage()
 {
     retranslateUi();
 }
 
-bool UIWizardNewVMPageBasicUserNameHostname::isComplete() const
-{
+bool UIWizardNewVMPageBasic2::isComplete() const
+{
+    if (!checkGAISOFile())
+        return false;
     if (m_pUserNamePasswordEditor)
         return m_pUserNamePasswordEditor->isComplete();
@@ -124 +267 @@
 }
 
-void UIWizardNewVMPageBasicUserNameHostname::cleanupPage()
-{
-}
+void UIWizardNewVMPageBasic2::cleanupPage()
+{
+}
+
+void UIWizardNewVMPageBasic2::showEvent(QShowEvent *pEvent)
+{
+    if (m_pToolBox)
+    {
+        QWidget *pProductKeyWidget = m_pToolBox->widget(Tabs_ProductKey);
+        if (pProductKeyWidget)
+            pProductKeyWidget->setEnabled(isProductKeyWidgetVisible());
+    }
+    UIWizardPage::showEvent(pEvent);
+}
+
+void UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle(bool fEnabled)
+{
+    if (m_pISOPathLabel)
+        m_pISOPathLabel->setEnabled(fEnabled);
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->setEnabled(fEnabled);
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageBasic2::sltGAISOPathChanged(const QString &strPath)
+{
+    Q_UNUSED(strPath);
+    emit completeChanged();
+}
+
+bool UIWizardNewVMPageBasic2::isProductKeyWidgetVisible() const
+{
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (!pWizard || !pWizard->isUnattendedInstallEnabled() || !pWizard->isGuestOSTypeWindows())
+        return false;
+    return true;
+}

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicUserNameHostname class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasic2 class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUserNameHostname_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUserNameHostname_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -27 +27 @@
 
 /* Forward declarations: */
+class QCheckBox;
 class QGridLayout;
 class QLabel;
 class QLineEdit;
+class QToolBox;
 class QIRichTextLabel;
+class UIFilePathSelector;
 class UIUserNamePasswordEditor;
 struct UIUnattendedInstallData;
 
 
-class UIWizardNewVMPageUserNameHostname : public UIWizardPageBase
+class UIWizardNewVMPage2 : public UIWizardPageBase
 {
 public:
 
-    UIWizardNewVMPageUserNameHostname();
+    UIWizardNewVMPage2();
 
     /** @name Property getters/setters
@@ -49 +52 @@
         QString hostname() const;
         void setHostname(const QString &strHostName);
+        bool installGuestAdditions() const;
+        void setInstallGuestAdditions(bool fInstallGA);
+        QString guestAdditionsISOPath() const;
+        void setGuestAdditionsISOPath(const QString &strISOPath);
+        QString productKey() const;
     /** @} */
 
 protected:
+    enum Tabs
+    {
+        Tabs_UserNameHostname,
+        Tabs_GAInstall,
+        Tabs_ProductKey,
+        Tabs_Max
+    };
 
-    UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
-    QLineEdit *m_pHostnameLineEdit;
-    QLabel  *m_pHostnameLabel;
+    bool checkGAISOFile() const;
+
+    /** @name Widgets
+      * @{ */
+        QToolBox *m_pToolBox;
+        UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
+        QLineEdit *m_pHostnameLineEdit;
+        QLabel  *m_pHostnameLabel;
+        /** Guest additions iso selection widgets. */
+        QCheckBox *m_pInstallGACheckBox;
+        QLabel  *m_pISOPathLabel;
+        UIFilePathSelector *m_pISOFilePathSelector;
+        /** Product key stuff. */
+        QLineEdit *m_pProductKeyLineEdit;
+        QLabel  *m_pProductKeyLabel;
+    /** @} */
+
 };
 
-class UIWizardNewVMPageBasicUserNameHostname : public UIWizardPage, public UIWizardNewVMPageUserNameHostname
+class UIWizardNewVMPageBasic2 : public UIWizardPage, public UIWizardNewVMPage2
 {
     Q_OBJECT;
@@ -64 +93 @@
     Q_PROPERTY(QString password READ password WRITE setPassword);
     Q_PROPERTY(QString hostname READ hostname WRITE setHostname);
+    Q_PROPERTY(bool installGuestAdditions READ installGuestAdditions WRITE setInstallGuestAdditions);
+    Q_PROPERTY(QString guestAdditionsISOPath READ guestAdditionsISOPath WRITE setGuestAdditionsISOPath);
+    Q_PROPERTY(QString productKey READ productKey);
+
 
 public:
 
-    UIWizardNewVMPageBasicUserNameHostname();
+    UIWizardNewVMPageBasic2();
+
+protected:
+
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
 
 private slots:
 
+    void sltInstallGACheckBoxToggle(bool fChecked);
+    void sltGAISOPathChanged(const QString &strPath);
+
 private:
 
+    void prepare();
+    void createUserNameHostNameWidgets();
+    void createGAInstallWidgets();
+    void createProductKeyWidgets();
     void retranslateUi();
     void initializePage();
     bool isComplete() const;
+    /** Returns true if we show the widgets for guest os product key. */
+    bool isProductKeyWidgetVisible() const;
 
     /** Override the default behavior which resets the fields to proginal values. */
@@ -83 +129 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUserNameHostname_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h */

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

@@ -40 +40 @@
 
 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
-    : UIWizardNewVMPageNameType(strGroup)
+    : UIWizardNewVMPage1(strGroup)
 {
     /* Create widgets: */

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

@@ -32 +32 @@
 /* Expert page of the New Virtual Machine wizard: */
 class UIWizardNewVMPageExpert : public UIWizardPage,
-                                public UIWizardNewVMPageNameType,
+                                public UIWizardNewVMPage1,
                                 public UIWizardNewVMPageHardware,
                                 public UIWizardNewVMPageDisk