Changeset 41398 in vbox

Timestamp:

May 22, 2012 2:45:37 PM (12 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIWizard.cpp (modified) (1 diff)
• clonevd/UIWizardCloneVDPageBasic1.cpp (modified) (3 diffs)
• clonevd/UIWizardCloneVDPageBasic1.h (modified) (2 diffs)
• clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (6 diffs)
• clonevd/UIWizardCloneVDPageBasic2.h (modified) (3 diffs)
• clonevd/UIWizardCloneVDPageBasic3.cpp (modified) (4 diffs)
• clonevd/UIWizardCloneVDPageBasic3.h (modified) (2 diffs)
• clonevd/UIWizardCloneVDPageBasic4.cpp (modified) (3 diffs)
• clonevd/UIWizardCloneVDPageBasic4.h (modified) (2 diffs)
• clonevd/UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• clonevd/UIWizardCloneVDPageExpert.h (modified) (2 diffs)

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

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

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp

@@ -21 +21 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QGroupBox>
 
 /* Local includes: */
@@ -64 +63 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pSourceDiskCnt = new QGroupBox(this);
+        QHBoxLayout *pSourceDiskLayout = new QHBoxLayout;
         {
-            m_pSourceDiskCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QHBoxLayout *pSourceDiskCntLayout = new QHBoxLayout(m_pSourceDiskCnt);
+            m_pSourceDiskSelector = new VBoxMediaComboBox(this);
             {
-                m_pSourceDiskSelector = new VBoxMediaComboBox(m_pSourceDiskCnt);
-                {
-                    m_pSourceDiskSelector->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
-                    m_pSourceDiskSelector->setType(VBoxDefs::MediumType_HardDisk);
-                    m_pSourceDiskSelector->setCurrentItem(sourceVirtualDisk.GetId());
-                    m_pSourceDiskSelector->repopulate();
-                }
-                m_pSourceDiskOpenButton = new QIToolButton(m_pSourceDiskCnt);
-                {
-                    m_pSourceDiskOpenButton->setAutoRaise(true);
-                    m_pSourceDiskOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png"));
-                }
-                pSourceDiskCntLayout->addWidget(m_pSourceDiskSelector);
-                pSourceDiskCntLayout->addWidget(m_pSourceDiskOpenButton);
+                m_pSourceDiskSelector->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+                m_pSourceDiskSelector->setType(VBoxDefs::MediumType_HardDisk);
+                m_pSourceDiskSelector->setCurrentItem(sourceVirtualDisk.GetId());
+                m_pSourceDiskSelector->repopulate();
             }
+            m_pSourceDiskOpenButton = new QIToolButton(this);
+            {
+                m_pSourceDiskOpenButton->setAutoRaise(true);
+                m_pSourceDiskOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png"));
+            }
+            pSourceDiskLayout->addWidget(m_pSourceDiskSelector);
+            pSourceDiskLayout->addWidget(m_pSourceDiskOpenButton);
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pSourceDiskCnt);
+        pMainLayout->addLayout(pSourceDiskLayout);
         pMainLayout->addStretch();
     }
@@ -118 +113 @@
                                           "if it is not already selected. You can either choose one from the list "
                                           "or use the folder icon beside the list to select one.</p>"));
-    m_pSourceDiskCnt->setTitle(UIWizardCloneVD::tr("Hard drive to &copy"));
     m_pSourceDiskOpenButton->setToolTip(UIWizardCloneVD::tr("Choose a virtual hard drive file to copy..."));
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.h

@@ -25 +25 @@
 
 /* Forward declarations: */
-class QGroupBox;
 class VBoxMediaComboBox;
 class QIToolButton;
@@ -46 +45 @@
 
     /* Widgets: */
-    QGroupBox *m_pSourceDiskCnt;
     VBoxMediaComboBox *m_pSourceDiskSelector;
     QIToolButton *m_pSourceDiskOpenButton;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

@@ -21 +21 @@
 #include <QVBoxLayout>
 #include <QButtonGroup>
-#include <QGroupBox>
 #include <QRadioButton>
 
@@ -34 +33 @@
 }
 
-QRadioButton* UIWizardCloneVDPage2::addFormatButton(QVBoxLayout *pFormatsLayout, CMediumFormat medFormat)
+void UIWizardCloneVDPage2::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout, CMediumFormat medFormat)
 {
     /* Check that medium format supports creation: */
@@ -40 +39 @@
     if (!(uFormatCapabilities & MediumFormatCapabilities_CreateFixed ||
           uFormatCapabilities & MediumFormatCapabilities_CreateDynamic))
-        return 0;
+        return;
 
     /* Check that medium format supports creation of virtual hard-disks: */
@@ -47 +46 @@
     medFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
     if (!deviceTypes.contains(KDeviceType_HardDisk))
-        return 0;
+        return;
 
     /* Create/add corresponding radio-button: */
-    QRadioButton *pFormatButton = new QRadioButton(m_pFormatCnt);
-    pFormatsLayout->addWidget(pFormatButton);
-    return pFormatButton;
+    QRadioButton *pFormatButton = new QRadioButton(pParent);
+    pFormatLayout->addWidget(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 *pFormatLayout = new QVBoxLayout;
         {
-            m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QVBoxLayout *pFormatsLayout = new QVBoxLayout(m_pFormatCnt);
+            m_pFormatButtonGroup = new QButtonGroup(this);
             {
-                m_pFormatButtonGroup = new QButtonGroup(this);
+                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);
-                            }
-                        }
-                    }
-                    m_pFormatButtonGroup->button(0)->click();
-                    m_pFormatButtonGroup->button(0)->setFocus();
+                    const CMediumFormat &medFormat = medFormats[i];
+                    if (medFormat.GetName() == "VDI")
+                        addFormatButton(this, pFormatLayout, medFormat);
                 }
+                for (int i = 0; i < medFormats.size(); ++i)
+                {
+                    const CMediumFormat &medFormat = medFormats[i];
+                    if (medFormat.GetName() != "VDI")
+                        addFormatButton(this, pFormatLayout, medFormat);
+                }
+                m_pFormatButtonGroup->button(0)->click();
+                m_pFormatButtonGroup->button(0)->setFocus();
             }
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pFormatCnt);
+        pMainLayout->addLayout(pFormatLayout);
         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(UIWizardCloneVD::tr("File &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.h

@@ -26 +26 @@
 /* Forward declarations: */
 class QVBoxLayout;
-class QGroupBox;
 class QButtonGroup;
 class QRadioButton;
@@ -40 +39 @@
 
     /* Helping stuff: */
-    QRadioButton* addFormatButton(QVBoxLayout *pFormatsLayout, CMediumFormat mediumFormat);
+    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/clonevd/UIWizardCloneVDPageBasic3.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 *pVariantLayout = 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);
+            pVariantLayout->addWidget(m_pDynamicalButton);
+            pVariantLayout->addWidget(m_pFixedButton);
+            pVariantLayout->addWidget(m_pSplitBox);
         }
         pMainLayout->addWidget(m_pDescriptionLabel);
@@ -107 +102 @@
         pMainLayout->addWidget(m_pFixedLabel);
         pMainLayout->addWidget(m_pSplitLabel);
-        pMainLayout->addWidget(m_pVariantCnt);
+        pMainLayout->addLayout(pVariantLayout);
         pMainLayout->addStretch();
     }
@@ -136 +131 @@
                                                "virtual machine on removable USB devices or old systems, some of which cannot "
                                                "handle very large files."));
-    m_pVariantCnt->setTitle(UIWizardCloneVD::tr("Storage details"));
     m_pDynamicalButton->setText(UIWizardCloneVD::tr("&Dynamically allocated"));
     m_pFixedButton->setText(UIWizardCloneVD::tr("&Fixed size"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.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/clonevd/UIWizardCloneVDPageBasic4.cpp

@@ -22 +22 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QGroupBox>
 #include <QLineEdit>
 
@@ -159 +158 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pDestinationCnt = new QGroupBox(this);
+        QHBoxLayout *pLocationLayout = new QHBoxLayout;
         {
-            m_pDestinationCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QHBoxLayout *pLocationCntLayout = new QHBoxLayout(m_pDestinationCnt);
+            m_pDestinationDiskEditor = new QLineEdit(this);
+            m_pDestinationDiskOpenButton = new QIToolButton(this);
             {
-                m_pDestinationDiskEditor = new QLineEdit(m_pDestinationCnt);
-                m_pDestinationDiskOpenButton = new QIToolButton(m_pDestinationCnt);
-                {
-                    m_pDestinationDiskOpenButton->setAutoRaise(true);
-                    m_pDestinationDiskOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", "select_file_dis_16px.png"));
-                }
-                pLocationCntLayout->addWidget(m_pDestinationDiskEditor);
-                pLocationCntLayout->addWidget(m_pDestinationDiskOpenButton);
+                m_pDestinationDiskOpenButton->setAutoRaise(true);
+                m_pDestinationDiskOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", "select_file_dis_16px.png"));
             }
+            pLocationLayout->addWidget(m_pDestinationDiskEditor);
+            pLocationLayout->addWidget(m_pDestinationDiskOpenButton);
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pDestinationCnt);
+        pMainLayout->addLayout(pLocationLayout);
         pMainLayout->addStretch();
     }
@@ -202 +197 @@
     m_pLabel->setText(UIWizardCloneVD::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_pDestinationCnt->setTitle(UIWizardCloneVD::tr("Copy &location"));
     m_pDestinationDiskOpenButton->setToolTip(UIWizardCloneVD::tr("Choose a location for new virtual hard drive file..."));
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.h

@@ -29 +29 @@
 /* Forward declarations: */
 class CMediumFormat;
-class QGroupBox;
 class QLineEdit;
 class QIToolButton;
@@ -61 +60 @@
 
     /* Widgets: */
-    QGroupBox *m_pDestinationCnt;
     QLineEdit *m_pDestinationDiskEditor;
     QIToolButton *m_pDestinationDiskOpenButton;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -78 +78 @@
             pLocationCntLayout->addWidget(m_pDestinationDiskOpenButton);
         }
-        QVBoxLayout *pFormatWrappingLayout = new QVBoxLayout;
-        {
-            m_pFormatCnt = new QGroupBox(this);
-            {
-                m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-                QVBoxLayout *pFormatsLayout = new QVBoxLayout(m_pFormatCnt);
-                {
-                    m_pFormatButtonGroup = new QButtonGroup(this);
+        m_pFormatCnt = new QGroupBox(this);
+        {
+            m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            QVBoxLayout *pFormatCntLayout = new QVBoxLayout(m_pFormatCnt);
+            {
+                m_pFormatButtonGroup = new QButtonGroup(this);
+                {
+                    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);
-                                }
-                            }
-                        }
-                        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 *pVariantCntLayout = 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);
-                    pVariantCntLayout->addWidget(m_pDynamicalButton);
-                    pVariantCntLayout->addWidget(m_pFixedButton);
-                    pVariantCntLayout->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 *pVariantCntLayout = 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);
+                pVariantCntLayout->addWidget(m_pDynamicalButton);
+                pVariantCntLayout->addWidget(m_pFixedButton);
+                pVariantCntLayout->addWidget(m_pSplitBox);
+            }
         }
         pMainLayout->addWidget(m_pSourceDiskCnt, 0, 0, 1, 2);
         pMainLayout->addWidget(m_pDestinationCnt, 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);
         sltHandleSourceDiskChange();
         sltMediumFormatChanged();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.h

@@ -25 +25 @@
 #include "UIWizardCloneVDPageBasic3.h"
 #include "UIWizardCloneVDPageBasic4.h"
+
+/* Forward declarations: */
+class QGroupBox;
 
 /* Expert page of the Clone Virtual Hard Drive wizard: */
@@ -75 +78 @@
     bool isComplete() const;
     bool validatePage();
+
+    /* Widgets: */
+    QGroupBox *m_pSourceDiskCnt;
+    QGroupBox *m_pFormatCnt;
+    QGroupBox *m_pVariantCnt;
+    QGroupBox *m_pDestinationCnt;
 };