Changeset 87322 in vbox

Timestamp:

Jan 20, 2021 12:45:43 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. More cleaning

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (4 diffs)
• UIWizardNewVM.h (modified) (1 diff)
• UIWizardNewVMPageBasic1.cpp (modified) (11 diffs)
• UIWizardNewVMPageBasic1.h (modified) (4 diffs)
• UIWizardNewVMPageBasic2.cpp (modified) (11 diffs)
• UIWizardNewVMPageBasic2.h (modified) (4 diffs)
• UIWizardNewVMPageBasic3.cpp (modified) (3 diffs)
• UIWizardNewVMPageBasic3.h (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (10 diffs)
• UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -130 +130 @@
          * Usually we are assigning extra-data values through UIExtraDataManager,
          * but in that special case VM was not registered yet, so UIExtraDataManager is unaware of it: */
-        if (!isUnattendedInstallEnabled() &&
+        if (!isUnattendedEnabled() &&
             (field("virtualDiskId").toString().isNull() || !field("virtualDisk").value<CMedium>().isNull()))
             m_machine.SetExtraData(GUI_FirstRun, "yes");
@@ -525 +525 @@
     setField("password", m_unattendedInstallData.m_strPassword);
     setField("hostname", m_unattendedInstallData.m_strHostname);
-    setField("installGuestAdditions", m_unattendedInstallData.m_fInstallGuestAdditions);
     setField("guestAdditionsISOPath", m_unattendedInstallData.m_strGuestAdditionsISOPath);
 }
@@ -552 +551 @@
 }
 
-bool UIWizardNewVM::isUnattendedInstallEnabled() const
+bool UIWizardNewVM::isUnattendedEnabled() const
 {
     QVariant fieldValue = field("isUnattendedEnabled");
@@ -564 +563 @@
     return getStringFieldValue("guestOSFamiyId").contains("windows", Qt::CaseInsensitive);
 }
-
-void UIWizardNewVM::increaseLayoutLeftMargin(QLayout *pLayout, float mult /* = 2 */)
-{
-    if (!pLayout)
-        return;
-    QMargins margins = pLayout->contentsMargins();
-    pLayout->setContentsMargins(mult * margins.left(),
-                                margins.top(),
-                                margins.right(),
-                                margins.bottom());
-}

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

@@ -82 +82 @@
     void setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData);
     const UIUnattendedInstallData &unattendedInstallData() const;
-    bool isUnattendedInstallEnabled() const;
+    bool isUnattendedEnabled() const;
     bool isGuestOSTypeWindows() const;
-    /** Increases the amoun of the left marign of @p pLayout. */
-    static void increaseLayoutLeftMargin(QLayout *pLayout, float mult = 2);
 
 protected:

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

@@ -182 +182 @@
     : m_pISOSelectorLabel(0)
     , m_pISOFilePathSelector(0)
-    , m_pEnableUnattendedInstallCheckBox(0)
     , m_pStartHeadlessCheckBox(0)
     , m_pNameAndSystemEditor(0)
@@ -268 +267 @@
 bool UIWizardNewVMPage1::checkISOFile() const
 {
-    if (isUnattendedEnabled())
-    {
-        QString strISOFilePath = m_pISOFilePathSelector ? m_pISOFilePathSelector->path() : QString();
-        if (!QFileInfo(strISOFilePath).exists())
-            return false;
-    }
+    if (!m_pISOFilePathSelector)
+        return false;
+    const QString &strPath = m_pISOFilePathSelector->path();
+    if (strPath.isNull() || strPath.isEmpty())
+        return true;
+    QFileInfo fileInfo(strPath);
+    if (!fileInfo.exists() || !fileInfo.isReadable())
+        return false;
     return true;
 }
@@ -285 +286 @@
 }
 
-QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(bool fIncreaseLeftIndent,
-                                                     bool fCreateUnattendedWidgets,
+QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(bool fCreateUnattendedWidgets,
                                                      bool fCreateLabels)
 {
-    Q_UNUSED(fIncreaseLeftIndent);
     QWidget *pContainer = new QWidget;
     QGridLayout *pLayout = new QGridLayout(pContainer);
-    if (fIncreaseLeftIndent)
-        UIWizardNewVM::increaseLayoutLeftMargin(pLayout);
 
     int iRow = 0;
@@ -318 +315 @@
     if (fCreateUnattendedWidgets)
     {
-        m_pEnableUnattendedInstallCheckBox = new QCheckBox;
-        pLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iRow++, 0, 1, 1);
-
         m_pISOSelectorLabel = new QLabel;
         if (m_pISOSelectorLabel)
@@ -454 +448 @@
 bool UIWizardNewVMPage1::isUnattendedEnabled() const
 {
-    if (!m_pEnableUnattendedInstallCheckBox)
-        return false;
-    return m_pEnableUnattendedInstallCheckBox->isChecked();
+    if (m_pISOFilePathSelector)
+        return m_pISOFilePathSelector->isValid();
+    return false;
 }
 
@@ -494 +488 @@
 void UIWizardNewVMPage1::retranslateWidgets()
 {
-    if (m_pEnableUnattendedInstallCheckBox)
-    {
-        m_pEnableUnattendedInstallCheckBox->setText(UIWizardNewVM::tr("Unattended Install"));
-        m_pEnableUnattendedInstallCheckBox->setToolTip(UIWizardNewVM::tr("When checked, an unattended guest OS installation will be started "
-                                                          "after this wizard is closed if not the virtual machine's disk will "
-                                                          "be left empty."));
-    }
-
     if (m_pISOSelectorLabel)
-        m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installer:"));
+        m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installation ISO:"));
 
     if (m_pStartHeadlessCheckBox)
@@ -522 +508 @@
 {
     QVBoxLayout *pPageLayout = new QVBoxLayout(this);
-    pPageLayout->addWidget(createNameOSTypeWidgets(/* fIncreaseLeftIndent */ false,
-                                                   /* fCreateUnattendedWidget */ false,
+    pPageLayout->addWidget(createNameOSTypeWidgets(/* fCreateUnattendedWidget */ false,
                                                    /* fCreateLabels */false));
     pPageLayout->addStretch();
@@ -543 +528 @@
 void UIWizardNewVMPageBasic1::createConnections()
 {
-    connect(m_pEnableUnattendedInstallCheckBox, &QCheckBox::clicked, this, &UIWizardNewVMPageBasic1::sltUnattendedCheckBoxToggle);
     connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasic1::sltISOPathChanged);
     connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic1::sltNameChanged);
@@ -553 +537 @@
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    if (!pWizard || !pWizard->isUnattendedInstallEnabled())
+    if (!pWizard || !pWizard->isUnattendedEnabled())
         return UIWizardNewVM::Page3;
     return UIWizardNewVM::Page2;
@@ -588 +572 @@
     determineOSType(strPath);
     setTypeByISODetectedOSType(m_strDetectedOSTypeId);
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageBasic1::sltUnattendedCheckBoxToggle(bool fEnabled)
-{
+
+    bool fEnabled = isUnattendedEnabled();
     if (m_pISOSelectorLabel)
         m_pISOSelectorLabel->setEnabled(fEnabled);
@@ -599 +580 @@
     if (m_pStartHeadlessCheckBox)
         m_pStartHeadlessCheckBox->setEnabled(fEnabled);
+
     emit completeChanged();
 }
-
 
 void UIWizardNewVMPageBasic1::retranslateUi()

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

@@ -78 +78 @@
     void composeMachineFilePath();
 
-    QWidget *createNameOSTypeWidgets(bool fIncreaseLeftIndent,  bool fCreateUnattendedWidgets, bool fCreateLabels);
+    QWidget *createNameOSTypeWidgets(bool fCreateUnattendedWidgets, bool fCreateLabels);
     int createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
@@ -91 +91 @@
        /** Holds the ISO selector editor instance. */
        mutable UIFilePathSelector *m_pISOFilePathSelector;
-       QCheckBox *m_pEnableUnattendedInstallCheckBox;
        QCheckBox *m_pStartHeadlessCheckBox;
        /** We have two UINameAndSystemEditor instance since name/vm path fields and OS type fields
@@ -104 +103 @@
 private:
 
+    /** Return false if ISO path is not empty but points to an missing or unreadable file. */
     bool checkISOFile() const;
     QFrame *horizontalLine();
@@ -159 +159 @@
     void sltOsTypeChanged();
     void sltISOPathChanged(const QString &strPath);
-    void sltUnattendedCheckBoxToggle(bool fEnable);
 
 private:

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

@@ -37 +37 @@
     , m_pHostnameLineEdit(0)
     , m_pHostnameLabel(0)
-    , m_pInstallGACheckBox(0)
     , m_pGAISOPathLabel(0)
     , m_pGAISOFilePathSelector(0)
@@ -87 +86 @@
 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);
+    if (!m_pGAISOFilePathSelector)
+        return false;
+    return m_pGAISOFilePathSelector->isValid();
 }
 
@@ -118 +111 @@
 }
 
-QWidget *UIWizardNewVMPage2::createUserNameHostNameWidgets(bool fIncreaseLeftIndent)
+QWidget *UIWizardNewVMPage2::createUserNameHostNameWidgets()
 {
     QWidget *pContainer = new QWidget;
     QGridLayout *pGridLayout = new QGridLayout(pContainer);
-
-    if (fIncreaseLeftIndent)
-        UIWizardNewVM::increaseLayoutLeftMargin(pGridLayout);
 
     m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
@@ -141 +131 @@
 }
 
-QWidget *UIWizardNewVMPage2::createGAInstallWidgets(bool fIncreaseLeftIndent)
+QWidget *UIWizardNewVMPage2::createGAInstallWidgets()
 {
     QWidget *pContainer = new QWidget;
     QGridLayout *pContainerLayout = new QGridLayout(pContainer);
-    if (fIncreaseLeftIndent)
-        UIWizardNewVM::increaseLayoutLeftMargin(pContainerLayout);
-
-    m_pInstallGACheckBox = new QCheckBox;
+
     m_pGAISOPathLabel = new QLabel;
     {
@@ -163 +150 @@
     }
 
-    pContainerLayout->addWidget(m_pInstallGACheckBox, 0, 0, 1, 5);
     pContainerLayout->addWidget(m_pGAISOPathLabel, 1, 1, 1, 1);
     pContainerLayout->addWidget(m_pGAISOFilePathSelector, 1, 2, 1, 4);
@@ -169 +155 @@
 }
 
-QWidget *UIWizardNewVMPage2::createProductKeyWidgets(bool fIncreaseLeftIndent)
+QWidget *UIWizardNewVMPage2::createProductKeyWidgets()
 {
     QWidget *pContainer = new QWidget;
     QGridLayout *pGridLayout = new QGridLayout(pContainer);
-    if (fIncreaseLeftIndent)
-        UIWizardNewVM::increaseLayoutLeftMargin(pGridLayout);
 
     m_pProductKeyLabel = new QLabel;
@@ -190 +174 @@
 bool UIWizardNewVMPage2::checkGAISOFile() const
 {
-    if (m_pInstallGACheckBox && m_pInstallGACheckBox->isChecked())
-    {
-        QString strISOFilePath = m_pGAISOFilePathSelector ? m_pGAISOFilePathSelector->path() : QString();
-        if (!QFileInfo(strISOFilePath).exists())
-            return false;
-    }
+    const QString &strPath = m_pGAISOFilePathSelector->path();
+    if (strPath.isNull() || strPath.isEmpty())
+        return true;
+    QFile fileInfo(strPath);
+    if (!fileInfo.exists() || !fileInfo.isReadable())
+        return false;
     return true;
 }
@@ -209 +193 @@
     if (m_pHostnameLabel)
         m_pHostnameLabel->setText(UIWizardNewVM::tr("Hostname:"));
-    if (m_pInstallGACheckBox)
-        m_pInstallGACheckBox->setText(UIWizardNewVM::tr("Install guest additions"));
+
     if (m_pGAISOPathLabel)
-        m_pGAISOPathLabel->setText(UIWizardNewVM::tr("Installation medium:"));
+        m_pGAISOPathLabel->setText(UIWizardNewVM::tr("GA Installation ISO:"));
     if (m_pGAISOFilePathSelector)
         m_pGAISOFilePathSelector->setToolTip(UIWizardNewVM::tr("Please select an installation medium (ISO file)"));
@@ -240 +223 @@
     }
 
-    m_pToolBox->insertItem(ToolBoxItems_UserNameHostname, createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ true), QString());
-    m_pToolBox->insertItem(ToolBoxItems_GAInstall, createGAInstallWidgets(/* fIncreaseLeftIndent */ true), QString());
-    m_pToolBox->insertItem(ToolBoxItems_ProductKey, createProductKeyWidgets(/* fIncreaseLeftIndent */ true), QString());
+    m_pToolBox->insertItem(ToolBoxItems_UserNameHostname, createUserNameHostNameWidgets(), QString());
+    m_pToolBox->insertItem(ToolBoxItems_GAInstall, createGAInstallWidgets(), QString());
+    m_pToolBox->insertItem(ToolBoxItems_ProductKey, createProductKeyWidgets(), QString());
 
     registerField("userName", this, "userName");
@@ -259 +242 @@
         connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
                 this, &UIWizardNewVMPageBasic2::completeChanged);
-    if (m_pInstallGACheckBox)
-        connect(m_pInstallGACheckBox, &QCheckBox::toggled, this,
-                &UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle);
     if (m_pGAISOFilePathSelector)
         connect(m_pGAISOFilePathSelector, &UIFilePathSelector::pathChanged,
@@ -340 +320 @@
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    if (!pWizard || !pWizard->isUnattendedInstallEnabled() || !pWizard->isGuestOSTypeWindows())
+    if (!pWizard || !pWizard->isUnattendedEnabled() || !pWizard->isGuestOSTypeWindows())
         return false;
     return true;

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

@@ -53 +53 @@
         void setHostname(const QString &strHostName);
         bool installGuestAdditions() const;
-        void setInstallGuestAdditions(bool fInstallGA);
         QString guestAdditionsISOPath() const;
         void setGuestAdditionsISOPath(const QString &strISOPath);
@@ -67 +66 @@
     };
 
-    QWidget *createUserNameHostNameWidgets(bool fIncreaseLeftIndent);
-    QWidget *createGAInstallWidgets(bool fIncreaseLeftIndent);
-    QWidget *createProductKeyWidgets(bool fIncreaseLeftIndent);
+    QWidget *createUserNameHostNameWidgets();
+    QWidget *createGAInstallWidgets();
+    QWidget *createProductKeyWidgets();
 
+    /** Returns false if ISO path selector is non empty but has invalid file path. */
     bool checkGAISOFile() const;
     void markWidgets() const;
@@ -80 +80 @@
         QLineEdit *m_pHostnameLineEdit;
         QLabel  *m_pHostnameLabel;
-        /** Guest additions iso selection widgets. */
-        QCheckBox *m_pInstallGACheckBox;
         QLabel  *m_pGAISOPathLabel;
         UIFilePathSelector *m_pGAISOFilePathSelector;
@@ -97 +95 @@
     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(bool installGuestAdditions READ installGuestAdditions);
     Q_PROPERTY(QString guestAdditionsISOPath READ guestAdditionsISOPath WRITE setGuestAdditionsISOPath);
     Q_PROPERTY(QString productKey READ productKey);

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

@@ -164 +164 @@
 }
 
-QWidget *UIWizardNewVMPage3::createDiskWidgets(bool fIncreaseLeftIndent)
+QWidget *UIWizardNewVMPage3::createDiskWidgets()
 {
     QWidget *pDiskContainer = new QWidget;
     QGridLayout *pDiskLayout = new QGridLayout(pDiskContainer);
-    if (fIncreaseLeftIndent)
-        UIWizardNewVM::increaseLayoutLeftMargin(pDiskLayout);
-
 
     m_pDiskSkip = new QRadioButton;
@@ -197 +194 @@
 }
 
-QWidget *UIWizardNewVMPage3::createHardwareWidgets(bool fIncreaseLeftIndent)
+QWidget *UIWizardNewVMPage3::createHardwareWidgets()
 {
     QWidget *pHardwareContainer = new QWidget;
     QGridLayout *pHardwareLayout = new QGridLayout(pHardwareContainer);
-    if (fIncreaseLeftIndent)
-        UIWizardNewVM::increaseLayoutLeftMargin(pHardwareLayout);
+
     m_pBaseMemoryEditor = new UIBaseMemoryEditor(0, true);
     m_pVirtualCPUEditor = new UIVirtualCPUEditor(0, true);
@@ -233 +229 @@
     pMainLayout->addWidget(m_pToolBox);
 
-    m_pToolBox->insertItem(ToolBoxItems_Disk, createDiskWidgets(/* fIncreaseLeftIndent */ true), QString());
-    m_pToolBox->insertItem(ToolBoxItems_Hardware, createHardwareWidgets(/* fIncreaseLeftIndent */ true), QString());
+    m_pToolBox->insertItem(ToolBoxItems_Disk, createDiskWidgets(), QString());
+    m_pToolBox->insertItem(ToolBoxItems_Hardware, createHardwareWidgets(), QString());
     m_pToolBox->setStyleSheet("QToolBox::tab:selected { font: bold; }");
 

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

@@ -77 +77 @@
     /** @} */
 
-    QWidget *createDiskWidgets(bool fIncreaseLeftIndent);
-    QWidget *createHardwareWidgets(bool fIncreaseLeftIndent);
+    QWidget *createDiskWidgets();
+    QWidget *createHardwareWidgets();
 
     /** Helpers. */

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

@@ -50 +50 @@
     {
         m_pToolBox = new UIToolBox;
-        m_pToolBox->insertItem(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(/* fIncreaseLeftIndent */ true,
-                                                                                         /* fCreateUnattendedWidgets */ false,
+        m_pToolBox->insertItem(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(/* fCreateUnattendedWidgets */ false,
                                                                                          /* fCreateLabels */ false), "");
         m_pToolBox->insertItem(ExpertToolboxItems_Unattended, createUnattendedWidgets(), "", false);
-        m_pToolBox->insertItem(ExpertToolboxItems_Disk, createDiskWidgets(/* fIncreaseLeftIndent */ true), "");
-        m_pToolBox->insertItem(ExpertToolboxItems_Hardware, createHardwareWidgets(/* fIncreaseLeftIndent */ true), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_Disk, createDiskWidgets(), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_Hardware, createHardwareWidgets(), "");
         // m_pToolBox->insertItem(ExpertToolboxItems_UsernameHostname, createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ true), "");
         // m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, createGAInstallWidgets(/* fIncreaseLeftIndent */ true), "");
@@ -119 +118 @@
                                                 "}").arg(tabBackgroundColor.name()).arg(textColor.name()).arg(disabledTextColor.name()));
 
-    if (m_pEnableUnattendedInstallCheckBox)
-        disableEnableUnattendedRelatedWidgets(m_pEnableUnattendedInstallCheckBox->isChecked());
+    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
 }
 
@@ -167 +165 @@
 }
 
-void UIWizardNewVMPageExpert::sltUnattendedCheckBoxToggle(bool fEnabled)
-{
-    disableEnableUnattendedRelatedWidgets(fEnabled);
-    emit completeChanged();
-}
-
 void UIWizardNewVMPageExpert::sltISOPathChanged(const QString &strPath)
 {
     determineOSType(strPath);
     setTypeByISODetectedOSType(m_strDetectedOSTypeId);
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle(bool fEnabled)
-{
-    if (m_pGAISOPathLabel)
-        m_pGAISOPathLabel->setEnabled(fEnabled);
-    if (m_pGAISOFilePathSelector)
-        m_pGAISOFilePathSelector->setEnabled(fEnabled);
+    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
     emit completeChanged();
 }
@@ -233 +217 @@
                 this, &UIWizardNewVMPageExpert::sltOSFamilyTypeChanged);
     }
-    if (m_pEnableUnattendedInstallCheckBox)
-        connect(m_pEnableUnattendedInstallCheckBox, &QCheckBox::clicked,
-                this, &UIWizardNewVMPageExpert::sltUnattendedCheckBoxToggle);
+
     if (m_pISOFilePathSelector)
         connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged,
@@ -244 +226 @@
         connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
                 this, &UIWizardNewVMPageExpert::completeChanged);
-    if (m_pInstallGACheckBox)
-        connect(m_pInstallGACheckBox, &QCheckBox::toggled, this,
-                &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
     if (m_pGAISOFilePathSelector)
         connect(m_pGAISOFilePathSelector, &UIFilePathSelector::pathChanged,
@@ -304 +283 @@
         m_pDiskSelector->setCurrentIndex(0);
 
-    if (m_pEnableUnattendedInstallCheckBox)
-        disableEnableUnattendedRelatedWidgets(m_pEnableUnattendedInstallCheckBox->isChecked());
+    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
     if (m_pProductKeyLabel)
         m_pProductKeyLabel->setEnabled(isProductKeyWidgetEnabled());
@@ -354 +332 @@
         pLayout->addWidget(m_pStartHeadlessCheckBox, iRow++, 0, 1, 5);
 
-    pLayout->addWidget(createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ false), iRow, 0, 4, 5);
+    pLayout->addWidget(createUserNameHostNameWidgets(), iRow, 0, 4, 5);
     iRow += 4;
-    pLayout->addWidget(createGAInstallWidgets(/* fIncreaseLeftIndent */ false), iRow, 0, 2, 5);
+    pLayout->addWidget(createGAInstallWidgets(), iRow, 0, 2, 5);
     iRow += 2;
-    pLayout->addWidget(createProductKeyWidgets(/* fIncreaseLeftIndent */ false), iRow, 0, 1, 5);
+    pLayout->addWidget(createProductKeyWidgets(), iRow, 0, 1, 5);
 
 
@@ -392 +370 @@
     {
         /* Check the installation medium: */
-        if (!isISOFileSelectorComplete())
-        {
-            m_pToolBox->setItemIcon(ExpertToolboxItems_NameAndOSType,
-                                    UIIconPool::iconSet(":/status_error_16px.png"));
-            fIsComplete = false;
-        }
+        // if (!isISOFileSelectorComplete())
+        // {
+        //     m_pToolBox->setItemIcon(ExpertToolboxItems_NameAndOSType,
+        //                             UIIconPool::iconSet(":/status_error_16px.png"));
+        //     fIsComplete = false;
+        // }
         /* Check the GA installation medium: */
         if (!checkGAISOFile())
@@ -459 +437 @@
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    if (!pWizard || !pWizard->isUnattendedInstallEnabled() || !pWizard->isGuestOSTypeWindows())
+    if (!pWizard || !pWizard->isUnattendedEnabled() || !pWizard->isGuestOSTypeWindows())
         return false;
     return true;
@@ -466 +444 @@
 void UIWizardNewVMPageExpert::disableEnableUnattendedRelatedWidgets(bool fEnabled)
 {
-    if (m_pToolBox)
-    {
-        m_pToolBox->setItemEnabled(ExpertToolboxItems_UsernameHostname, fEnabled);
-        m_pToolBox->setItemEnabled(ExpertToolboxItems_GAInstall, fEnabled);
-        m_pToolBox->setItemEnabled(ExpertToolboxItems_ProductKey, fEnabled);
-    }
-    if (m_pISOSelectorLabel)
-        m_pISOSelectorLabel->setEnabled(fEnabled);
-    if (m_pISOFilePathSelector)
-        m_pISOFilePathSelector->setEnabled(fEnabled);
     if (m_pStartHeadlessCheckBox)
         m_pStartHeadlessCheckBox->setEnabled(fEnabled);

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

@@ -52 +52 @@
     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(bool installGuestAdditions READ installGuestAdditions);
     Q_PROPERTY(QString guestAdditionsISOPath READ guestAdditionsISOPath WRITE setGuestAdditionsISOPath);
     Q_PROPERTY(QString productKey READ productKey);
@@ -79 +79 @@
     void sltVirtualDiskSourceChanged();
     void sltGetWithFileOpenDialog();
-    void sltUnattendedCheckBoxToggle(bool fEnable);
     void sltISOPathChanged(const QString &strPath);
-    void sltInstallGACheckBoxToggle(bool fChecked);
     void sltGAISOPathChanged(const QString &strPath);
     void sltOSFamilyTypeChanged();