Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (revision 41389) @@ -22,5 +22,4 @@ #include #include -#include #include @@ -228,15 +227,7 @@ { m_pLabel = new QIRichTextLabel(this); - m_pNameAndSystemCnt = new QGroupBox(this); - { - m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - QHBoxLayout *pNameAndSystemLayout = new QHBoxLayout(m_pNameAndSystemCnt); - { - m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt); - pNameAndSystemLayout->addWidget(m_pNameAndSystemEditor); - } - } + m_pNameAndSystemEditor = new UINameAndSystemEditor(this); pMainLayout->addWidget(m_pLabel); - pMainLayout->addWidget(m_pNameAndSystemCnt); + pMainLayout->addWidget(m_pNameAndSystemEditor); pMainLayout->addStretch(); } @@ -275,5 +266,4 @@ "The name you choose will be used throughout VirtualBox " "to identify this machine.")); - m_pNameAndSystemCnt->setTitle(UIWizardNewVM::tr("Name and operating system")); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h (revision 41389) @@ -24,5 +24,4 @@ /* Forward declarations: */ -class QGroupBox; class UINameAndSystemEditor; class QIRichTextLabel; @@ -58,5 +57,4 @@ /* Widgets: */ - QGroupBox *m_pNameAndSystemCnt; UINameAndSystemEditor *m_pNameAndSystemEditor; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp (revision 41389) @@ -23,5 +23,4 @@ #include #include -#include #include @@ -60,46 +59,41 @@ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { - m_pLabel1 = new QIRichTextLabel(this); - m_pMemoryCnt = new QGroupBox(this); + m_pLabel = new QIRichTextLabel(this); + QGridLayout *pMemoryLayout = new QGridLayout; { - m_pMemoryCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - QGridLayout *pMemoryCntLayout = new QGridLayout(m_pMemoryCnt); + m_pRamSlider = new VBoxGuestRAMSlider(this); { - m_pRamSlider = new VBoxGuestRAMSlider(m_pMemoryCnt); - { - m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - m_pRamSlider->setOrientation(Qt::Horizontal); - m_pRamSlider->setTickPosition(QSlider::TicksBelow); - } - m_pRamEditor = new QILineEdit(m_pMemoryCnt); - { - m_pRamEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - m_pRamEditor->setFixedWidthByText("88888"); - m_pRamEditor->setAlignment(Qt::AlignRight); - m_pRamEditor->setValidator(new QIntValidator(m_pRamSlider->minRAM(), m_pRamSlider->maxRAM(), this)); - } - m_pRamUnits = new QLabel(m_pMemoryCnt); - { - m_pRamUnits->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - } - m_pRamMin = new QLabel(m_pMemoryCnt); - { - m_pRamMin->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - } - QSpacerItem *m_pRamSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding); - m_pRamMax = new QLabel(m_pMemoryCnt); - { - m_pRamMax->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - } - pMemoryCntLayout->addWidget(m_pRamSlider, 0, 0, 1, 3); - pMemoryCntLayout->addWidget(m_pRamEditor, 0, 3); - pMemoryCntLayout->addWidget(m_pRamUnits, 0, 4); - pMemoryCntLayout->addWidget(m_pRamMin, 1, 0); - pMemoryCntLayout->addItem(m_pRamSpacer, 1, 1); - pMemoryCntLayout->addWidget(m_pRamMax, 1, 2); + m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + m_pRamSlider->setOrientation(Qt::Horizontal); + m_pRamSlider->setTickPosition(QSlider::TicksBelow); } + m_pRamEditor = new QILineEdit(this); + { + m_pRamEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + m_pRamEditor->setFixedWidthByText("88888"); + m_pRamEditor->setAlignment(Qt::AlignRight); + m_pRamEditor->setValidator(new QIntValidator(m_pRamSlider->minRAM(), m_pRamSlider->maxRAM(), this)); + } + m_pRamUnits = new QLabel(this); + { + m_pRamUnits->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + } + m_pRamMin = new QLabel(this); + { + m_pRamMin->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + } + m_pRamMax = new QLabel(this); + { + m_pRamMax->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + } + pMemoryLayout->addWidget(m_pRamSlider, 0, 0, 1, 3); + pMemoryLayout->addWidget(m_pRamEditor, 0, 3); + pMemoryLayout->addWidget(m_pRamUnits, 0, 4); + pMemoryLayout->addWidget(m_pRamMin, 1, 0); + pMemoryLayout->setColumnStretch(1, 1); + pMemoryLayout->addWidget(m_pRamMax, 1, 2); } - pMainLayout->addWidget(m_pLabel1); - pMainLayout->addWidget(m_pMemoryCnt); + pMainLayout->addWidget(m_pLabel); + pMainLayout->addLayout(pMemoryLayout); pMainLayout->addStretch(); } @@ -139,9 +133,8 @@ QString strRecommendedRAM = field("type").value().isNull() ? QString() : QString::number(field("type").value().GetRecommendedRAM()); - m_pLabel1->setText(UIWizardNewVM::tr("

Select the amount of memory (RAM) in megabytes " - "to be allocated to the virtual machine.

" - "

The recommended memory size is %1 MB.

") - .arg(strRecommendedRAM)); - m_pMemoryCnt->setTitle(UIWizardNewVM::tr("&Memory size")); + m_pLabel->setText(UIWizardNewVM::tr("

Select the amount of memory (RAM) in megabytes " + "to be allocated to the virtual machine.

" + "

The recommended memory size is %1 MB.

") + .arg(strRecommendedRAM)); m_pRamUnits->setText(VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes")); m_pRamMin->setText(QString("%1 %2").arg(m_pRamSlider->minRAM()).arg(VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes"))); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h (revision 41389) @@ -24,5 +24,4 @@ /* Forward declarations: */ -class QGroupBox; class VBoxGuestRAMSlider; class QILineEdit; @@ -43,5 +42,4 @@ /* Widgets: */ - QGroupBox *m_pMemoryCnt; VBoxGuestRAMSlider *m_pRamSlider; QILineEdit *m_pRamEditor; @@ -79,5 +77,5 @@ /* Widgets: */ - QIRichTextLabel *m_pLabel1; + QIRichTextLabel *m_pLabel; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp (revision 41389) @@ -22,5 +22,4 @@ #include #include -#include #include @@ -43,21 +42,19 @@ { /* Enable/disable controls: */ - m_pDiskCreate->setEnabled(m_pDiskCnt->isChecked()); - m_pDiskPresent->setEnabled(m_pDiskCnt->isChecked()); - m_pDiskSelector->setEnabled(m_pDiskPresent->isEnabled() && m_pDiskPresent->isChecked()); - m_pVMMButton->setEnabled(m_pDiskPresent->isEnabled() && m_pDiskPresent->isChecked()); + m_pDiskSelector->setEnabled(m_pDiskPresent->isChecked()); + m_pVMMButton->setEnabled(m_pDiskPresent->isChecked()); /* Fetch filed values: */ - if (m_pDiskCnt->isChecked() && m_pDiskPresent->isChecked()) + if (m_pDiskSkip->isChecked()) + { + m_strVirtualDiskId = QString(); + m_strVirtualDiskName = QString(); + m_strVirtualDiskLocation = QString(); + } + else if (m_pDiskPresent->isChecked()) { m_strVirtualDiskId = m_pDiskSelector->id(); m_strVirtualDiskName = m_pDiskSelector->currentText(); m_strVirtualDiskLocation = m_pDiskSelector->location(); - } - else - { - m_strVirtualDiskId = QString(); - m_strVirtualDiskName = QString(); - m_strVirtualDiskLocation = QString(); } } @@ -131,38 +128,32 @@ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { - m_pLabel1 = new QIRichTextLabel(this); - m_pDiskCnt = new QGroupBox(this); + m_pLabel = new QIRichTextLabel(this); + QGridLayout *pDiskLayout = new QGridLayout; { - m_pDiskCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - m_pDiskCnt->setCheckable(true); - QGridLayout *pDiskLayout = new QGridLayout(m_pDiskCnt); + 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 VBoxMediaComboBox(this); { - m_pDiskCreate = new QRadioButton(m_pDiskCnt); - m_pDiskPresent = new QRadioButton(m_pDiskCnt); - QStyleOptionButton options; - options.initFrom(m_pDiskCreate); - int iWidth = m_pDiskCreate->style()->subElementRect(QStyle::SE_RadioButtonIndicator, &options, m_pDiskCreate).width() + - m_pDiskCreate->style()->pixelMetric(QStyle::PM_RadioButtonLabelSpacing, &options, m_pDiskCreate) - - pDiskLayout->spacing() - 1; - QSpacerItem *pSpacer = new QSpacerItem(iWidth, 0, QSizePolicy::Fixed, QSizePolicy::Fixed); - m_pDiskSelector = new VBoxMediaComboBox(m_pDiskCnt); - { - m_pDiskSelector->setType(VBoxDefs::MediumType_HardDisk); - m_pDiskSelector->repopulate(); - } - m_pVMMButton = new QIToolButton(m_pDiskCnt); - { - m_pVMMButton->setAutoRaise(true); - m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png")); - } - pDiskLayout->addWidget(m_pDiskCreate, 0, 0, 1, 3); - pDiskLayout->addWidget(m_pDiskPresent, 1, 0, 1, 3); - pDiskLayout->addItem(pSpacer, 2, 0); - pDiskLayout->addWidget(m_pDiskSelector, 2, 1); - pDiskLayout->addWidget(m_pVMMButton, 2, 2); + m_pDiskSelector->setType(VBoxDefs::MediumType_HardDisk); + m_pDiskSelector->repopulate(); } + m_pVMMButton = new QIToolButton(this); + { + m_pVMMButton->setAutoRaise(true); + m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_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_pLabel1); - pMainLayout->addWidget(m_pDiskCnt); + pMainLayout->addWidget(m_pLabel); + pMainLayout->addLayout(pDiskLayout); pMainLayout->addStretch(); updateVirtualDiskSource(); @@ -170,5 +161,5 @@ /* Setup connections: */ - connect(m_pDiskCnt, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); + connect(m_pDiskSkip, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); connect(m_pDiskCreate, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); connect(m_pDiskPresent, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); @@ -208,12 +199,12 @@ QString strRecommendedHDD = field("type").value().isNull() ? QString() : VBoxGlobal::formatSize(field("type").value().GetRecommendedHDD()); - m_pLabel1->setText(UIWizardNewVM::tr("

If you wish you can add a virtual hard drive to the new machine. " - "You can either create a new hard drive 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 drive is %1.

") - .arg(strRecommendedHDD)); - m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard &drive")); + m_pLabel->setText(UIWizardNewVM::tr("

If you wish you can add a virtual hard drive to the new machine. " + "You can either create a new hard drive 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 drive is %1.

") + .arg(strRecommendedHDD)); + m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add virtual hard drive")); m_pDiskCreate->setText(UIWizardNewVM::tr("&Create new virtual hard drive")); m_pDiskPresent->setText(UIWizardNewVM::tr("&Use existing virtual hard drive file")); @@ -227,10 +218,7 @@ /* Prepare initial choice: */ - m_pDiskCnt->setChecked(true); + m_pDiskCreate->setFocus(); + m_pDiskCreate->setChecked(true); m_pDiskSelector->setCurrentIndex(0); - m_pDiskCreate->setChecked(true); - - /* 'Create new hard-disk' should have focus initially: */ - m_pDiskCreate->setFocus(); } @@ -245,5 +233,5 @@ { /* Make sure 'virtualDisk' field feats the rules: */ - return !m_pDiskCnt->isChecked() || + return m_pDiskSkip->isChecked() || !m_pDiskPresent->isChecked() || !vboxGlobal().findMedium(m_pDiskSelector->id()).isNull(); @@ -256,8 +244,8 @@ /* Ensure unused virtual-disk is deleted: */ - if (!m_pDiskCnt->isChecked() || m_pDiskCreate->isChecked() || (!m_virtualDisk.isNull() && m_strVirtualDiskId != m_virtualDisk.GetId())) + if (m_pDiskSkip->isChecked() || m_pDiskCreate->isChecked() || (!m_virtualDisk.isNull() && m_strVirtualDiskId != m_virtualDisk.GetId())) ensureNewVirtualDiskDeleted(); - if (!m_pDiskCnt->isChecked()) + if (m_pDiskSkip->isChecked()) { /* Ask user about disk-less machine: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h (revision 41389) @@ -28,5 +28,4 @@ /* Forward declarations: */ -class QGroupBox; class QRadioButton; class VBoxMediaComboBox; @@ -73,5 +72,5 @@ /* Widgets: */ - QGroupBox *m_pDiskCnt; + QRadioButton *m_pDiskSkip; QRadioButton *m_pDiskCreate; QRadioButton *m_pDiskPresent; @@ -121,5 +120,5 @@ /* Widgets: */ - QIRichTextLabel *m_pLabel1; + QIRichTextLabel *m_pLabel; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp (revision 41389) @@ -56,5 +56,5 @@ { m_pMemoryCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - QGridLayout *pMemoryCntLayout = new QGridLayout(m_pMemoryCnt); + QGridLayout *pMemoryLayout = new QGridLayout(m_pMemoryCnt); { m_pRamSlider = new VBoxGuestRAMSlider(m_pMemoryCnt); @@ -81,15 +81,14 @@ m_pRamMin->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); } - QSpacerItem *m_pRamSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding); m_pRamMax = new QLabel(m_pMemoryCnt); { m_pRamMax->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); } - pMemoryCntLayout->addWidget(m_pRamSlider, 0, 0, 1, 3); - pMemoryCntLayout->addWidget(m_pRamEditor, 0, 3); - pMemoryCntLayout->addWidget(m_pRamUnits, 0, 4); - pMemoryCntLayout->addWidget(m_pRamMin, 1, 0); - pMemoryCntLayout->addItem(m_pRamSpacer, 1, 1); - pMemoryCntLayout->addWidget(m_pRamMax, 1, 2); + pMemoryLayout->addWidget(m_pRamSlider, 0, 0, 1, 3); + pMemoryLayout->addWidget(m_pRamEditor, 0, 3); + pMemoryLayout->addWidget(m_pRamUnits, 0, 4); + pMemoryLayout->addWidget(m_pRamMin, 1, 0); + pMemoryLayout->setColumnStretch(1, 1); + pMemoryLayout->addWidget(m_pRamMax, 1, 2); } } @@ -97,8 +96,7 @@ { m_pDiskCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - m_pDiskCnt->setCheckable(true); - m_pDiskCnt->setChecked(true); - QGridLayout *pDiskCntLayout = new QGridLayout(m_pDiskCnt); - { + QGridLayout *pDiskLayout = new QGridLayout(m_pDiskCnt); + { + m_pDiskSkip = new QRadioButton(m_pDiskCnt); m_pDiskCreate = new QRadioButton(m_pDiskCnt); { @@ -107,9 +105,7 @@ m_pDiskPresent = new QRadioButton(m_pDiskCnt); QStyleOptionButton options; - options.initFrom(m_pDiskCreate); - int iWidth = m_pDiskCreate->style()->subElementRect(QStyle::SE_RadioButtonIndicator, &options, m_pDiskCreate).width() + - m_pDiskCreate->style()->pixelMetric(QStyle::PM_RadioButtonLabelSpacing, &options, m_pDiskCreate) - - pDiskCntLayout->spacing() - 1; - QSpacerItem *pSpacer = new QSpacerItem(iWidth, 0, QSizePolicy::Fixed, QSizePolicy::Fixed); + options.initFrom(m_pDiskPresent); + int iWidth = m_pDiskPresent->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pDiskPresent); + pDiskLayout->setColumnMinimumWidth(0, iWidth); m_pDiskSelector = new VBoxMediaComboBox(m_pDiskCnt); { @@ -122,9 +118,9 @@ m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png")); } - pDiskCntLayout->addWidget(m_pDiskCreate, 0, 0, 1, 3); - pDiskCntLayout->addWidget(m_pDiskPresent, 1, 0, 1, 3); - pDiskCntLayout->addItem(pSpacer, 2, 0); - pDiskCntLayout->addWidget(m_pDiskSelector, 2, 1); - pDiskCntLayout->addWidget(m_pVMMButton, 2, 2); + 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); } } @@ -141,5 +137,5 @@ connect(m_pRamSlider, SIGNAL(valueChanged(int)), this, SLOT(sltRamSliderValueChanged(int))); connect(m_pRamEditor, SIGNAL(textChanged(const QString &)), this, SLOT(sltRamEditorTextChanged(const QString &))); - connect(m_pDiskCnt, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); + connect(m_pDiskSkip, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); connect(m_pDiskCreate, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); connect(m_pDiskPresent, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged())); @@ -229,5 +225,6 @@ m_pRamMin->setText(QString("%1 %2").arg(m_pRamSlider->minRAM()).arg(VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes"))); m_pRamMax->setText(QString("%1 %2").arg(m_pRamSlider->maxRAM()).arg(VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes"))); - m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard &drive")); + m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard drive")); + m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add virtual hard drive")); m_pDiskCreate->setText(UIWizardNewVM::tr("&Create new virtual hard drive")); m_pDiskPresent->setText(UIWizardNewVM::tr("&Use existing virtual hard drive file")); @@ -255,5 +252,5 @@ return UIWizardPage::isComplete() && (m_pRamSlider->value() >= qMax(1, (int)m_pRamSlider->minRAM()) && m_pRamSlider->value() <= (int)m_pRamSlider->maxRAM()) && - (!m_pDiskCnt->isChecked() || !m_pDiskPresent->isChecked() || !vboxGlobal().findMedium(m_pDiskSelector->id()).isNull()); + (m_pDiskSkip->isChecked() || !m_pDiskPresent->isChecked() || !vboxGlobal().findMedium(m_pDiskSelector->id()).isNull()); } @@ -277,5 +274,5 @@ if (fResult) { - if (m_pDiskCnt->isChecked() && m_pDiskCreate->isChecked()) + if (m_pDiskCreate->isChecked()) { /* Show the New Virtual Hard Drive wizard if necessary: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h (revision 41388) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h (revision 41389) @@ -24,4 +24,7 @@ #include "UIWizardNewVMPageBasic2.h" #include "UIWizardNewVMPageBasic3.h" + +/* Forward declarations: */ +class QGroupBox; /* Expert page of the New Virtual Machine wizard: */ @@ -72,4 +75,9 @@ bool isComplete() const; bool validatePage(); + + /* Widgets: */ + QGroupBox *m_pNameAndSystemCnt; + QGroupBox *m_pMemoryCnt; + QGroupBox *m_pDiskCnt; };