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

Timestamp:

Jun 30, 2020 6:40:35 AM (5 years ago)

Author:

vboxsync

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

138898

Message:

FE/Qt: bugref:9515. Adding another wizard page for GA install.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (5 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicProductKey.cpp ) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicProductKey.h ) (3 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicNameType.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasicProductKey.cpp (modified) (4 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicProductKey.h (modified) (3 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicUnattended.cpp (modified) (3 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicUnattended.h (modified) (4 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicInstallSetup.cpp ) (14 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicInstallSetup.h ) (7 diffs)

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

@@ -668 +668 @@
         src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h \
         src/wizards/newvm/UIWizardNewVM.h \
-        src/wizards/newvm/UIWizardNewVMPageBasicInstallSetup.h \
+        src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.h \
         src/wizards/newvm/UIWizardNewVMPageBasicUnattended.h \
         src/wizards/newvm/UIWizardNewVMPageBasicNameType.h \
+        src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.h \
         src/wizards/newvm/UIWizardNewVMPageBasicHardware.h \
         src/wizards/newvm/UIWizardNewVMPageBasicProductKey.h \
@@ -1132 +1133 @@
         src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp \
         src/wizards/newvm/UIWizardNewVM.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasicInstallSetup.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicUnattended.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicNameType.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicProductKey.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -619 +619 @@
         unattendedInstallData.m_fInstallGuestAdditions = comUnattendedInstaller.GetInstallGuestAdditions();
         unattendedInstallData.m_strGuestAdditionsISOPath = comUnattendedInstaller.GetAdditionsIsoPath();
-
         pWizard->setDefaultUnattendedInstallData(unattendedInstallData);
 
@@ -1901 +1900 @@
     comUnattendedInstaller.SetHostname(unattendedData.m_strHostname);
     comUnattendedInstaller.SetProductKey(unattendedData.m_strProductKey);
+    comUnattendedInstaller.SetInstallGuestAdditions(unattendedData.m_fInstallGuestAdditions);
+    comUnattendedInstaller.SetAdditionsIsoPath(unattendedData.m_strGuestAdditionsISOPath);
 
     comUnattendedInstaller.Prepare();

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

@@ -23 +23 @@
 #include "UIWizardNewVMPageBasicHardware.h"
 #include "UIWizardNewVMPageBasicProductKey.h"
+#include "UIWizardNewVMPageBasicGAInstall.h"
 #include "UIWizardNewVMPageBasicDisk.h"
 #include "UIWizardNewVMPageExpert.h"
-#include "UIWizardNewVMPageBasicInstallSetup.h"
+#include "UIWizardNewVMPageBasicUserNameHostname.h"
 #include "UIMessageCenter.h"
 #include "UIMedium.h"
@@ -83 +84 @@
             setPage(PageUnattended, pUnattendedPage);
             setPage(PageNameType, new UIWizardNewVMPageBasicNameType(m_strGroup));
-            setPage(PageInstallSetup, new UIWizardNewVMPageBasicInstallSetup);
+            setPage(PageUserNameHostname, new UIWizardNewVMPageBasicUserNameHostname);
+            setPage(PageGAInstall, new UIWizardNewVMPageBasicGAInstall);
             setPage(PageProductKey, new UIWizardNewVMPageBasicProductKey);
             setPage(PageHardware, new UIWizardNewVMPageBasicHardware);
@@ -396 +398 @@
 }
 
+bool UIWizardNewVM::getBoolFieldValue(const QString &strFieldName) const
+{
+    QVariant fieldValue = field(strFieldName);
+    if (!fieldValue.isNull() && fieldValue.isValid() && fieldValue.canConvert(QMetaType::Bool))
+        return fieldValue.toBool();
+    return false;
+}
+
 void UIWizardNewVM::sltHandleWizardCancel()
 {
@@ -510 +520 @@
     setField("password", unattendedInstallData.m_strPassword);
     setField("hostname", unattendedInstallData.m_strHostname);
+    setField("installGuestAdditions", unattendedInstallData.m_fInstallGuestAdditions);
+    setField("guestAdditionsISOPath", unattendedInstallData.m_strGuestAdditionsISOPath);
 }
 
@@ -524 +536 @@
     m_unattendedInstallData.m_strDetectedOSHints = getStringFieldValue("detectedOSHints");
     m_unattendedInstallData.m_strProductKey = getStringFieldValue("productKey");
-
-    QVariant fieldValue = field("isUnattendedEnabled");
-    if (!fieldValue.isNull() && fieldValue.isValid() && fieldValue.canConvert(QMetaType::Bool))
-        m_unattendedInstallData.m_fUnattendedEnabled = fieldValue.toBool();
-
-    fieldValue = field("startHeadless");
-    if (!fieldValue.isNull() && fieldValue.isValid() && fieldValue.canConvert(QMetaType::Bool))
-        m_unattendedInstallData.m_fStartHeadless = fieldValue.toBool();
+    m_unattendedInstallData.m_strGuestAdditionsISOPath = getStringFieldValue("guestAdditionsISOPath");
+
+    m_unattendedInstallData.m_fUnattendedEnabled = getBoolFieldValue("isUnattendedEnabled");
+    m_unattendedInstallData.m_fStartHeadless = getBoolFieldValue("startHeadless");
+    m_unattendedInstallData.m_fInstallGuestAdditions = getBoolFieldValue("installGuestAdditions");
 
     m_unattendedInstallData.m_uMachineUid = createdMachineId();

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

@@ -62 +62 @@
         PageUnattended,
         PageNameType,
-        PageInstallSetup,
+        PageUserNameHostname,
+        PageGAInstall,
         PageProductKey,
         PageHardware,
@@ -98 +99 @@
 
     QString getStringFieldValue(const QString &strFieldName) const;
+    bool getBoolFieldValue(const QString &strFieldName) const;
 
     /* Who will be able to create virtual-machine: */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicProductKey class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasicGAInstall class implementation.
  */
 
@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QComboBox>
-#include <QGridLayout>
+#include <QCheckBox>
+#include <QFileInfo>
 #include <QLabel>
 #include <QLineEdit>
-#include <QSpacerItem>
-#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
 
 /* GUI includes: */
 #include "QIRichTextLabel.h"
-#include "UIIconPool.h"
-#include "UIWizardNewVMPageBasicProductKey.h"
+#include "UICommon.h"
+#include "UIFilePathSelector.h"
+#include "UIMessageCenter.h"
+#include "UINameAndSystemEditor.h"
+#include "UIWizardNewVMPageBasicGAInstall.h"
 #include "UIWizardNewVM.h"
 
-UIWizardNewVMPageProductKey::UIWizardNewVMPageProductKey()
-    : m_pProductKeyLineEdit(0)
-    , m_pHostnameLabel(0)
+/* COM includes: */
+#include "CHost.h"
+#include "CUnattended.h"
+
+UIWizardNewVMPageGAInstall::UIWizardNewVMPageGAInstall()
+    : m_pInstallGACheckBox(0)
+    , m_pISOPathLabel(0)
+    , m_pISOFilePathSelector(0)
 {
 }
 
-QString UIWizardNewVMPageProductKey::productKey() const
+bool UIWizardNewVMPageGAInstall::installGuestAdditions() const
 {
-    if (!m_pProductKeyLineEdit || !m_pProductKeyLineEdit->hasAcceptableInput())
-        return QString();
-    return m_pProductKeyLineEdit->text();
+    if (!m_pInstallGACheckBox)
+        return true;
+    return m_pInstallGACheckBox->isChecked();
 }
 
+void UIWizardNewVMPageGAInstall::setInstallGuestAdditions(bool fInstallGA)
+{
+    if (m_pInstallGACheckBox)
+        m_pInstallGACheckBox->setChecked(fInstallGA);
+}
 
-UIWizardNewVMPageBasicProductKey::UIWizardNewVMPageBasicProductKey()
-    : m_pLabel(0)
+QString UIWizardNewVMPageGAInstall::guestAdditionsISOPath() const
 {
-    /* Create widget: */
+    if (!m_pISOFilePathSelector)
+        return QString();
+    return m_pISOFilePathSelector->path();
+}
+
+void UIWizardNewVMPageGAInstall::setGuestAdditionsISOPath(const QString &strISOPath)
+{
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->setPath(strISOPath);
+}
+
+UIWizardNewVMPageBasicGAInstall::UIWizardNewVMPageBasicGAInstall()
+    : UIWizardNewVMPageGAInstall()
+{
+    /* Create widgets: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
         m_pLabel = new QIRichTextLabel(this);
-        QGridLayout *pGridLayout = new QGridLayout;
+        m_pInstallGACheckBox = new QCheckBox;
+        connect(m_pInstallGACheckBox, &QCheckBox::toggled, this, &UIWizardNewVMPageBasicGAInstall::sltInstallGACheckBoxToggle);
+        m_pISOPathLabel = new QLabel;
         {
-            m_pHostnameLabel = new QLabel;
-            m_pProductKeyLineEdit = new QLineEdit;
-            m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
-            pGridLayout->addWidget(m_pHostnameLabel, 3, 0, 1, 1, Qt::AlignRight);
-            pGridLayout->addWidget(m_pProductKeyLineEdit, 3, 1, 1, 3);
+            m_pISOPathLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+            m_pISOPathLabel->setEnabled(false);
         }
-        if (m_pLabel)
-            pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addLayout(pGridLayout);
+        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, &UIWizardNewVMPageBasicGAInstall::sltPathChanged);
+        }
+        pMainLayout->addWidget(m_pLabel);
+
+        QGridLayout *pISOSelectorLayout = new QGridLayout;
+        pISOSelectorLayout->addWidget(m_pInstallGACheckBox, 0, 0, 1, 5);
+        pISOSelectorLayout->addWidget(m_pISOPathLabel, 1, 1, 1, 1);
+        pISOSelectorLayout->addWidget(m_pISOFilePathSelector, 1, 2, 1, 4);
+
+        pMainLayout->addLayout(pISOSelectorLayout);
         pMainLayout->addStretch();
     }
 
     /* Register fields: */
-    registerField("productKey", this, "productKey");
+    registerField("installGuestAdditions", this, "installGuestAdditions");
+    registerField("guestAdditionsISOPath", this, "guestAdditionsISOPath");
 }
 
-void UIWizardNewVMPageBasicProductKey::retranslateUi()
+bool UIWizardNewVMPageBasicGAInstall::isComplete() const
+{
+    return checkISOFile();
+}
+
+int UIWizardNewVMPageBasicGAInstall::nextId() const
+{
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (!pWizard || !pWizard->isUnattendedInstallEnabled() || !pWizard->isGuestOSTypeWindows())
+        return UIWizardNewVM::PageHardware;
+    return UIWizardNewVM::PageProductKey;
+}
+
+void UIWizardNewVMPageBasicGAInstall::sltInstallGACheckBoxToggle(bool fEnabled)
+{
+    if (m_pISOPathLabel)
+        m_pISOPathLabel->setEnabled(fEnabled);
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->setEnabled(fEnabled);
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageBasicGAInstall::sltPathChanged(const QString &strPath)
+{
+    Q_UNUSED(strPath);
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageBasicGAInstall::retranslateUi()
 {
     /* Translate page: */
-    setTitle(UIWizardNewVM::tr("Product Key"));
+    setTitle(UIWizardNewVM::tr("Unattended Guest OS Install"));
 
     /* Translate widgets: */
-    if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("<p>You can enter the product key for the guest OS."));
-    if (m_pHostnameLabel)
-        m_pHostnameLabel->setText(UIWizardNewVM::tr("Hostname:"));
+    m_pLabel->setText(UIWizardNewVM::tr("<p>Guest Additions install</p>"));
+    m_pInstallGACheckBox->setText(UIWizardNewVM::tr("Install guest additions"));
+    m_pISOPathLabel->setText(UIWizardNewVM::tr("Installation medium:"));
+    m_pISOFilePathSelector->setToolTip(UIWizardNewVM::tr("Please select an installation medium (ISO file)"));
 }
 
-void UIWizardNewVMPageBasicProductKey::initializePage()
+bool UIWizardNewVMPageGAInstall::checkISOFile() const
+{
+    if (m_pInstallGACheckBox && m_pInstallGACheckBox->isChecked())
+    {
+        QString strISOFilePath = m_pISOFilePathSelector ? m_pISOFilePathSelector->path() : QString();
+        if (!QFileInfo(strISOFilePath).exists())
+            return false;
+    }
+    return true;
+}
+
+void UIWizardNewVMPageBasicGAInstall::initializePage()
 {
     /* Translate page: */
     retranslateUi();
+    if (m_pInstallGACheckBox)
+        m_pInstallGACheckBox->setFocus();
 }
 
-bool UIWizardNewVMPageBasicProductKey::isComplete() const
-{
-    return true;
-}
+// void UIWizardNewVMPageBasicGAInstall::cleanupPage()
+// {
+//     UIWizardPage::cleanupPage();
+// }
+
+// bool UIWizardNewVMPageBasicGAInstall::validatePage()
+// {
+//     return checkISOFile();
+// }
+
+// void UIWizardNewVMPageBasicGAInstall::updateStatusLabel()
+// {
+//     UIWizardNewVMPageGAInstall::updateStatusLabel();
+//     emit sigDetectedOSTypeChanged();
+// }

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicProductKey class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasicGAInstall class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicProductKey_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicProductKey_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicGAInstall_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicGAInstall_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -28 +28 @@
 
 /* Forward declarations: */
+class QCheckBox;
 class QLabel;
 class QLineEdit;
 class QIRichTextLabel;
+class UIFilePathSelector;
 
-class UIWizardNewVMPageProductKey : public UIWizardPageBase
+class UIWizardNewVMPageGAInstall : public UIWizardPageBase
 {
 public:
 
-    UIWizardNewVMPageProductKey();
+    UIWizardNewVMPageGAInstall();
 
     /** @name Property getters
       * @{ */
-    QString productKey() const;
+        QString productKey() const;
+        bool installGuestAdditions() const;
+        void setInstallGuestAdditions(bool fInstallGA);
+        QString guestAdditionsISOPath() const;
+        void setGuestAdditionsISOPath(const QString &strISOPath);
     /** @} */
 
 protected:
 
-    /* Widgets: */
-    QLineEdit *m_pProductKeyLineEdit;
-    QLabel  *m_pHostnameLabel;
+    bool checkISOFile() const;
+
+    /** @name Widgets
+      * @{ */
+        QCheckBox *m_pInstallGACheckBox;
+        QLabel  *m_pISOPathLabel;
+        UIFilePathSelector *m_pISOFilePathSelector;
+    /** @} */
+
 };
 
-/* 2nd page of the New Virtual Machine wizard (basic extension): */
-class UIWizardNewVMPageBasicProductKey : public UIWizardPage, public UIWizardNewVMPageProductKey
+class UIWizardNewVMPageBasicGAInstall : public UIWizardPage, public UIWizardNewVMPageGAInstall
 {
     Q_OBJECT;
-    Q_PROPERTY(QString productKey READ productKey);
+    Q_PROPERTY(bool installGuestAdditions READ installGuestAdditions WRITE setInstallGuestAdditions);
+    Q_PROPERTY(QString guestAdditionsISOPath READ guestAdditionsISOPath WRITE setGuestAdditionsISOPath);
 
 public:
 
-    /* Constructor: */
-    UIWizardNewVMPageBasicProductKey();
+    UIWizardNewVMPageBasicGAInstall();
+    virtual int nextId() const /* override */;
 
 private slots:
 
+    void sltInstallGACheckBoxToggle(bool fChecked);
+    void sltPathChanged(const QString &strPath);
+
 private:
 
-    /* Translation stuff: */
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
-
-    /* Validation stuff: */
     bool isComplete() const;
 
-    /* Widgets: */
     QIRichTextLabel *m_pLabel;
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicProductKey_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicGAInstall_h */

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

@@ -358 +358 @@
     if (!pWizard || !pWizard->isUnattendedInstallEnabled())
         return UIWizardNewVM::PageHardware;
-    return UIWizardNewVM::PageInstallSetup;
+    return UIWizardNewVM::PageUserNameHostname;
 }
 

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

@@ -47 +47 @@
     : m_pLabel(0)
 {
-    /* Create widget: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
@@ -65 +64 @@
     }
 
-    /* Register fields: */
     registerField("productKey", this, "productKey");
 }
@@ -71 +69 @@
 void UIWizardNewVMPageBasicProductKey::retranslateUi()
 {
-    /* Translate page: */
     setTitle(UIWizardNewVM::tr("Product Key"));
 
-    /* Translate widgets: */
     if (m_pLabel)
         m_pLabel->setText(UIWizardNewVM::tr("<p>You can enter the product key for the guest OS."));
@@ -83 +79 @@
 void UIWizardNewVMPageBasicProductKey::initializePage()
 {
-    /* Translate page: */
     retranslateUi();
 }

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

@@ -40 +40 @@
     /** @name Property getters
       * @{ */
-    QString productKey() const;
+        QString productKey() const;
     /** @} */
 
 protected:
 
-    /* Widgets: */
-    QLineEdit *m_pProductKeyLineEdit;
-    QLabel  *m_pHostnameLabel;
+    /** @name Widgets
+      * @{ */
+        QLineEdit *m_pProductKeyLineEdit;
+        QLabel  *m_pHostnameLabel;
+    /** @} */
+
 };
 
-/* 2nd page of the New Virtual Machine wizard (basic extension): */
 class UIWizardNewVMPageBasicProductKey : public UIWizardPage, public UIWizardNewVMPageProductKey
 {
@@ -58 +60 @@
 public:
 
-    /* Constructor: */
     UIWizardNewVMPageBasicProductKey();
 
@@ -65 +66 @@
 private:
 
-    /* Translation stuff: */
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
-
-    /* Validation stuff: */
     bool isComplete() const;
 
-    /* Widgets: */
     QIRichTextLabel *m_pLabel;
 };

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

@@ -35 +35 @@
 /* COM includes: */
 #include "CHost.h"
-#include "CSystemProperties.h"
 #include "CUnattended.h"
 
@@ -167 +166 @@
         pISOSelectorLayout->addWidget(m_pISOSelectorLabel, 1, 1, 1, 1);
         pISOSelectorLayout->addWidget(m_pISOFilePathSelector, 1, 2, 1, 4);
-        pISOSelectorLayout->addWidget(m_pStartHeadlessCheckBox, 2, 2, 1, 5);
-        pISOSelectorLayout->addWidget(m_pStatusLabel, 3, 2, 1, 5);
+        pISOSelectorLayout->addWidget(m_pStartHeadlessCheckBox, 2, 2, 1, 1);
+        pISOSelectorLayout->addWidget(m_pStatusLabel, 3, 2, 1, 1);
 
         pMainLayout->addLayout(pISOSelectorLayout);
@@ -218 +217 @@
     m_pLabel->setText(UIWizardNewVM::tr("You can enable the unattended (automated) guest OS install "
                                         "and select an installation medium. The guest OS will be "
-                                        "installed after this window is closed. "));
+                                        "installed after this wizard is closed. "));
     m_pUnattendedCheckBox->setText(UIWizardNewVM::tr("Enable unattended guest OS Install"));
     m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installation medium:"));

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

@@ -32 +32 @@
 class UIFilePathSelector;
 
-/* 1st page of the New Virtual Machine wizard (base part): */
 class UIWizardNewVMPageUnattended : public UIWizardPageBase
 {
@@ -99 +98 @@
 public:
 
-    /* Constructor: */
     UIWizardNewVMPageBasicUnattended();
     virtual bool isComplete() const; /* override */
@@ -105 +103 @@
 protected:
 
-    /* Wrapper to access 'this' from base part: */
     UIWizardPage* thisImp() { return this; }
     virtual void updateStatusLabel();
@@ -118 +115 @@
     /** Returns false if user selects unattended install and does not provide a valid ISO file path. Else returns true. */
     bool checkISOFile() const;
-
-    /* Translation stuff: */
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
     void cleanupPage();
-
-    /* Validation stuff: */
     virtual bool validatePage() /* override */;
 
-    /* Widgets: */
     QIRichTextLabel *m_pLabel;
 };

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicInstallSetup class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasicUserNameHostname class implementation.
  */
 
@@ -24 +24 @@
 #include "QIRichTextLabel.h"
 #include "UIUserNamePasswordEditor.h"
-#include "UIWizardNewVMPageBasicInstallSetup.h"
+#include "UIWizardNewVMPageBasicUserNameHostname.h"
 #include "UIWizardNewVM.h"
 
 
-UIWizardNewVMPageInstallSetup::UIWizardNewVMPageInstallSetup()
+UIWizardNewVMPageUserNameHostname::UIWizardNewVMPageUserNameHostname()
     : m_pUserNamePasswordEditor(0)
     , m_pHostnameLineEdit(0)
@@ -35 +35 @@
 }
 
-QString UIWizardNewVMPageInstallSetup::userName() const
+QString UIWizardNewVMPageUserNameHostname::userName() const
 {
     if (m_pUserNamePasswordEditor)
@@ -42 +42 @@
 }
 
-void UIWizardNewVMPageInstallSetup::setUserName(const QString &strName)
+void UIWizardNewVMPageUserNameHostname::setUserName(const QString &strName)
 {
     if (m_pUserNamePasswordEditor)
@@ -48 +48 @@
 }
 
-QString UIWizardNewVMPageInstallSetup::password() const
+QString UIWizardNewVMPageUserNameHostname::password() const
 {
     if (m_pUserNamePasswordEditor)
@@ -55 +55 @@
 }
 
-void UIWizardNewVMPageInstallSetup::setPassword(const QString &strPassword)
+void UIWizardNewVMPageUserNameHostname::setPassword(const QString &strPassword)
 {
     if (m_pUserNamePasswordEditor)
@@ -61 +61 @@
 }
 
-QString UIWizardNewVMPageInstallSetup::hostname() const
+QString UIWizardNewVMPageUserNameHostname::hostname() const
 {
     if (m_pHostnameLineEdit)
@@ -68 +68 @@
 }
 
-void UIWizardNewVMPageInstallSetup::setHostname(const QString &strHostName)
+void UIWizardNewVMPageUserNameHostname::setHostname(const QString &strHostName)
 {
     if (m_pHostnameLineEdit)
@@ -74 +74 @@
 }
 
-UIWizardNewVMPageBasicInstallSetup::UIWizardNewVMPageBasicInstallSetup()
+UIWizardNewVMPageBasicUserNameHostname::UIWizardNewVMPageBasicUserNameHostname()
     : m_pLabel(0)
 {
-    /* Create widget: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
@@ -86 +85 @@
             pGridLayout->addWidget(m_pUserNamePasswordEditor, 0, 0, 3, 4);
             connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
-                    this, &UIWizardNewVMPageBasicInstallSetup::completeChanged);
+                    this, &UIWizardNewVMPageBasicUserNameHostname::completeChanged);
             m_pHostnameLabel = new QLabel;
             m_pHostnameLineEdit = new QLineEdit;
@@ -98 +97 @@
     }
 
-    /* Register fields: */
     registerField("userName", this, "userName");
     registerField("password", this, "password");
@@ -104 +102 @@
 }
 
-void UIWizardNewVMPageBasicInstallSetup::retranslateUi()
+void UIWizardNewVMPageBasicUserNameHostname::retranslateUi()
 {
-    /* Translate page: */
     setTitle(UIWizardNewVM::tr("User Name/Password and Hostname Settings"));
-
-    /* Translate widgets: */
     if (m_pLabel)
         m_pLabel->setText(UIWizardNewVM::tr("<p>Here you can specify the user name/password and hostname. "
@@ -117 +112 @@
 }
 
-void UIWizardNewVMPageBasicInstallSetup::initializePage()
+void UIWizardNewVMPageBasicUserNameHostname::initializePage()
 {
-    /* Translate page: */
     retranslateUi();
 }
 
-bool UIWizardNewVMPageBasicInstallSetup::isComplete() const
+bool UIWizardNewVMPageBasicUserNameHostname::isComplete() const
 {
     if (m_pUserNamePasswordEditor)
@@ -130 +124 @@
 }
 
-int UIWizardNewVMPageBasicInstallSetup::nextId() const
+void UIWizardNewVMPageBasicUserNameHostname::cleanupPage()
 {
-    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    if (!pWizard || !pWizard->isUnattendedInstallEnabled() || !pWizard->isGuestOSTypeWindows())
-        return UIWizardNewVM::PageHardware;
-    return UIWizardNewVM::PageProductKey;
 }

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasicInstallSetup class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasicUserNameHostname class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicInstallSetup_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicInstallSetup_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUserNameHostname_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUserNameHostname_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -35 +35 @@
 
 
-class UIWizardNewVMPageInstallSetup : public UIWizardPageBase
+class UIWizardNewVMPageUserNameHostname : public UIWizardPageBase
 {
 public:
 
-    UIWizardNewVMPageInstallSetup();
+    UIWizardNewVMPageUserNameHostname();
 
     /** @name Property getters/setters
@@ -53 +53 @@
 protected:
 
-    /* Widgets: */
     UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
     QLineEdit *m_pHostnameLineEdit;
@@ -59 +58 @@
 };
 
-class UIWizardNewVMPageBasicInstallSetup : public UIWizardPage, public UIWizardNewVMPageInstallSetup
+class UIWizardNewVMPageBasicUserNameHostname : public UIWizardPage, public UIWizardNewVMPageUserNameHostname
 {
     Q_OBJECT;
@@ -68 +67 @@
 public:
 
-    /* Constructor: */
-    UIWizardNewVMPageBasicInstallSetup();
-    virtual int nextId() const /* override */;
+    UIWizardNewVMPageBasicUserNameHostname();
 
 private slots:
@@ -76 +73 @@
 private:
 
-    /* Translation stuff: */
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
-
-    /* Validation stuff: */
     bool isComplete() const;
 
-    /* Widgets: */
+    /** Override the default behavior which resets the fields to proginal values. */
+    void cleanupPage() /* override */;
+
     QIRichTextLabel *m_pLabel;
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicInstallSetup_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUserNameHostname_h */