Changeset 41392 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 22, 2012 2:13:30 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Create Virtual Hard Drive wizard: Removing group-boxes from basic mode.

Location:

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

Files:

• UIWizard.cpp (modified) (1 diff)
• newvd/UIWizardNewVDPageBasic1.cpp (modified) (4 diffs)
• newvd/UIWizardNewVDPageBasic1.h (modified) (3 diffs)
• newvd/UIWizardNewVDPageBasic2.cpp (modified) (4 diffs)
• newvd/UIWizardNewVDPageBasic2.h (modified) (2 diffs)
• newvd/UIWizardNewVDPageBasic3.cpp (modified) (3 diffs)
• newvd/UIWizardNewVDPageBasic3.h (modified) (2 diffs)
• newvd/UIWizardNewVDPageExpert.cpp (modified) (3 diffs)
• newvd/UIWizardNewVDPageExpert.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -403 +403 @@
     {
         case UIWizardType_NewVD:
+            dRatio += 0.1;
         case UIWizardType_CloneVD:
         case UIWizardType_ExportAppliance:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -21 +21 @@
 #include <QVBoxLayout>
 #include <QButtonGroup>
-#include <QGroupBox>
 #include <QRadioButton>
 
@@ -34 +33 @@
 }
 
-QRadioButton* UIWizardNewVDPage1::addFormatButton(QVBoxLayout *pFormatsLayout, CMediumFormat mf)
+void UIWizardNewVDPage1::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatsLayout, CMediumFormat medFormat)
 {
     /* Check that medium format supports creation: */
-    ULONG uFormatCapabilities = mf.GetCapabilities();
+    ULONG uFormatCapabilities = medFormat.GetCapabilities();
     if (!(uFormatCapabilities & MediumFormatCapabilities_CreateFixed ||
           uFormatCapabilities & MediumFormatCapabilities_CreateDynamic))
-        return 0;
+        return;
 
     /* Check that medium format supports creation of virtual hard-disks: */
     QVector<QString> fileExtensions;
     QVector<KDeviceType> deviceTypes;
-    mf.DescribeFileExtensions(fileExtensions, deviceTypes);
+    medFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
     if (!deviceTypes.contains(KDeviceType_HardDisk))
-        return 0;
+        return;
 
     /* Create/add corresponding radio-button: */
-    QRadioButton *pFormatButton = new QRadioButton(m_pFormatCnt);
+    QRadioButton *pFormatButton = new QRadioButton(pParent);
     pFormatsLayout->addWidget(pFormatButton);
-    return pFormatButton;
+    m_formats << medFormat;
+    m_formatNames << medFormat.GetName();
+    m_pFormatButtonGroup->addButton(pFormatButton, m_formatNames.size() - 1);
 }
 
@@ -76 +77 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pFormatCnt = new QGroupBox(this);
+        QVBoxLayout *pFormatsLayout = new QVBoxLayout;
         {
-            m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            m_pFormatButtonGroup = new QButtonGroup(m_pFormatCnt);
+            m_pFormatButtonGroup = new QButtonGroup(this);
             {
-                QVBoxLayout *pFormatsLayout = new QVBoxLayout(m_pFormatCnt);
+                CSystemProperties systemProperties = vboxGlobal().virtualBox().GetSystemProperties();
+                const QVector<CMediumFormat> &medFormats = systemProperties.GetMediumFormats();
+                for (int i = 0; i < medFormats.size(); ++i)
                 {
-                    CSystemProperties systemProperties = vboxGlobal().virtualBox().GetSystemProperties();
-                    const QVector<CMediumFormat> &medFormats = systemProperties.GetMediumFormats();
-                    for (int i = 0; i < medFormats.size(); ++i)
-                    {
-                        const CMediumFormat &medFormat = medFormats[i];
-                        QString strFormatName(medFormat.GetName());
-                        if (strFormatName == "VDI")
-                        {
-                            QRadioButton *pButton = addFormatButton(pFormatsLayout, medFormat);
-                            if (pButton)
-                            {
-                                m_formats << medFormat;
-                                m_formatNames << strFormatName;
-                                m_pFormatButtonGroup->addButton(pButton, m_formatNames.size() - 1);
-                            }
-                        }
-                    }
-                    for (int i = 0; i < medFormats.size(); ++i)
-                    {
-                        const CMediumFormat &medFormat = medFormats[i];
-                        QString strFormatName(medFormat.GetName());
-                        if (strFormatName != "VDI")
-                        {
-                            QRadioButton *pButton = addFormatButton(pFormatsLayout, medFormat);
-                            if (pButton)
-                            {
-                                m_formats << medFormat;
-                                m_formatNames << strFormatName;
-                                m_pFormatButtonGroup->addButton(pButton, m_formatNames.size() - 1);
-                            }
-                        }
-                    }
+                    const CMediumFormat &medFormat = medFormats[i];
+                    if (medFormat.GetName() == "VDI")
+                        addFormatButton(this, pFormatsLayout, medFormat);
                 }
-                m_pFormatButtonGroup->button(0)->click();
-                m_pFormatButtonGroup->button(0)->setFocus();
+                for (int i = 0; i < medFormats.size(); ++i)
+                {
+                    const CMediumFormat &medFormat = medFormats[i];
+                    if (medFormat.GetName() != "VDI")
+                        addFormatButton(this, pFormatsLayout, medFormat);
+                }
             }
+            m_pFormatButtonGroup->button(0)->click();
+            m_pFormatButtonGroup->button(0)->setFocus();
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pFormatCnt);
+        pMainLayout->addLayout(pFormatsLayout);
         pMainLayout->addStretch();
     }
@@ -143 +122 @@
                                         "for the new virtual hard drive. If you do not need to use it "
                                         "with other virtualization software you can leave this setting unchanged."));
-    m_pFormatCnt->setTitle(UIWizardNewVD::tr("File &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.h

@@ -27 +27 @@
 class QVBoxLayout;
 class QButtonGroup;
-class QGroupBox;
 class QRadioButton;
 class QIRichTextLabel;
@@ -40 +39 @@
 
     /* Helping stuff: */
-    QRadioButton* addFormatButton(QVBoxLayout *pFormatsLayout, CMediumFormat mf);
+    void addFormatButton(QWidget *pParent, QVBoxLayout *pFormatsLayout, CMediumFormat medFormat);
 
     /* Stuff for 'mediumFormat' field: */
@@ -50 +49 @@
     QList<CMediumFormat> m_formats;
     QStringList m_formatNames;
-
-    /* Widgets: */
-    QGroupBox *m_pFormatCnt;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp

@@ -20 +20 @@
 /* Global includes: */
 #include <QVBoxLayout>
-#include <QGroupBox>
 #include <QButtonGroup>
 #include <QRadioButton>
@@ -81 +80 @@
         m_pFixedLabel = new QIRichTextLabel(this);
         m_pSplitLabel = new QIRichTextLabel(this);
-        m_pVariantCnt = new QGroupBox(this);
+        QVBoxLayout *pVariantsLayout = new QVBoxLayout;
         {
-            m_pVariantCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QVBoxLayout *pVariantCntLayout = new QVBoxLayout(m_pVariantCnt);
+            m_pVariantButtonGroup = new QButtonGroup(this);
             {
-                m_pVariantButtonGroup = new QButtonGroup(m_pVariantCnt);
+                m_pDynamicalButton = new QRadioButton(this);
                 {
-                    m_pDynamicalButton = new QRadioButton(m_pVariantCnt);
-                    {
-                        m_pDynamicalButton->click();
-                        m_pDynamicalButton->setFocus();
-                    }
-                    m_pFixedButton = new QRadioButton(m_pVariantCnt);
-                    m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
-                    m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
+                    m_pDynamicalButton->click();
+                    m_pDynamicalButton->setFocus();
                 }
-                m_pSplitBox = new QCheckBox(m_pVariantCnt);
-                pVariantCntLayout->addWidget(m_pDynamicalButton);
-                pVariantCntLayout->addWidget(m_pFixedButton);
-                pVariantCntLayout->addWidget(m_pSplitBox);
+                m_pFixedButton = new QRadioButton(this);
+                m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
+                m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
             }
+            m_pSplitBox = new QCheckBox(this);
+            pVariantsLayout->addWidget(m_pDynamicalButton);
+            pVariantsLayout->addWidget(m_pFixedButton);
+            pVariantsLayout->addWidget(m_pSplitBox);
         }
         pMainLayout->addWidget(m_pDescriptionLabel);
@@ -107 +102 @@
         pMainLayout->addWidget(m_pFixedLabel);
         pMainLayout->addWidget(m_pSplitLabel);
-        pMainLayout->addWidget(m_pVariantCnt);
+        pMainLayout->addLayout(pVariantsLayout);
         pMainLayout->addStretch();
     }
@@ -136 +131 @@
                                              "virtual machine on removable USB devices or old systems, some of which cannot "
                                              "handle very large files."));
-    m_pVariantCnt->setTitle(UIWizardNewVD::tr("Storage details"));
     m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
     m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.h

@@ -24 +24 @@
 
 /* Forward declarations: */
-class QGroupBox;
 class QButtonGroup;
 class QRadioButton;
@@ -43 +42 @@
 
     /* Widgets: */
-    QGroupBox *m_pVariantCnt;
     QButtonGroup *m_pVariantButtonGroup;
     QRadioButton *m_pDynamicalButton;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp

@@ -23 +23 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QGroupBox>
 #include <QLineEdit>
 #include <QSlider>
@@ -263 +262 @@
     {
         m_pLocationLabel = new QIRichTextLabel(this);
-        m_pLocationCnt = new QGroupBox(this);
+        QHBoxLayout *pLocationLayout = new QHBoxLayout;
         {
-            m_pLocationCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QHBoxLayout *pLocationCntLayout = new QHBoxLayout(m_pLocationCnt);
+            m_pLocationEditor = new QLineEdit(this);
+            m_pLocationOpenButton = new QIToolButton(this);
             {
-                m_pLocationEditor = new QLineEdit(m_pLocationCnt);
-                m_pLocationOpenButton = new QIToolButton(m_pLocationCnt);
-                {
-                    m_pLocationOpenButton->setAutoRaise(true);
-                    m_pLocationOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", "select_file_dis_16px.png"));
-                }
-                pLocationCntLayout->addWidget(m_pLocationEditor);
-                pLocationCntLayout->addWidget(m_pLocationOpenButton);
+                m_pLocationOpenButton->setAutoRaise(true);
+                m_pLocationOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", "select_file_dis_16px.png"));
             }
+            pLocationLayout->addWidget(m_pLocationEditor);
+            pLocationLayout->addWidget(m_pLocationOpenButton);
         }
         m_pSizeLabel = new QIRichTextLabel(this);
-        m_pSizeCnt = new QGroupBox(this);
+        QGridLayout *m_pSizeLayout = new QGridLayout;
         {
-            m_pSizeCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QGridLayout *m_pSizeCntLayout = new QGridLayout(m_pSizeCnt);
+            m_pSizeSlider = new QSlider(this);
             {
-                m_pSizeSlider = new QSlider(m_pSizeCnt);
-                {
-                    m_pSizeSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-                    m_pSizeSlider->setOrientation(Qt::Horizontal);
-                    m_pSizeSlider->setTickPosition(QSlider::TicksBelow);
-                    m_pSizeSlider->setFocusPolicy(Qt::StrongFocus);
-                    m_pSizeSlider->setPageStep(m_iSliderScale);
-                    m_pSizeSlider->setSingleStep(m_iSliderScale / 8);
-                    m_pSizeSlider->setTickInterval(0);
-                    m_pSizeSlider->setMinimum(sizeMBToSlider(m_uMediumSizeMin, m_iSliderScale));
-                    m_pSizeSlider->setMaximum(sizeMBToSlider(m_uMediumSizeMax, m_iSliderScale));
-                }
-                m_pSizeEditor = new QILineEdit(m_pSizeCnt);
-                {
-                    m_pSizeEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-                    m_pSizeEditor->setFixedWidthByText("88888.88 MB");
-                    m_pSizeEditor->setAlignment(Qt::AlignRight);
-                    m_pSizeEditor->setValidator(new QRegExpValidator(QRegExp(vboxGlobal().sizeRegexp()), this));
-                }
-                QLabel *m_pSizeMin = new QLabel(m_pSizeCnt);
-                {
-                    m_pSizeMin->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-                    m_pSizeMin->setText(vboxGlobal().formatSize(m_uMediumSizeMin));
-                }
-                QSpacerItem *m_pSizeSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed);
-                QLabel *m_pSizeMax = new QLabel(m_pSizeCnt);
-                {
-                    m_pSizeMax->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-                    m_pSizeMax->setText(vboxGlobal().formatSize(m_uMediumSizeMax));
-                }
-                m_pSizeCntLayout->addWidget(m_pSizeSlider, 0, 0, 1, 3);
-                m_pSizeCntLayout->addWidget(m_pSizeEditor, 0, 3);
-                m_pSizeCntLayout->addWidget(m_pSizeMin, 1, 0);
-                m_pSizeCntLayout->addItem(m_pSizeSpacer, 1, 1);
-                m_pSizeCntLayout->addWidget(m_pSizeMax, 1, 2);
+                m_pSizeSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+                m_pSizeSlider->setOrientation(Qt::Horizontal);
+                m_pSizeSlider->setTickPosition(QSlider::TicksBelow);
+                m_pSizeSlider->setFocusPolicy(Qt::StrongFocus);
+                m_pSizeSlider->setPageStep(m_iSliderScale);
+                m_pSizeSlider->setSingleStep(m_iSliderScale / 8);
+                m_pSizeSlider->setTickInterval(0);
+                m_pSizeSlider->setMinimum(sizeMBToSlider(m_uMediumSizeMin, m_iSliderScale));
+                m_pSizeSlider->setMaximum(sizeMBToSlider(m_uMediumSizeMax, m_iSliderScale));
             }
-            setMediumSize(uDefaultSize);
+            m_pSizeEditor = new QILineEdit(this);
+            {
+                m_pSizeEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+                m_pSizeEditor->setFixedWidthByText("88888.88 MB");
+                m_pSizeEditor->setAlignment(Qt::AlignRight);
+                m_pSizeEditor->setValidator(new QRegExpValidator(QRegExp(vboxGlobal().sizeRegexp()), this));
+            }
+            QLabel *m_pSizeMin = new QLabel(this);
+            {
+                m_pSizeMin->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+                m_pSizeMin->setText(vboxGlobal().formatSize(m_uMediumSizeMin));
+            }
+            QLabel *m_pSizeMax = new QLabel(this);
+            {
+                m_pSizeMax->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+                m_pSizeMax->setText(vboxGlobal().formatSize(m_uMediumSizeMax));
+            }
+            m_pSizeLayout->addWidget(m_pSizeSlider, 0, 0, 1, 3);
+            m_pSizeLayout->addWidget(m_pSizeEditor, 0, 3);
+            m_pSizeLayout->addWidget(m_pSizeMin, 1, 0);
+            m_pSizeLayout->setColumnStretch(1, 1);
+            m_pSizeLayout->addWidget(m_pSizeMax, 1, 2);
         }
+        setMediumSize(uDefaultSize);
         pMainLayout->addWidget(m_pLocationLabel);
-        pMainLayout->addWidget(m_pLocationCnt);
+        pMainLayout->addLayout(pLocationLayout);
         pMainLayout->addWidget(m_pSizeLabel);
-        pMainLayout->addWidget(m_pSizeCnt);
+        pMainLayout->addLayout(m_pSizeLayout);
         pMainLayout->addStretch();
     }
@@ -372 +362 @@
     m_pLocationLabel->setText(UIWizardNewVD::tr("Please type the name of the new virtual hard drive file into the box below or "
                                                 "click on the folder icon to select a different folder to create the file in."));
-    m_pLocationCnt->setTitle(UIWizardNewVD::tr("&Location"));
     m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard drive file..."));
     m_pSizeLabel->setText(UIWizardNewVD::tr("Select the size of the virtual hard drive in megabytes. This size will be reported "
                                             "to the Guest OS as the maximum size of this hard drive."));
-    m_pSizeCnt->setTitle(UIWizardNewVD::tr("&Size"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.h

@@ -26 +26 @@
 /* Forward declarations: */
 class CMediumFormat;
-class QGroupBox;
 class QLineEdit;
 class QIToolButton;
@@ -74 +73 @@
 
     /* Widgets: */
-    QGroupBox *m_pLocationCnt;
     QLineEdit *m_pLocationEditor;
     QIToolButton *m_pLocationOpenButton;
-    QGroupBox *m_pSizeCnt;
     QSlider *m_pSizeSlider;
     QILineEdit *m_pSizeEditor;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -94 +94 @@
                     m_pSizeMin->setText(vboxGlobal().formatSize(m_uMediumSizeMin));
                 }
-                QSpacerItem *m_pSizeSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed);
                 QLabel *m_pSizeMax = new QLabel(m_pSizeCnt);
                 {
@@ -103 +102 @@
                 m_pSizeCntLayout->addWidget(m_pSizeEditor, 0, 3);
                 m_pSizeCntLayout->addWidget(m_pSizeMin, 1, 0);
-                m_pSizeCntLayout->addItem(m_pSizeSpacer, 1, 1);
+                m_pSizeCntLayout->setColumnStretch(1, 1);
                 m_pSizeCntLayout->addWidget(m_pSizeMax, 1, 2);
             }
         }
-        QVBoxLayout *pFormatWrappingLayout = new QVBoxLayout;
-        {
-            m_pFormatCnt = new QGroupBox(this);
-            {
-                m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-                QVBoxLayout *pFormatCntLayout = new QVBoxLayout(m_pFormatCnt);
-                {
-                    m_pFormatButtonGroup = new QButtonGroup(m_pFormatCnt);
+        m_pFormatCnt = new QGroupBox(this);
+        {
+            m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            QVBoxLayout *pFormatCntLayout = new QVBoxLayout(m_pFormatCnt);
+            {
+                m_pFormatButtonGroup = new QButtonGroup(m_pFormatCnt);
+                {
+                    CSystemProperties systemProperties = vboxGlobal().virtualBox().GetSystemProperties();
+                    const QVector<CMediumFormat> &medFormats = systemProperties.GetMediumFormats();
+                    for (int i = 0; i < medFormats.size(); ++i)
                     {
-                        CSystemProperties systemProperties = vboxGlobal().virtualBox().GetSystemProperties();
-                        const QVector<CMediumFormat> &medFormats = systemProperties.GetMediumFormats();
-                        for (int i = 0; i < medFormats.size(); ++i)
-                        {
-                            const CMediumFormat &medFormat = medFormats[i];
-                            QString strFormatName(medFormat.GetName());
-                            if (strFormatName == "VDI")
-                            {
-                                QRadioButton *pButton = addFormatButton(pFormatCntLayout, medFormat);
-                                if (pButton)
-                                {
-                                    m_formats << medFormat;
-                                    m_formatNames << strFormatName;
-                                    m_pFormatButtonGroup->addButton(pButton, m_formatNames.size() - 1);
-                                }
-                            }
-                        }
-                        for (int i = 0; i < medFormats.size(); ++i)
-                        {
-                            const CMediumFormat &medFormat = medFormats[i];
-                            QString strFormatName(medFormat.GetName());
-                            if (strFormatName != "VDI")
-                            {
-                                QRadioButton *pButton = addFormatButton(pFormatCntLayout, medFormat);
-                                if (pButton)
-                                {
-                                    m_formats << medFormat;
-                                    m_formatNames << strFormatName;
-                                    m_pFormatButtonGroup->addButton(pButton, m_formatNames.size() - 1);
-                                }
-                            }
-                        }
-                        m_pFormatButtonGroup->button(0)->click();
-                        m_pFormatButtonGroup->button(0)->setFocus();
+                        const CMediumFormat &medFormat = medFormats[i];
+                        if (medFormat.GetName() == "VDI")
+                            addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat);
                     }
-                }
-            }
-            QSpacerItem *m_pSizeSpacer = new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
-            pFormatWrappingLayout->addWidget(m_pFormatCnt);
-            pFormatWrappingLayout->addItem(m_pSizeSpacer);
-        }
-        QVBoxLayout *pVariantWrappingLayout = new QVBoxLayout;
-        {
-            m_pVariantCnt = new QGroupBox(this);
-            {
-                m_pVariantCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-                QVBoxLayout *pVariantsLayout = new QVBoxLayout(m_pVariantCnt);
-                {
-                    m_pVariantButtonGroup = new QButtonGroup(m_pVariantCnt);
+                    for (int i = 0; i < medFormats.size(); ++i)
                     {
-                        m_pDynamicalButton = new QRadioButton(m_pVariantCnt);
-                        {
-                            m_pDynamicalButton->click();
-                            m_pDynamicalButton->setFocus();
-                        }
-                        m_pFixedButton = new QRadioButton(m_pVariantCnt);
-                        m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
-                        m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
+                        const CMediumFormat &medFormat = medFormats[i];
+                        if (medFormat.GetName() != "VDI")
+                            addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat);
                     }
-                    m_pSplitBox = new QCheckBox(m_pVariantCnt);
-                    pVariantsLayout->addWidget(m_pDynamicalButton);
-                    pVariantsLayout->addWidget(m_pFixedButton);
-                    pVariantsLayout->addWidget(m_pSplitBox);
-                }
-            }
-            QSpacerItem *m_pSizeSpacer = new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
-            pVariantWrappingLayout->addWidget(m_pVariantCnt);
-            pVariantWrappingLayout->addItem(m_pSizeSpacer);
+                    m_pFormatButtonGroup->button(0)->click();
+                    m_pFormatButtonGroup->button(0)->setFocus();
+                }
+            }
+        }
+        m_pVariantCnt = new QGroupBox(this);
+        {
+            m_pVariantCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            QVBoxLayout *pVariantsLayout = new QVBoxLayout(m_pVariantCnt);
+            {
+                m_pVariantButtonGroup = new QButtonGroup(m_pVariantCnt);
+                {
+                    m_pDynamicalButton = new QRadioButton(m_pVariantCnt);
+                    {
+                        m_pDynamicalButton->click();
+                        m_pDynamicalButton->setFocus();
+                    }
+                    m_pFixedButton = new QRadioButton(m_pVariantCnt);
+                    m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
+                    m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
+                }
+                m_pSplitBox = new QCheckBox(m_pVariantCnt);
+                pVariantsLayout->addWidget(m_pDynamicalButton);
+                pVariantsLayout->addWidget(m_pFixedButton);
+                pVariantsLayout->addWidget(m_pSplitBox);
+            }
         }
         pMainLayout->addWidget(m_pLocationCnt, 0, 0, 1, 2);
         pMainLayout->addWidget(m_pSizeCnt, 1, 0, 1, 2);
-        pMainLayout->addLayout(pFormatWrappingLayout, 2, 0);
-        pMainLayout->addLayout(pVariantWrappingLayout, 2, 1);
+        pMainLayout->addWidget(m_pFormatCnt, 2, 0, Qt::AlignTop);
+        pMainLayout->addWidget(m_pVariantCnt, 2, 1, Qt::AlignTop);
         setMediumSize(uDefaultSize);
         sltMediumFormatChanged();
@@ -256 +225 @@
     /* Translate widgets: */
     m_pLocationCnt->setTitle(UIWizardNewVD::tr("&Location"));
-    m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a virtual hard drive file..."));
+    m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard drive file..."));
     m_pSizeCnt->setTitle(UIWizardNewVD::tr("&Size"));
     m_pFormatCnt->setTitle(UIWizardNewVD::tr("File &type"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.h

@@ -24 +24 @@
 #include "UIWizardNewVDPageBasic2.h"
 #include "UIWizardNewVDPageBasic3.h"
+
+/* Forward declarations: */
+class QGroupBox;
 
 /* Expert page of the New Virtual Hard Drive wizard: */
@@ -71 +74 @@
     bool isComplete() const;
     bool validatePage();
+
+    /* Widgets: */
+    QGroupBox *m_pFormatCnt;
+    QGroupBox *m_pVariantCnt;
+    QGroupBox *m_pLocationCnt;
+    QGroupBox *m_pSizeCnt;
 };