Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp (revision 84282) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp (revision 84283) @@ -45,8 +45,6 @@ UIWizardNewCloudVMPage1::UIWizardNewCloudVMPage1() : m_fPolished(false) - , m_pLocationLayout(0) , m_pLocationLabel(0) , m_pLocationComboBox(0) - , m_pCloudContainerLayout(0) , m_pAccountLabel(0) , m_pAccountComboBox(0) @@ -516,5 +514,7 @@ UIWizardNewCloudVMPageBasic1::UIWizardNewCloudVMPageBasic1() : m_pLabelMain(0) + , m_pLocationLayout(0) , m_pLabelDescription(0) + , m_pOptionsLayout(0) { /* Create main layout: */ @@ -534,4 +534,5 @@ if (m_pLocationLayout) { + m_pLocationLayout->setContentsMargins(0, 0, 0, 0); m_pLocationLayout->setColumnStretch(0, 0); m_pLocationLayout->setColumnStretch(1, 1); @@ -544,5 +545,5 @@ m_pLocationLayout->addWidget(m_pLocationLabel, 0, 0, Qt::AlignRight); } - /* Create location selector: */ + /* Create location combo-box: */ m_pLocationComboBox = new QIComboBox(this); if (m_pLocationComboBox) @@ -554,25 +555,25 @@ } - /* Create description label: */ - m_pLabelDescription = new QIRichTextLabel(this); - if (m_pLabelDescription) - { - /* Add into layout: */ - m_pLocationLayout->addWidget(m_pLabelDescription, 1, 0, 1, 2); - } - /* Add into layout: */ pMainLayout->addLayout(m_pLocationLayout); } - /* Create cloud container layout: */ - m_pCloudContainerLayout = new QGridLayout; - if (m_pCloudContainerLayout) - { - m_pCloudContainerLayout->setContentsMargins(0, 0, 0, 0); - m_pCloudContainerLayout->setColumnStretch(0, 0); - m_pCloudContainerLayout->setColumnStretch(1, 1); - m_pCloudContainerLayout->setRowStretch(2, 0); - m_pCloudContainerLayout->setRowStretch(3, 1); + /* Create description label: */ + m_pLabelDescription = new QIRichTextLabel(this); + if (m_pLabelDescription) + { + /* Add into layout: */ + pMainLayout->addWidget(m_pLabelDescription); + } + + /* Create options layout: */ + m_pOptionsLayout = new QGridLayout; + if (m_pOptionsLayout) + { + m_pOptionsLayout->setContentsMargins(0, 0, 0, 0); + m_pOptionsLayout->setColumnStretch(0, 0); + m_pOptionsLayout->setColumnStretch(1, 1); + m_pOptionsLayout->setRowStretch(2, 0); + m_pOptionsLayout->setRowStretch(3, 1); /* Create account label: */ @@ -581,7 +582,7 @@ { /* Add into layout: */ - m_pCloudContainerLayout->addWidget(m_pAccountLabel, 0, 0, Qt::AlignRight); - } - /* Create sub-layout: */ + m_pOptionsLayout->addWidget(m_pAccountLabel, 0, 0, Qt::AlignRight); + } + /* Create account layout: */ QHBoxLayout *pAccountLayout = new QHBoxLayout; if (pAccountLayout) @@ -611,8 +612,8 @@ /* Add into layout: */ - m_pCloudContainerLayout->addLayout(pAccountLayout, 0, 1); - } - - /* Create profile property table: */ + m_pOptionsLayout->addLayout(pAccountLayout, 0, 1); + } + + /* Create account property table: */ m_pAccountPropertyTable = new QTableWidget(this); if (m_pAccountPropertyTable) @@ -631,5 +632,5 @@ /* Add into layout: */ - m_pCloudContainerLayout->addWidget(m_pAccountPropertyTable, 1, 1); + m_pOptionsLayout->addWidget(m_pAccountPropertyTable, 1, 1); } @@ -639,5 +640,5 @@ { /* Add into layout: */ - m_pCloudContainerLayout->addWidget(m_pSourceImageLabel, 2, 0, Qt::AlignRight); + m_pOptionsLayout->addWidget(m_pSourceImageLabel, 2, 0, Qt::AlignRight); } /* Create source image list: */ @@ -656,9 +657,9 @@ /* Add into layout: */ - m_pCloudContainerLayout->addWidget(m_pSourceImageList, 2, 1, 2, 1); + m_pOptionsLayout->addWidget(m_pSourceImageList, 2, 1, 2, 1); } /* Add into layout: */ - pMainLayout->addLayout(m_pCloudContainerLayout); + pMainLayout->addLayout(m_pOptionsLayout); } } @@ -740,5 +741,5 @@ iMaxWidth = qMax(iMaxWidth, pLabel->minimumSizeHint().width()); m_pLocationLayout->setColumnMinimumWidth(0, iMaxWidth); - m_pCloudContainerLayout->setColumnMinimumWidth(0, iMaxWidth); + m_pOptionsLayout->setColumnMinimumWidth(0, iMaxWidth); /* Update tool-tips: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.h (revision 84282) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.h (revision 84283) @@ -120,6 +120,4 @@ CCloudProfile m_comCloudProfile; - /** Holds the location layout instance. */ - QGridLayout *m_pLocationLayout; /** Holds the location type label instance. */ QLabel *m_pLocationLabel; @@ -127,6 +125,4 @@ QIComboBox *m_pLocationComboBox; - /** Holds the cloud container layout instance. */ - QGridLayout *m_pCloudContainerLayout; /** Holds the account label instance. */ QLabel *m_pAccountLabel; @@ -190,6 +186,10 @@ /** Holds the main label instance. */ QIRichTextLabel *m_pLabelMain; + /** Holds the location layout instance. */ + QGridLayout *m_pLocationLayout; /** Holds the description label instance. */ QIRichTextLabel *m_pLabelDescription; + /** Holds the options layout instance. */ + QGridLayout *m_pOptionsLayout; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp (revision 84282) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp (revision 84283) @@ -46,95 +46,84 @@ if (m_pCntLocation) { - /* There is no location table in short wizard form: */ + /* There is no location container in short wizard form: */ if (!m_fFullWizard) m_pCntLocation->setVisible(false); /* Create location layout: */ - m_pLocationLayout = new QGridLayout(m_pCntLocation); - if (m_pLocationLayout) + QVBoxLayout *pLocationLayout = new QVBoxLayout(m_pCntLocation); + if (pLocationLayout) { - /* Create location selector: */ + /* Create location combo-box: */ m_pLocationComboBox = new QIComboBox(m_pCntLocation); if (m_pLocationComboBox) { /* Add into layout: */ - m_pLocationLayout->addWidget(m_pLocationComboBox, 0, 0); - } - - /* Create cloud container layout: */ - m_pCloudContainerLayout = new QGridLayout; - if (m_pCloudContainerLayout) - { - m_pCloudContainerLayout->setContentsMargins(0, 0, 0, 0); - m_pCloudContainerLayout->setRowStretch(3, 1); - - /* Create sub-layout: */ - QHBoxLayout *pSubLayout = new QHBoxLayout; - if (pSubLayout) + pLocationLayout->addWidget(m_pLocationComboBox); + } + + /* Create account layout: */ + QHBoxLayout *pAccountLayout = new QHBoxLayout; + if (pAccountLayout) + { + pAccountLayout->setContentsMargins(0, 0, 0, 0); + pAccountLayout->setSpacing(1); + + /* Create account combo-box: */ + m_pAccountComboBox = new QIComboBox(m_pCntLocation); + if (m_pAccountComboBox) { - pSubLayout->setContentsMargins(0, 0, 0, 0); - pSubLayout->setSpacing(1); - - /* Create account combo-box: */ - m_pAccountComboBox = new QIComboBox(m_pCntLocation); - if (m_pAccountComboBox) - { - /* Add into layout: */ - pSubLayout->addWidget(m_pAccountComboBox); - } - /* Create account tool-button: */ - m_pAccountToolButton = new QIToolButton(m_pCntLocation); - if (m_pAccountToolButton) - { - m_pAccountToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png", - ":/cloud_profile_manager_disabled_16px.png")); - - /* Add into layout: */ - pSubLayout->addWidget(m_pAccountToolButton); - } - /* Add into layout: */ - m_pCloudContainerLayout->addLayout(pSubLayout, 0, 0); + pAccountLayout->addWidget(m_pAccountComboBox); } - - /* Create profile property table: */ - m_pAccountPropertyTable = new QTableWidget(m_pCntLocation); - if (m_pAccountPropertyTable) + /* Create account tool-button: */ + m_pAccountToolButton = new QIToolButton(m_pCntLocation); + if (m_pAccountToolButton) { - const QFontMetrics fm(m_pAccountPropertyTable->font()); - const int iFontWidth = fm.width('x'); - const int iTotalWidth = 50 * iFontWidth; - const int iFontHeight = fm.height(); - const int iTotalHeight = 4 * iFontHeight; - m_pAccountPropertyTable->setMinimumSize(QSize(iTotalWidth, iTotalHeight)); - //m_pAccountPropertyTable->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); - m_pAccountPropertyTable->setAlternatingRowColors(true); - m_pAccountPropertyTable->horizontalHeader()->setVisible(false); - m_pAccountPropertyTable->verticalHeader()->setVisible(false); - m_pAccountPropertyTable->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); + m_pAccountToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png", + ":/cloud_profile_manager_disabled_16px.png")); /* Add into layout: */ - m_pCloudContainerLayout->addWidget(m_pAccountPropertyTable, 1, 0); + pAccountLayout->addWidget(m_pAccountToolButton); } - /* Create source image list: */ - m_pSourceImageList = new QListWidget(m_pCntLocation); - if (m_pSourceImageList) - { - const QFontMetrics fm(m_pSourceImageList->font()); - const int iFontWidth = fm.width('x'); - const int iTotalWidth = 50 * iFontWidth; - const int iFontHeight = fm.height(); - const int iTotalHeight = 4 * iFontHeight; - m_pSourceImageList->setMinimumSize(QSize(iTotalWidth, iTotalHeight)); - //m_pSourceImageList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); - m_pSourceImageList->setAlternatingRowColors(true); - - /* Add into layout: */ - m_pCloudContainerLayout->addWidget(m_pSourceImageList, 2, 0); - } - - /* Add into layout: */ - m_pLocationLayout->addLayout(m_pCloudContainerLayout, 1, 0); + /* Add into layout: */ + pLocationLayout->addLayout(pAccountLayout); + } + + /* Create account property table: */ + m_pAccountPropertyTable = new QTableWidget(m_pCntLocation); + if (m_pAccountPropertyTable) + { + const QFontMetrics fm(m_pAccountPropertyTable->font()); + const int iFontWidth = fm.width('x'); + const int iTotalWidth = 50 * iFontWidth; + const int iFontHeight = fm.height(); + const int iTotalHeight = 4 * iFontHeight; + m_pAccountPropertyTable->setMinimumSize(QSize(iTotalWidth, iTotalHeight)); + //m_pAccountPropertyTable->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + m_pAccountPropertyTable->setAlternatingRowColors(true); + m_pAccountPropertyTable->horizontalHeader()->setVisible(false); + m_pAccountPropertyTable->verticalHeader()->setVisible(false); + m_pAccountPropertyTable->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); + + /* Add into layout: */ + pLocationLayout->addWidget(m_pAccountPropertyTable); + } + + /* Create source image list: */ + m_pSourceImageList = new QListWidget(m_pCntLocation); + if (m_pSourceImageList) + { + const QFontMetrics fm(m_pSourceImageList->font()); + const int iFontWidth = fm.width('x'); + const int iTotalWidth = 50 * iFontWidth; + const int iFontHeight = fm.height(); + const int iTotalHeight = 4 * iFontHeight; + m_pSourceImageList->setMinimumSize(QSize(iTotalWidth, iTotalHeight)); + //m_pSourceImageList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + m_pSourceImageList->setAlternatingRowColors(true); + + /* Add into layout: */ + pLocationLayout->addWidget(m_pSourceImageList); } } @@ -148,7 +137,7 @@ if (m_pSettingsCnt) { - /* Create form editor layout: */ - QVBoxLayout *pFormEditorLayout = new QVBoxLayout(m_pSettingsCnt); - if (pFormEditorLayout) + /* Create settings layout: */ + QVBoxLayout *pSettingsLayout = new QVBoxLayout(m_pSettingsCnt); + if (pSettingsLayout) { /* Create form editor widget: */ @@ -164,5 +153,5 @@ /* Add into layout: */ - pFormEditorLayout->addWidget(m_pFormEditor); + pSettingsLayout->addWidget(m_pFormEditor); } }