Changeset 85063 in vbox

Timestamp:

Jul 6, 2020 10:19:00 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Merging virtual machine hardware and disk pages.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/widgets/UIMediaComboBox.cpp (modified) (1 diff)
• src/widgets/UIMediaComboBox.h (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (5 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic2.h (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicDisk.cpp (modified) (8 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicDisk.h (modified) (5 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp (deleted)
• src/wizards/newvm/UIWizardNewVMPageBasicHardware.h (deleted)
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -652 +652 @@
         src/wizards/newvm/UIWizardNewVMPageBasic1.h \
         src/wizards/newvm/UIWizardNewVMPageBasic2.h \
-        src/wizards/newvm/UIWizardNewVMPageBasicHardware.h \
         src/wizards/newvm/UIWizardNewVMPageBasicDisk.h \
         src/wizards/newvm/UIWizardNewVMPageExpert.h \
@@ -1115 +1114 @@
         src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicDisk.cpp \
         src/wizards/newvm/UIWizardNewVMPageExpert.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

@@ -26 +26 @@
 
 
-UIMediaComboBox::UIMediaComboBox(QWidget *pParent)
+UIMediaComboBox::UIMediaComboBox(QWidget *pParent /* = 0 */)
     : QComboBox(pParent)
     , m_enmMediaType(UIMediumDeviceType_Invalid)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.h

@@ -41 +41 @@
 
     /** Constructs media combo-box passing @a pParent to the base-class. */
-    UIMediaComboBox(QWidget *pParent);
+    UIMediaComboBox(QWidget *pParent = 0);
 
     /** Performs refresh. */

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

@@ -21 +21 @@
 #include "UIWizardNewVMPageBasic1.h"
 #include "UIWizardNewVMPageBasic2.h"
-#include "UIWizardNewVMPageBasicHardware.h"
 #include "UIWizardNewVMPageBasicDisk.h"
 #include "UIWizardNewVMPageExpert.h"
@@ -77 +76 @@
             setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
             setPage(Page2, new UIWizardNewVMPageBasic2);
-            setPage(PageHardware, new UIWizardNewVMPageBasicHardware);
             setPage(PageDisk, new UIWizardNewVMPageBasicDisk);
             setStartId(Page1);

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

@@ -62 +62 @@
         Page1,
         Page2,
-        PageHardware,
         PageDisk,
         PageMax

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

@@ -508 +508 @@
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     if (!pWizard || !pWizard->isUnattendedInstallEnabled())
-        return UIWizardNewVM::PageHardware;
+        return UIWizardNewVM::PageDisk;
     return UIWizardNewVM::Page2;
 }

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

@@ -119 +119 @@
 }
 
+void UIWizardNewVMPage2::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);
+    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(ToolBoxItems_UserNameHostname, pContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
+}
+
+void UIWizardNewVMPage2::createGAInstallWidgets()
+{
+    if (!m_pToolBox)
+        return;
+    QWidget *pContainer = new QWidget;
+    QGridLayout *pContainerLayout = new QGridLayout(pContainer);
+
+    m_pInstallGACheckBox = new QCheckBox;
+    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);
+    }
+
+    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(ToolBoxItems_GAInstall, pContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
+}
+
+void UIWizardNewVMPage2::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(ToolBoxItems_ProductKey, pContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
+}
+
 bool UIWizardNewVMPage2::checkGAISOFile() const
 {
@@ -160 +220 @@
     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, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), 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, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), 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, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
+
+    createConnections();
+}
+
+void UIWizardNewVMPageBasic2::createConnections()
+{
+    if (m_pUserNamePasswordEditor)
+        connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
+                this, &UIWizardNewVMPageBasic2::completeChanged);
+    if (m_pInstallGACheckBox)
+        connect(m_pInstallGACheckBox, &QCheckBox::toggled, this,
+                &UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle);
+    if (m_pISOFilePathSelector)
+        connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged,
+                this, &UIWizardNewVMPageBasic2::sltGAISOPathChanged);
 }
 
@@ -234 +241 @@
     setTitle(UIWizardNewVM::tr("Unattended Guest OS Install Setup"));
     if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("<p>Here you can configure the unattended install by modifying user name, password, and "
+        m_pLabel->setText(UIWizardNewVM::tr("<p>Here you can configure the unattended install by modifying username, password, and "
                                             "hostname. You can additionally enable guest additions install and a product key for "
                                             "Microsoft Windows guests.</p>"));
@@ -241 +248 @@
     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"));
+        m_pToolBox->setItemText(ToolBoxItems_UserNameHostname, UIWizardNewVM::tr("Username and hostname"));
+        m_pToolBox->setItemText(ToolBoxItems_GAInstall, UIWizardNewVM::tr("Guest additions install"));
+        m_pToolBox->setItemText(ToolBoxItems_ProductKey, UIWizardNewVM::tr("Product key"));
     }
     if (m_pInstallGACheckBox)
@@ -277 +284 @@
     if (m_pToolBox)
     {
-        QWidget *pProductKeyWidget = m_pToolBox->widget(Tabs_ProductKey);
+        QWidget *pProductKeyWidget = m_pToolBox->widget(ToolBoxItems_ProductKey);
         if (pProductKeyWidget)
             pProductKeyWidget->setEnabled(isProductKeyWidgetVisible());

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

@@ -60 +60 @@
 
 protected:
-    enum Tabs
+    enum
     {
-        Tabs_UserNameHostname,
-        Tabs_GAInstall,
-        Tabs_ProductKey,
-        Tabs_Max
+        ToolBoxItems_UserNameHostname,
+        ToolBoxItems_GAInstall,
+        ToolBoxItems_ProductKey
     };
+
+    void createUserNameHostNameWidgets();
+    void createGAInstallWidgets();
+    void createProductKeyWidgets();
 
     bool checkGAISOFile() const;
@@ -116 +119 @@
 
     void prepare();
-    void createUserNameHostNameWidgets();
-    void createGAInstallWidgets();
-    void createProductKeyWidgets();
+    void createConnections();
     void retranslateUi();
     void initializePage();

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

@@ -20 +20 @@
 #include <QMetaType>
 #include <QRadioButton>
+#include <QToolBox>
 #include <QVBoxLayout>
 
@@ -25 +26 @@
 #include "QIRichTextLabel.h"
 #include "QIToolButton.h"
+#include "UIBaseMemoryEditor.h"
 #include "UIIconPool.h"
 #include "UIMediaComboBox.h"
@@ -30 +32 @@
 #include "UIMediumSelector.h"
 #include "UIMessageCenter.h"
+#include "UIVirtualCPUEditor.h"
 #include "UIWizardNewVD.h"
 #include "UIWizardNewVM.h"
@@ -36 +39 @@
 UIWizardNewVMPageDisk::UIWizardNewVMPageDisk()
     : m_fRecommendedNoDisk(false)
+    , m_pToolBox(0)
+    , m_pDiskSkip(0)
+    , m_pDiskCreate(0)
+    , m_pDiskPresent(0)
+    , m_pDiskSelector(0)
+    , m_pVMMButton(0)
+    , m_pBaseMemoryEditor(0)
+    , m_pVirtualCPUEditor(0)
 {
 }
@@ -105 +116 @@
 }
 
+int UIWizardNewVMPageDisk::baseMemory() const
+{
+    if (!m_pBaseMemoryEditor)
+        return 0;
+    return m_pBaseMemoryEditor->value();
+}
+
+int UIWizardNewVMPageDisk::VCPUCount() const
+{
+    if (!m_pVirtualCPUEditor)
+        return 1;
+    return m_pVirtualCPUEditor->value();
+}
+
 void UIWizardNewVMPageDisk::ensureNewVirtualDiskDeleted()
 {
@@ -129 +154 @@
 }
 
+void UIWizardNewVMPageDisk::createDiskWidgets()
+{
+    QWidget *pDiskContainer = new QWidget;
+    QGridLayout *pDiskLayout = new QGridLayout(pDiskContainer);
+
+    m_pDiskSkip = new QRadioButton;
+    m_pDiskCreate = new QRadioButton;
+    m_pDiskPresent = new QRadioButton;
+    QStyleOptionButton options;
+    options.initFrom(m_pDiskPresent);
+    int iWidth = m_pDiskPresent->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pDiskPresent);
+    pDiskLayout->setColumnMinimumWidth(0, iWidth);
+    m_pDiskSelector = new UIMediaComboBox;
+    {
+        m_pDiskSelector->setType(UIMediumDeviceType_HardDisk);
+        m_pDiskSelector->repopulate();
+    }
+    m_pVMMButton = new QIToolButton;
+    {
+        m_pVMMButton->setAutoRaise(true);
+        m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
+    }
+    pDiskLayout->addWidget(m_pDiskSkip, 0, 0, 1, 3);
+    pDiskLayout->addWidget(m_pDiskCreate, 1, 0, 1, 3);
+    pDiskLayout->addWidget(m_pDiskPresent, 2, 0, 1, 3);
+    pDiskLayout->addWidget(m_pDiskSelector, 3, 1);
+    pDiskLayout->addWidget(m_pVMMButton, 3, 2);
+
+    if (m_pToolBox)
+        m_pToolBox->insertItem(ToolBoxItems_Disk, pDiskContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
+}
+
+void UIWizardNewVMPageDisk::createHardwareWidgets()
+{
+    QWidget *pHardwareContainer = new QWidget;
+    QGridLayout *pHardwareLayout = new QGridLayout(pHardwareContainer);
+
+    m_pBaseMemoryEditor = new UIBaseMemoryEditor(0, true);
+    m_pVirtualCPUEditor = new UIVirtualCPUEditor(0, true);
+    pHardwareLayout->addWidget(m_pBaseMemoryEditor, 0, 0, 1, 4);
+    pHardwareLayout->addWidget(m_pVirtualCPUEditor, 1, 0, 1, 4);
+
+    if (m_pToolBox)
+        m_pToolBox->insertItem(ToolBoxItems_Hardware, pHardwareContainer,
+                               UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
+}
+
 UIWizardNewVMPageBasicDisk::UIWizardNewVMPageBasicDisk()
 {
-    /* Create widgets: */
+    prepare();
+    /* Register classes: */
+    qRegisterMetaType<CMedium>();
+    /* Register fields: */
+    registerField("virtualDisk", this, "virtualDisk");
+    registerField("virtualDiskId", this, "virtualDiskId");
+    registerField("virtualDiskName", this, "virtualDiskName");
+    registerField("virtualDiskLocation", this, "virtualDiskLocation");
+    registerField("baseMemory", this, "baseMemory");
+    registerField("VCPUCount", this, "VCPUCount");
+}
+
+void UIWizardNewVMPageBasicDisk::prepare()
+{
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    {
-        m_pLabel = new QIRichTextLabel(this);
-        QGridLayout *pDiskLayout = new QGridLayout;
-        {
-            m_pDiskSkip = new QRadioButton(this);
-            m_pDiskCreate = new QRadioButton(this);
-            m_pDiskPresent = new QRadioButton(this);
-            QStyleOptionButton options;
-            options.initFrom(m_pDiskPresent);
-            int iWidth = m_pDiskPresent->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pDiskPresent);
-            pDiskLayout->setColumnMinimumWidth(0, iWidth);
-            m_pDiskSelector = new UIMediaComboBox(this);
-            {
-                m_pDiskSelector->setType(UIMediumDeviceType_HardDisk);
-                m_pDiskSelector->repopulate();
-            }
-            m_pVMMButton = new QIToolButton(this);
-            {
-                m_pVMMButton->setAutoRaise(true);
-                m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
-            }
-            pDiskLayout->addWidget(m_pDiskSkip, 0, 0, 1, 3);
-            pDiskLayout->addWidget(m_pDiskCreate, 1, 0, 1, 3);
-            pDiskLayout->addWidget(m_pDiskPresent, 2, 0, 1, 3);
-            pDiskLayout->addWidget(m_pDiskSelector, 3, 1);
-            pDiskLayout->addWidget(m_pVMMButton, 3, 2);
-        }
-        pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addLayout(pDiskLayout);
-        pMainLayout->addStretch();
-        updateVirtualDiskSource();
-    }
-
-    /* Setup connections: */
+    m_pToolBox = new QToolBox;
+
+    m_pLabel = new QIRichTextLabel(this);
+    pMainLayout->addWidget(m_pLabel);
+    pMainLayout->addWidget(m_pToolBox);
+    createDiskWidgets();
+    createHardwareWidgets();
+
+    pMainLayout->addStretch();
+    updateVirtualDiskSource();
+    createConnections();
+}
+
+void UIWizardNewVMPageBasicDisk::createConnections()
+{
     connect(m_pDiskSkip, &QRadioButton::toggled,
             this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged);
@@ -177 +243 @@
     connect(m_pVMMButton, &QIToolButton::clicked,
             this, &UIWizardNewVMPageBasicDisk::sltGetWithFileOpenDialog);
-
-    /* Register classes: */
-    qRegisterMetaType<CMedium>();
-    /* Register fields: */
-    registerField("virtualDisk", this, "virtualDisk");
-    registerField("virtualDiskId", this, "virtualDiskId");
-    registerField("virtualDiskName", this, "virtualDiskName");
-    registerField("virtualDiskLocation", this, "virtualDiskLocation");
 }
 
@@ -215 +273 @@
                                         "<p>If you need a more complex storage set-up you can skip this step "
                                         "and make the changes to the machine settings once the machine is created.</p>"
-                                        "<p>The recommended size of the hard disk is <b>%1</b>.</p>")
+                                        "<p>The recommended size of the hard disk is <b>%1</b>.</p>"
+                                        "<p>You can modify the virtual machine's hardware.</p>")
                                         .arg(strRecommendedHDD));
+
     m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add a virtual hard disk"));
     m_pDiskCreate->setText(UIWizardNewVM::tr("&Create a virtual hard disk now"));
     m_pDiskPresent->setText(UIWizardNewVM::tr("&Use an existing virtual hard disk file"));
     m_pVMMButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard disk file..."));
+
+    if (m_pToolBox)
+    {
+        m_pToolBox->setItemText(ToolBoxItems_Disk, UIWizardNewVM::tr("Hard Disk"));
+        m_pToolBox->setItemText(ToolBoxItems_Hardware, UIWizardNewVM::tr("Hardware"));
+    }
 }
 

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

@@ -34 +34 @@
 /* Forward declarations: */
 class QRadioButton;
+class QToolBox;
 class QIRichTextLabel;
 class QIToolButton;
+class UIBaseMemoryEditor;
 class UIMediaComboBox;
+class UIVirtualCPUEditor;
 
 /* 3rd page of the New Virtual Machine wizard (base part): */
 class UIWizardNewVMPageDisk : public UIWizardPageBase
 {
+
 protected:
+
+    enum
+    {
+        ToolBoxItems_Disk,
+        ToolBoxItems_Hardware
+    };
+
 
     /* Constructor: */
@@ -67 +78 @@
     void setVirtualDiskLocation(const QString &strVirtualDiskLocation) { m_strVirtualDiskLocation = strVirtualDiskLocation; }
 
+    int baseMemory() const;
+    int VCPUCount() const;
+
+    void createDiskWidgets();
+    void createHardwareWidgets();
+
     /* Helpers: */
     void ensureNewVirtualDiskDeleted();
@@ -79 +96 @@
     QString m_strVirtualDiskLocation;
 
-    /* Widgets: */
-    QRadioButton *m_pDiskSkip;
-    QRadioButton *m_pDiskCreate;
-    QRadioButton *m_pDiskPresent;
-    UIMediaComboBox *m_pDiskSelector;
-    QIToolButton *m_pVMMButton;
+    /** @name Widgets
+     * @{ */
+       QToolBox     *m_pToolBox;
+       QRadioButton *m_pDiskSkip;
+       QRadioButton *m_pDiskCreate;
+       QRadioButton *m_pDiskPresent;
+       UIMediaComboBox *m_pDiskSelector;
+       QIToolButton *m_pVMMButton;
+       UIBaseMemoryEditor *m_pBaseMemoryEditor;
+       UIVirtualCPUEditor *m_pVirtualCPUEditor;
+    /** @} */
+
 };
 
@@ -95 +118 @@
     Q_PROPERTY(QString virtualDiskName READ virtualDiskName WRITE setVirtualDiskName);
     Q_PROPERTY(QString virtualDiskLocation READ virtualDiskLocation WRITE setVirtualDiskLocation);
+    Q_PROPERTY(int baseMemory READ baseMemory);
+    Q_PROPERTY(int VCPUCount READ VCPUCount);
 
 public:
@@ -118 +143 @@
 private:
 
-    /* Translate stuff: */
+
+    /** Prepare stuff: */
+    void prepare();
+    void createConnections();
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
     void cleanupPage();
 
-    /* Validation stuff: */
+    /** Validation stuff: */
     bool isComplete() const;
     bool validatePage();

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

@@ -24 +24 @@
 /* Local includes: */
 #include "UIWizardNewVMPageBasic1.h"
-#include "UIWizardNewVMPageBasicHardware.h"
 #include "UIWizardNewVMPageBasicDisk.h"
 
@@ -33 +32 @@
 class UIWizardNewVMPageExpert : public UIWizardPage,
                                 public UIWizardNewVMPage1,
-                                public UIWizardNewVMPageHardware,
                                 public UIWizardNewVMPageDisk
 {