Changeset 87430 in vbox

Timestamp:

Jan 26, 2021 11:44:45 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Working on the guided mode. part 4

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic4.cpp (modified) (8 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic4.h (modified) (4 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic5.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.cpp ) (19 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic5.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.h ) (9 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -657 +657 @@
         src/wizards/newvm/UIWizardNewVMPageBasic3.h \
         src/wizards/newvm/UIWizardNewVMPageBasic4.h \
+        src/wizards/newvm/UIWizardNewVMPageBasic5.h \
         src/wizards/newvm/UIWizardNewVMPageExpert.h \
         src/wizards/clonevm/UIWizardCloneVM.h \
@@ -1139 +1140 @@
         src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasic5.cpp \
         src/wizards/newvm/UIWizardNewVMPageExpert.cpp \
         src/wizards/clonevm/UIWizardCloneVM.cpp \

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

@@ -27 +27 @@
 #include "UIWizardNewVMPageBasic3.h"
 #include "UIWizardNewVMPageBasic4.h"
+#include "UIWizardNewVMPageBasic5.h"
 #include "UIWizardNewVMPageExpert.h"
 #include "UIMessageCenter.h"
@@ -84 +85 @@
             setPage(Page3, new UIWizardNewVMPageBasic3);
             setPage(Page4, new UIWizardNewVMPageBasic4);
+            setPage(Page5, new UIWizardNewVMPageBasic5);
             setStartId(Page1);
             break;

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

@@ -64 +64 @@
         Page3,
         Page4,
+        Page5,
         PageMax
     };
@@ -99 +100 @@
 
     /* Who will be able to create virtual-machine: */
-    friend class UIWizardNewVMPageBasic4;
+    friend class UIWizardNewVMPageBasic5;
     friend class UIWizardNewVMPageExpert;
 

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

@@ -37 +37 @@
 
 UIWizardNewVMPage4::UIWizardNewVMPage4()
-    : m_fRecommendedNoDisk(false)
-    , m_pDiskSkip(0)
-    , m_pDiskCreate(0)
-    , m_pDiskPresent(0)
-    , m_pDiskSelector(0)
-    , m_pVMMButton(0)
-    , m_pBaseMemoryEditor(0)
+    : m_pBaseMemoryEditor(0)
     , m_pVirtualCPUEditor(0)
 {
-}
-
-void UIWizardNewVMPage4::updateVirtualDiskSource()
-{
-    if (!m_pDiskSelector || !m_pVMMButton)
-        return;
-
-    /* Enable/disable controls: */
-    m_pDiskSelector->setEnabled(m_pDiskPresent->isChecked());
-    m_pVMMButton->setEnabled(m_pDiskPresent->isChecked());
-
-    /* Fetch filed values: */
-    if (m_pDiskSkip->isChecked())
-    {
-        m_uVirtualDiskId = QUuid();
-        m_strVirtualDiskName = QString();
-        m_strVirtualDiskLocation = QString();
-    }
-    else if (m_pDiskPresent->isChecked())
-    {
-        m_uVirtualDiskId = m_pDiskSelector->id();
-        m_strVirtualDiskName = m_pDiskSelector->currentText();
-        m_strVirtualDiskLocation = m_pDiskSelector->location();
-    }
-}
-
-void UIWizardNewVMPage4::getWithFileOpenDialog()
-{
-    /* Get opened medium id: */
-    QUuid uMediumId;
-
-    int returnCode = uiCommon().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_HardDisk,
-                                                           uMediumId,
-                                                           fieldImp("machineFolder").toString(),
-                                                           fieldImp("machineBaseName").toString(),
-                                                           fieldImp("type").value<CGuestOSType>().GetId(),
-                                                           false /* don't show/enable the create action: */);
-
-    if (returnCode == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && !uMediumId.isNull())
-    {
-        /* Update medium-combo if necessary: */
-        m_pDiskSelector->setCurrentItem(uMediumId);
-        /* Update hard disk source: */
-        updateVirtualDiskSource();
-        /* Focus on hard disk combo: */
-        m_pDiskSelector->setFocus();
-    }
-}
-
-bool UIWizardNewVMPage4::getWithNewVirtualDiskWizard()
-{
-    /* Create New Virtual Hard Drive wizard: */
-    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(thisImp(),
-                                                         fieldImp("machineBaseName").toString(),
-                                                         fieldImp("machineFolder").toString(),
-                                                         fieldImp("type").value<CGuestOSType>().GetRecommendedHDD(),
-                                                         wizardImp()->mode());
-    pWizard->prepare();
-    bool fResult = false;
-    if (pWizard->exec() == QDialog::Accepted)
-    {
-        fResult = true;
-        m_virtualDisk = pWizard->virtualDisk();
-        m_pDiskSelector->setCurrentItem(m_virtualDisk.GetId());
-        m_pDiskPresent->click();
-    }
-    if (pWizard)
-        delete pWizard;
-    return fResult;
 }
 
@@ -131 +56 @@
 }
 
-void UIWizardNewVMPage4::ensureNewVirtualDiskDeleted()
-{
-    /* Make sure virtual-disk valid: */
-    if (m_virtualDisk.isNull())
-        return;
-
-    /* Remember virtual-disk attributes: */
-    QString strLocation = m_virtualDisk.GetLocation();
-    /* Prepare delete storage progress: */
-    CProgress progress = m_virtualDisk.DeleteStorage();
-    if (m_virtualDisk.isOk())
-    {
-        /* Show delete storage progress: */
-        msgCenter().showModalProgressDialog(progress, thisImp()->windowTitle(), ":/progress_media_delete_90px.png", thisImp());
-        if (!progress.isOk() || progress.GetResultCode() != 0)
-            msgCenter().cannotDeleteHardDiskStorage(progress, strLocation, thisImp());
-    }
-    else
-        msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, thisImp());
-
-    /* Detach virtual-disk anyway: */
-    m_virtualDisk.detach();
-}
-
 void UIWizardNewVMPage4::retranslateWidgets()
 {
-    if (m_pDiskSkip)
-        m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add a virtual hard disk"));
-    if (m_pDiskCreate)
-        m_pDiskCreate->setText(UIWizardNewVM::tr("&Create a virtual hard disk now"));
-    if (m_pDiskPresent)
-        m_pDiskPresent->setText(UIWizardNewVM::tr("&Use an existing virtual hard disk file"));
-    if (m_pVMMButton)
-        m_pVMMButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard disk file..."));
-}
-
-QWidget *UIWizardNewVMPage4::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);
-    return pDiskContainer;
 }
 
@@ -214 +77 @@
     prepare();
     qRegisterMetaType<CMedium>();
-    registerField("virtualDisk", this, "virtualDisk");
-    registerField("virtualDiskId", this, "virtualDiskId");
-    registerField("virtualDiskName", this, "virtualDiskName");
-    registerField("virtualDiskLocation", this, "virtualDiskLocation");
     registerField("baseMemory", this, "baseMemory");
     registerField("VCPUCount", this, "VCPUCount");
@@ -228 +87 @@
     m_pLabel = new QIRichTextLabel(this);
     pMainLayout->addWidget(m_pLabel);
-    pMainLayout->addWidget(createDiskWidgets());
+    pMainLayout->addWidget(createHardwareWidgets());
 
     pMainLayout->addStretch();
-    updateVirtualDiskSource();
     createConnections();
 }
@@ -237 +95 @@
 void UIWizardNewVMPageBasic4::createConnections()
 {
-    connect(m_pDiskSkip, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
-    connect(m_pDiskCreate, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
-    connect(m_pDiskPresent, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
-    connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
-    connect(m_pVMMButton, &QIToolButton::clicked,
-            this, &UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog);
+
 }
 
-void UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged()
-{
-    /* Call to base-class: */
-    updateVirtualDiskSource();
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog()
-{
-    /* Call to base-class: */
-    getWithFileOpenDialog();
-}
 
 void UIWizardNewVMPageBasic4::retranslateUi()
 {
-    /* Translate page: */
-    setTitle(UIWizardNewVM::tr("Hard disk and Hardware"));
+    setTitle(UIWizardNewVM::tr("Hardware"));
 
-    /* Translate widgets: */
-    QString strRecommendedHDD = field("type").value<CGuestOSType>().isNull() ? QString() :
-                                UICommon::formatSize(field("type").value<CGuestOSType>().GetRecommendedHDD());
     if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("<p>If you wish you can add a virtual hard disk to the new machine. "
-                                            "You can either create a new hard disk file or select one from the list "
-                                            "or from another location using the folder icon. "
-                                            "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. "
-                                            "The recommended size of the hard disk is <b>%1</b>.")
-                          .arg(strRecommendedHDD));
+        m_pLabel->setText(UIWizardNewVM::tr("<p>You can modify virtual machine's hardware by changing amount of RAM and "
+                                            "virtual CPU count.</p>"));
+
     retranslateWidgets();
 }
@@ -285 +112 @@
 void UIWizardNewVMPageBasic4::initializePage()
 {
-    /* Translate page: */
     retranslateUi();
 
@@ -296 +122 @@
         m_pBaseMemoryEditor->setValue(recommendedRam);
 
-
-    /* Prepare initial disk choice: */
-    if (type.GetRecommendedHDD() != 0)
-    {
-        if (m_pDiskCreate)
-        {
-            m_pDiskCreate->setFocus();
-            m_pDiskCreate->setChecked(true);
-        }
-        m_fRecommendedNoDisk = false;
-    }
-    else
-    {
-        if (m_pDiskSkip)
-        {
-            m_pDiskSkip->setFocus();
-            m_pDiskSkip->setChecked(true);
-        }
-        m_fRecommendedNoDisk = true;
-    }
-    if (m_pDiskSelector)
-        m_pDiskSelector->setCurrentIndex(0);
 }
 
 void UIWizardNewVMPageBasic4::cleanupPage()
 {
-    /* Call to base-class: */
-    ensureNewVirtualDiskDeleted();
     UIWizardPage::cleanupPage();
 }
@@ -329 +131 @@
 bool UIWizardNewVMPageBasic4::isComplete() const
 {
-    /* Make sure 'virtualDisk' field feats the rules: */
-    if (!m_pDiskSkip)
-        return false;
-    return m_pDiskSkip->isChecked() ||
-        !m_pDiskPresent->isChecked() ||
-        !uiCommon().medium(m_pDiskSelector->id()).isNull();
+    return true;
 }
-
-bool UIWizardNewVMPageBasic4::validatePage()
-{
-    /* Initial result: */
-    bool fResult = true;
-
-    /* Ensure unused virtual-disk is deleted: */
-    if (m_pDiskSkip->isChecked() || m_pDiskCreate->isChecked() || (!m_virtualDisk.isNull() && m_uVirtualDiskId != m_virtualDisk.GetId()))
-        ensureNewVirtualDiskDeleted();
-
-    if (m_pDiskSkip->isChecked())
-    {
-        /* Ask user about disk-less machine unless that's the recommendation: */
-        if (!m_fRecommendedNoDisk)
-            fResult = msgCenter().confirmHardDisklessMachine(thisImp());
-    }
-    else if (m_pDiskCreate->isChecked())
-    {
-        /* Show the New Virtual Hard Drive wizard: */
-        fResult = getWithNewVirtualDiskWizard();
-    }
-
-    if (fResult)
-    {
-        /* Lock finish button: */
-        startProcessing();
-
-        /* Try to create VM: */
-        fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
-
-        /* Unlock finish button: */
-        endProcessing();
-    }
-
-    /* Return result: */
-    return fResult;
-}

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

@@ -49 +49 @@
     UIWizardNewVMPage4();
 
-    /** Handlers. */
-    void updateVirtualDiskSource();
-    void getWithFileOpenDialog();
-    bool getWithNewVirtualDiskWizard();
-
 
     /** @name Property getters/setters
      * @{ */
-       CMedium virtualDisk() const { return m_virtualDisk; }
-       void setVirtualDisk(const CMedium &virtualDisk) { m_virtualDisk = virtualDisk; }
-       QUuid virtualDiskId() const { return m_uVirtualDiskId; }
-       void setVirtualDiskId(const QUuid &uVirtualDiskId) { m_uVirtualDiskId = uVirtualDiskId; }
-       QString virtualDiskName() const { return m_strVirtualDiskName; }
-       void setVirtualDiskName(const QString &strVirtualDiskName) { m_strVirtualDiskName = strVirtualDiskName; }
-       QString virtualDiskLocation() const { return m_strVirtualDiskLocation; }
-       void setVirtualDiskLocation(const QString &strVirtualDiskLocation) { m_strVirtualDiskLocation = strVirtualDiskLocation; }
        int baseMemory() const;
        int VCPUCount() const;
     /** @} */
 
-    QWidget *createDiskWidgets();
     QWidget *createHardwareWidgets();
-
-    /** Helpers. */
-    void ensureNewVirtualDiskDeleted();
     void retranslateWidgets();
 
-    /** Input. */
-    bool m_fRecommendedNoDisk;
 
-    /** @name Variables
-     * @{ */
-       CMedium m_virtualDisk;
-       QUuid   m_uVirtualDiskId;
-       QString m_strVirtualDiskName;
-       QString m_strVirtualDiskLocation;
-    /** @} */
 
     /** @name Widgets
      * @{ */
-       QRadioButton *m_pDiskSkip;
-       QRadioButton *m_pDiskCreate;
-       QRadioButton *m_pDiskPresent;
-       UIMediaComboBox *m_pDiskSelector;
-       QIToolButton *m_pVMMButton;
        UIBaseMemoryEditor *m_pBaseMemoryEditor;
        UIVirtualCPUEditor *m_pVirtualCPUEditor;
@@ -104 +73 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
-    Q_PROPERTY(QUuid virtualDiskId READ virtualDiskId WRITE setVirtualDiskId);
-    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);
@@ -127 +92 @@
 private slots:
 
-    /** Handlers. */
-    void sltVirtualDiskSourceChanged();
-    void sltGetWithFileOpenDialog();
 
 private:
@@ -141 +103 @@
     void cleanupPage();
 
-    /** Validation stuff. */
     bool isComplete() const;
-    bool validatePage();
 
     /** Widgets. */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic4 class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasic5 class implementation.
  */
 
@@ -25 +25 @@
 #include "QIRichTextLabel.h"
 #include "QIToolButton.h"
-#include "UIBaseMemoryEditor.h"
 #include "UIIconPool.h"
 #include "UIMediaComboBox.h"
@@ -31 +30 @@
 #include "UIMediumSelector.h"
 #include "UIMessageCenter.h"
-#include "UIVirtualCPUEditor.h"
 #include "UIWizardNewVD.h"
 #include "UIWizardNewVM.h"
-#include "UIWizardNewVMPageBasic4.h"
-
-UIWizardNewVMPage4::UIWizardNewVMPage4()
+#include "UIWizardNewVMPageBasic5.h"
+
+UIWizardNewVMPage5::UIWizardNewVMPage5()
     : m_fRecommendedNoDisk(false)
     , m_pDiskSkip(0)
@@ -43 +41 @@
     , m_pDiskSelector(0)
     , m_pVMMButton(0)
-    , m_pBaseMemoryEditor(0)
-    , m_pVirtualCPUEditor(0)
-{
-}
-
-void UIWizardNewVMPage4::updateVirtualDiskSource()
+{
+}
+
+void UIWizardNewVMPage5::updateVirtualDiskSource()
 {
     if (!m_pDiskSelector || !m_pVMMButton)
@@ -72 +68 @@
 }
 
-void UIWizardNewVMPage4::getWithFileOpenDialog()
+void UIWizardNewVMPage5::getWithFileOpenDialog()
 {
     /* Get opened medium id: */
@@ -95 +91 @@
 }
 
-bool UIWizardNewVMPage4::getWithNewVirtualDiskWizard()
+bool UIWizardNewVMPage5::getWithNewVirtualDiskWizard()
 {
     /* Create New Virtual Hard Drive wizard: */
@@ -117 +113 @@
 }
 
-int UIWizardNewVMPage4::baseMemory() const
-{
-    if (!m_pBaseMemoryEditor)
-        return 0;
-    return m_pBaseMemoryEditor->value();
-}
-
-int UIWizardNewVMPage4::VCPUCount() const
-{
-    if (!m_pVirtualCPUEditor)
-        return 1;
-    return m_pVirtualCPUEditor->value();
-}
-
-void UIWizardNewVMPage4::ensureNewVirtualDiskDeleted()
+void UIWizardNewVMPage5::ensureNewVirtualDiskDeleted()
 {
     /* Make sure virtual-disk valid: */
@@ -155 +137 @@
 }
 
-void UIWizardNewVMPage4::retranslateWidgets()
+void UIWizardNewVMPage5::retranslateWidgets()
 {
     if (m_pDiskSkip)
@@ -167 +149 @@
 }
 
-QWidget *UIWizardNewVMPage4::createDiskWidgets()
+QWidget *UIWizardNewVMPage5::createDiskWidgets()
 {
     QWidget *pDiskContainer = new QWidget;
@@ -197 +179 @@
 }
 
-QWidget *UIWizardNewVMPage4::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);
-    return pHardwareContainer;
-}
-
-UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
+UIWizardNewVMPageBasic5::UIWizardNewVMPageBasic5()
     : m_pLabel(0)
 {
@@ -218 +188 @@
     registerField("virtualDiskName", this, "virtualDiskName");
     registerField("virtualDiskLocation", this, "virtualDiskLocation");
-    registerField("baseMemory", this, "baseMemory");
-    registerField("VCPUCount", this, "VCPUCount");
-}
-
-void UIWizardNewVMPageBasic4::prepare()
+}
+
+void UIWizardNewVMPageBasic5::prepare()
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
@@ -235 +203 @@
 }
 
-void UIWizardNewVMPageBasic4::createConnections()
+void UIWizardNewVMPageBasic5::createConnections()
 {
     connect(m_pDiskSkip, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
     connect(m_pDiskCreate, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
     connect(m_pDiskPresent, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
     connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
-            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
     connect(m_pVMMButton, &QIToolButton::clicked,
-            this, &UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog);
-}
-
-void UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged()
+            this, &UIWizardNewVMPageBasic5::sltGetWithFileOpenDialog);
+}
+
+void UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged()
 {
     /* Call to base-class: */
@@ -258 +226 @@
 }
 
-void UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog()
+void UIWizardNewVMPageBasic5::sltGetWithFileOpenDialog()
 {
     /* Call to base-class: */
@@ -264 +232 @@
 }
 
-void UIWizardNewVMPageBasic4::retranslateUi()
-{
-    /* Translate page: */
+void UIWizardNewVMPageBasic5::retranslateUi()
+{
     setTitle(UIWizardNewVM::tr("Hard disk and Hardware"));
 
-    /* Translate widgets: */
     QString strRecommendedHDD = field("type").value<CGuestOSType>().isNull() ? QString() :
                                 UICommon::formatSize(field("type").value<CGuestOSType>().GetRecommendedHDD());
@@ -278 +244 @@
                                             "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. "
-                                            "The recommended size of the hard disk is <b>%1</b>.")
+                                            "The recommended size of the hard disk is <b>%1</b>.</p>")
                           .arg(strRecommendedHDD));
+
     retranslateWidgets();
 }
 
-void UIWizardNewVMPageBasic4::initializePage()
-{
-    /* Translate page: */
+void UIWizardNewVMPageBasic5::initializePage()
+{
     retranslateUi();
 
@@ -292 +258 @@
 
     CGuestOSType type = field("type").value<CGuestOSType>();
-    ULONG recommendedRam = type.GetRecommendedRAM();
-    if (m_pBaseMemoryEditor)
-        m_pBaseMemoryEditor->setValue(recommendedRam);
-
-
-    /* Prepare initial disk choice: */
+
     if (type.GetRecommendedHDD() != 0)
     {
@@ -320 +281 @@
 }
 
-void UIWizardNewVMPageBasic4::cleanupPage()
+void UIWizardNewVMPageBasic5::cleanupPage()
 {
     /* Call to base-class: */
@@ -327 +288 @@
 }
 
-bool UIWizardNewVMPageBasic4::isComplete() const
-{
-    /* Make sure 'virtualDisk' field feats the rules: */
+bool UIWizardNewVMPageBasic5::isComplete() const
+{
     if (!m_pDiskSkip)
         return false;
@@ -337 +297 @@
 }
 
-bool UIWizardNewVMPageBasic4::validatePage()
+bool UIWizardNewVMPageBasic5::validatePage()
 {
     /* Initial result: */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic4 class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasic5 class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -36 +36 @@
 class QIRichTextLabel;
 class QIToolButton;
-class UIBaseMemoryEditor;
 class UIMediaComboBox;
-class UIVirtualCPUEditor;
 
 /** 3rd page of the New Virtual Machine wizard (base part). */
-class UIWizardNewVMPage4 : public UIWizardPageBase
+class UIWizardNewVMPage5 : public UIWizardPageBase
 {
 
@@ -47 +45 @@
 
     /** Constructor. */
-    UIWizardNewVMPage4();
+    UIWizardNewVMPage5();
 
     /** Handlers. */
@@ -65 +63 @@
        QString virtualDiskLocation() const { return m_strVirtualDiskLocation; }
        void setVirtualDiskLocation(const QString &strVirtualDiskLocation) { m_strVirtualDiskLocation = strVirtualDiskLocation; }
-       int baseMemory() const;
-       int VCPUCount() const;
     /** @} */
 
     QWidget *createDiskWidgets();
-    QWidget *createHardwareWidgets();
 
     /** Helpers. */
@@ -94 +89 @@
        UIMediaComboBox *m_pDiskSelector;
        QIToolButton *m_pVMMButton;
-       UIBaseMemoryEditor *m_pBaseMemoryEditor;
-       UIVirtualCPUEditor *m_pVirtualCPUEditor;
     /** @} */
 
@@ -101 +94 @@
 
 /** 3rd page of the New Virtual Machine wizard (basic extension). */
-class UIWizardNewVMPageBasic4 : public UIWizardPage, public UIWizardNewVMPage4
+class UIWizardNewVMPageBasic5 : public UIWizardPage, public UIWizardNewVMPage5
 {
     Q_OBJECT;
@@ -108 +101 @@
     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:
 
     /** Constructor. */
-    UIWizardNewVMPageBasic4();
+    UIWizardNewVMPageBasic5();
 
 protected:
@@ -149 +140 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h */

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

@@ -27 +27 @@
 #include "UIWizardNewVMPageBasic3.h"
 #include "UIWizardNewVMPageBasic4.h"
+#include "UIWizardNewVMPageBasic5.h"
 
 /* Forward declarations: */
@@ -37 +38 @@
                                 public UIWizardNewVMPage2,
                                 public UIWizardNewVMPage3,
-                                public UIWizardNewVMPage4
+                                public UIWizardNewVMPage4,
+                                public UIWizardNewVMPage5
 {