Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp (revision 87317) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp (revision 87318) @@ -17,4 +17,5 @@ /* Qt includes: */ +#include #include #include @@ -39,28 +40,4 @@ }; -/********************************************************************************************************************************* -* UIToolTitleWidget definition. * -*********************************************************************************************************************************/ - -class UIToolBoxTitleWidget : public QWidget -{ - - Q_OBJECT; - -signals: - - void sigShowPageWidget(); - -public: - - UIToolBoxTitleWidget(QWidget *pParent = 0); - void setText(const QString &strText); - -private: - - void prepare(); - QHBoxLayout *m_pLayout; - QLabel *m_pTitleLabel; -}; /********************************************************************************************************************************* @@ -79,5 +56,5 @@ public: - UIToolBoxPage(QWidget *pParent = 0); + UIToolBoxPage(bool fEnableCheckBoxEnabled = false, QWidget *pParent = 0); void setTitle(const QString &strTitle); /* @p pWidget's ownership is transferred to the page. */ @@ -87,4 +64,7 @@ int index() const; void setIndex(int iIndex); + int totalHeight() const; + int titleHeight() const; + int pageWidgetHeight() const; protected: @@ -92,9 +72,17 @@ virtual bool eventFilter(QObject *pWatched, QEvent *pEvent) /* override */; +private slots: + + void sltHandleEnableToggle(int iState); + private: - void prepare(); + void prepare(bool fEnableCheckBoxEnabled); + QVBoxLayout *m_pLayout; - UIToolBoxTitleWidget *m_pTitleWidget; + QWidget *m_pTitleContainerWidget; + QLabel *m_pTitleLabel; + QCheckBox *m_pEnableCheckBox; + QWidget *m_pWidget; int m_iIndex; @@ -102,60 +90,51 @@ /********************************************************************************************************************************* -* UIToolTitleWidget implementation. * -*********************************************************************************************************************************/ - -UIToolBoxTitleWidget::UIToolBoxTitleWidget(QWidget *pParent /* = 0 */) - :QWidget(pParent) -{ - prepare(); -} - -void UIToolBoxTitleWidget::setText(const QString &strText) -{ - if (m_pTitleLabel) - m_pTitleLabel->setText(strText); -} - -void UIToolBoxTitleWidget::prepare() -{ - m_pLayout = new QHBoxLayout(this); - m_pLayout->setContentsMargins(1.f * qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin), - .4f * qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin), - 1.f * qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin), - .4f * qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin)); - - m_pTitleLabel = new QLabel; - m_pLayout->addWidget(m_pTitleLabel); -} - -/********************************************************************************************************************************* * UIToolBoxPage implementation. * *********************************************************************************************************************************/ -UIToolBoxPage::UIToolBoxPage(QWidget *pParent /* = 0 */) +UIToolBoxPage::UIToolBoxPage(bool fEnableCheckBoxEnabled /* = false */, QWidget *pParent /* = 0 */) :QWidget(pParent) , m_pLayout(0) - , m_pTitleWidget(0) + , m_pTitleContainerWidget(0) + , m_pTitleLabel(0) + , m_pEnableCheckBox(0) , m_pWidget(0) , m_iIndex(0) - -{ - prepare(); +{ + prepare(fEnableCheckBoxEnabled); } void UIToolBoxPage::setTitle(const QString &strTitle) { - if (!m_pTitleWidget) - return; - m_pTitleWidget->setText(strTitle); -} - -void UIToolBoxPage::prepare() + if (!m_pTitleLabel) + return; + m_pTitleLabel->setText(strTitle); +} + +void UIToolBoxPage::prepare(bool fEnableCheckBoxEnabled) { m_pLayout = new QVBoxLayout(this); m_pLayout->setContentsMargins(0, 0, 0, 0); - m_pTitleWidget = new UIToolBoxTitleWidget; - m_pTitleWidget->installEventFilter(this); - m_pLayout->addWidget(m_pTitleWidget); + + m_pTitleContainerWidget = new QWidget; + QHBoxLayout *pTitleLayout = new QHBoxLayout(m_pTitleContainerWidget); + pTitleLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin), + .4f * qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin), + qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin), + .4f * qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); + if (fEnableCheckBoxEnabled) + { + m_pEnableCheckBox = new QCheckBox; + pTitleLayout->addWidget(m_pEnableCheckBox); + connect(m_pEnableCheckBox, &QCheckBox::stateChanged, this, &UIToolBoxPage::sltHandleEnableToggle); + } + + m_pTitleLabel = new QLabel; + m_pTitleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + m_pTitleLabel->installEventFilter(this); + pTitleLayout->addWidget(m_pTitleLabel); + m_pTitleContainerWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + m_pLayout->addWidget(m_pTitleContainerWidget); } @@ -166,4 +145,8 @@ m_pWidget = pWidget; m_pLayout->addWidget(m_pWidget); + + if (m_pEnableCheckBox) + m_pWidget->setEnabled(m_pEnableCheckBox->checkState() == Qt::Checked); + m_pWidget->hide(); } @@ -171,10 +154,10 @@ void UIToolBoxPage::setTitleBackgroundColor(const QColor &color) { - if (!m_pTitleWidget) - return; - QPalette palette = m_pTitleWidget->palette(); + if (!m_pTitleLabel) + return; + QPalette palette = m_pTitleContainerWidget->palette(); palette.setColor(QPalette::Window, color); - m_pTitleWidget->setPalette(palette); - m_pTitleWidget->setAutoFillBackground(true); + m_pTitleContainerWidget->setPalette(palette); + m_pTitleContainerWidget->setAutoFillBackground(true); } @@ -195,11 +178,37 @@ } +int UIToolBoxPage::totalHeight() const +{ + return pageWidgetHeight() + titleHeight(); +} + +int UIToolBoxPage::titleHeight() const +{ + if (m_pTitleContainerWidget && m_pTitleContainerWidget->sizeHint().isValid()) + return m_pTitleContainerWidget->sizeHint().height(); + return 0; +} + +int UIToolBoxPage::pageWidgetHeight() const +{ + if (m_pWidget && m_pWidget->isVisible() && m_pWidget->sizeHint().isValid()) + return m_pWidget->sizeHint().height(); + return 0; +} + bool UIToolBoxPage::eventFilter(QObject *pWatched, QEvent *pEvent) { - if (pWatched == m_pTitleWidget && pEvent->type() == QEvent::MouseButtonPress) + if (pWatched == m_pTitleLabel && pEvent->type() == QEvent::MouseButtonPress) emit sigShowPageWidget(); return QWidget::eventFilter(pWatched, pEvent); } + +void UIToolBoxPage::sltHandleEnableToggle(int iState) +{ + if (m_pWidget) + m_pWidget->setEnabled(iState == Qt::Checked); +} + /********************************************************************************************************************************* @@ -209,13 +218,17 @@ UIToolBox::UIToolBox(QWidget *pParent /* = 0 */) : QIWithRetranslateUI(pParent) + , m_iCurrentPageIndex(-1) + , m_iPageCount(0) { prepare(); -} - -bool UIToolBox::insertItem(int iIndex, QWidget *pWidget, const QString &strTitle) + //setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); +} + +bool UIToolBox::insertItem(int iIndex, QWidget *pWidget, const QString &strTitle, bool fAddEnableCheckBox /* = false */) { if (m_pages.contains(iIndex)) return false; - UIToolBoxPage *pNewPage = new UIToolBoxPage; + ++m_iPageCount; + UIToolBoxPage *pNewPage = new UIToolBoxPage(fAddEnableCheckBox, 0);; pNewPage->setWidget(pWidget); @@ -233,4 +246,17 @@ this, &UIToolBox::sltHandleShowPageWidget); + static int iMaxPageHeight = 0; + int iTotalTitleHeight = 0; + foreach(UIToolBoxPage *pPage, m_pages) + { + if (pWidget && pWidget->sizeHint().isValid()) + iMaxPageHeight = qMax(iMaxPageHeight, pWidget->sizeHint().height()); + iTotalTitleHeight += pPage->titleHeight(); + } + setMinimumHeight(m_iPageCount * (qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) + + qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin)) + + iTotalTitleHeight + + iMaxPageHeight); + return iIndex; } @@ -256,6 +282,7 @@ } -void UIToolBox::setPageVisible(int iIndex) -{ +void UIToolBox::setCurrentPage(int iIndex) +{ + m_iCurrentPageIndex = iIndex; QMap::iterator iterator = m_pages.find(iIndex); if (iterator == m_pages.end()) @@ -274,4 +301,5 @@ { m_pMainLayout = new QVBoxLayout(this); + m_pMainLayout->addStretch(); //m_pMainLayout->setContentsMargins(0, 0, 0, 0); @@ -284,5 +312,6 @@ if (!pPage) return; - setPageVisible(pPage->index()); + setCurrentPage(pPage->index()); + update(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.h (revision 87317) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.h (revision 87318) @@ -45,13 +45,15 @@ UIToolBox(QWidget *pParent = 0); - bool insertItem(int iIndex, QWidget *pWidget, const QString &strTitle); + bool insertItem(int iIndex, QWidget *pWidget, const QString &strTitle, bool fAddEnableCheckBox = false); void setItemEnabled(int iIndex, bool fEnabled); void setItemText(int iIndex, const QString &strTitle); void setItemIcon(int iIndex, const QIcon &icon); - void setPageVisible(int iIndex); + void setCurrentPage(int iIndex); protected: - void retranslateUi(); + virtual void retranslateUi() /* override */; + //virtual QSize sizeHint() const /* override */; + //virtual QSize minimumSizeHint() const /* override */; private slots: @@ -65,4 +67,6 @@ QVBoxLayout *m_pMainLayout; QMap m_pages; + int m_iCurrentPageIndex; + int m_iPageCount; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (revision 87317) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (revision 87318) @@ -268,5 +268,5 @@ bool UIWizardNewVMPage1::checkISOFile() const { - if (m_pEnableUnattendedInstallCheckBox && m_pEnableUnattendedInstallCheckBox->isChecked()) + if (isUnattendedEnabled()) { QString strISOFilePath = m_pISOFilePathSelector ? m_pISOFilePathSelector->path() : QString(); @@ -285,5 +285,7 @@ } -QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(bool fIncreaseLeftIndent, bool fCreateLabels /* = true */) +QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(bool fIncreaseLeftIndent, + bool fCreateUnattendedWidgets, + bool fCreateLabels) { Q_UNUSED(fIncreaseLeftIndent); @@ -314,34 +316,36 @@ } - m_pEnableUnattendedInstallCheckBox = new QCheckBox; - pLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iRow++, 0, 1, 1); - - m_pISOSelectorLabel = new QLabel; - if (m_pISOSelectorLabel) - { - m_pISOSelectorLabel->setAlignment(Qt::AlignRight); - m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); - m_pISOSelectorLabel->setEnabled(false); - pLayout->addWidget(m_pISOSelectorLabel, iRow, 1, 1, 1); - } - m_pISOFilePathSelector = new UIFilePathSelector; - if (m_pISOFilePathSelector) - { - m_pISOFilePathSelector->setResetEnabled(false); - m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open); - m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO"); - m_pISOFilePathSelector->setEnabled(false); - pLayout->addWidget(m_pISOFilePathSelector, iRow++, 2, 1, 4); - } - - m_pStartHeadlessCheckBox = new QCheckBox; - if (m_pStartHeadlessCheckBox) - { - m_pStartHeadlessCheckBox->setEnabled(false); - pLayout->addWidget(m_pStartHeadlessCheckBox, iRow++, 1, 1, 5); - } - - pLayout->addWidget(horizontalLine(), iRow++, 0, 1, 4); - + if (fCreateUnattendedWidgets) + { + m_pEnableUnattendedInstallCheckBox = new QCheckBox; + pLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iRow++, 0, 1, 1); + + m_pISOSelectorLabel = new QLabel; + if (m_pISOSelectorLabel) + { + m_pISOSelectorLabel->setAlignment(Qt::AlignRight); + m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); + m_pISOSelectorLabel->setEnabled(false); + pLayout->addWidget(m_pISOSelectorLabel, iRow, 1, 1, 1); + } + m_pISOFilePathSelector = new UIFilePathSelector; + if (m_pISOFilePathSelector) + { + m_pISOFilePathSelector->setResetEnabled(false); + m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open); + m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO"); + m_pISOFilePathSelector->setEnabled(false); + pLayout->addWidget(m_pISOFilePathSelector, iRow++, 2, 1, 4); + } + + m_pStartHeadlessCheckBox = new QCheckBox; + if (m_pStartHeadlessCheckBox) + { + m_pStartHeadlessCheckBox->setEnabled(false); + pLayout->addWidget(m_pStartHeadlessCheckBox, iRow++, 1, 1, 5); + } + + pLayout->addWidget(horizontalLine(), iRow++, 0, 1, 4); + } return pContainer; } @@ -518,5 +522,7 @@ { QVBoxLayout *pPageLayout = new QVBoxLayout(this); - pPageLayout->addWidget(createNameOSTypeWidgets(/* fIncreaseLeftIndent */ false, /* fCreateLabels */false)); + pPageLayout->addWidget(createNameOSTypeWidgets(/* fIncreaseLeftIndent */ false, + /* fCreateUnattendedWidget */ false, + /* fCreateLabels */false)); pPageLayout->addStretch(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h (revision 87317) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h (revision 87318) @@ -78,5 +78,5 @@ void composeMachineFilePath(); - QWidget *createNameOSTypeWidgets(bool fIncreaseLeftIndent, bool fCreateLabels = true); + QWidget *createNameOSTypeWidgets(bool fIncreaseLeftIndent, bool fCreateUnattendedWidgets, bool fCreateLabels); int createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels = true); void setTypeByISODetectedOSType(const QString &strDetectedOSType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp (revision 87317) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp (revision 87318) @@ -51,12 +51,14 @@ m_pToolBox = new UIToolBox; m_pToolBox->insertItem(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(/* fIncreaseLeftIndent */ true, + /* fCreateUnattendedWidgets */ false, /* fCreateLabels */ false), ""); + m_pToolBox->insertItem(ExpertToolboxItems_Unattended, createUnattendedWidgets(), "", false); m_pToolBox->insertItem(ExpertToolboxItems_Disk, createDiskWidgets(/* fIncreaseLeftIndent */ true), ""); m_pToolBox->insertItem(ExpertToolboxItems_Hardware, createHardwareWidgets(/* fIncreaseLeftIndent */ true), ""); - m_pToolBox->insertItem(ExpertToolboxItems_UsernameHostname, createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ true), ""); - m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, createGAInstallWidgets(/* fIncreaseLeftIndent */ true), ""); - m_pToolBox->insertItem(ExpertToolboxItems_ProductKey, createProductKeyWidgets(/* fIncreaseLeftIndent */ true), ""); - - m_pToolBox->setPageVisible(ExpertToolboxItems_NameAndOSType); + // m_pToolBox->insertItem(ExpertToolboxItems_UsernameHostname, createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ true), ""); + // m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, createGAInstallWidgets(/* fIncreaseLeftIndent */ true), ""); + // m_pToolBox->insertItem(ExpertToolboxItems_ProductKey, createProductKeyWidgets(/* fIncreaseLeftIndent */ true), ""); + + m_pToolBox->setCurrentPage(ExpertToolboxItems_NameAndOSType); pMainLayout->addWidget(m_pToolBox); @@ -209,4 +211,5 @@ m_pToolBox->setItemText(ExpertToolboxItems_NameAndOSType, QString(UIWizardNewVM::tr("Name and operating system"))); m_pToolBox->setItemText(ExpertToolboxItems_UsernameHostname, UIWizardNewVM::tr("Username and hostname")); + m_pToolBox->setItemText(ExpertToolboxItems_Unattended, UIWizardNewVM::tr("Unattended Install")); m_pToolBox->setItemText(ExpertToolboxItems_GAInstall, UIWizardNewVM::tr("Guest additions install")); m_pToolBox->setItemText(ExpertToolboxItems_ProductKey, UIWizardNewVM::tr("Product key")); @@ -303,6 +306,8 @@ if (m_pEnableUnattendedInstallCheckBox) disableEnableUnattendedRelatedWidgets(m_pEnableUnattendedInstallCheckBox->isChecked()); - m_pProductKeyLabel->setEnabled(isProductKeyWidgetEnabled()); - m_pProductKeyLineEdit->setEnabled(isProductKeyWidgetEnabled()); + if (m_pProductKeyLabel) + m_pProductKeyLabel->setEnabled(isProductKeyWidgetEnabled()); + if (m_pProductKeyLineEdit) + m_pProductKeyLineEdit->setEnabled(isProductKeyWidgetEnabled()); } @@ -320,4 +325,41 @@ if (m_pGAISOFilePathSelector) m_pGAISOFilePathSelector->mark(isUnattendedEnabled() && !checkGAISOFile()); +} + +QWidget *UIWizardNewVMPageExpert::createUnattendedWidgets() +{ + QWidget *pContainerWidget = new QWidget; + QGridLayout *pLayout = new QGridLayout(pContainerWidget); + int iRow = 0; + + m_pISOSelectorLabel = new QLabel; + if (m_pISOSelectorLabel) + { + m_pISOSelectorLabel->setAlignment(Qt::AlignRight); + m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); + pLayout->addWidget(m_pISOSelectorLabel, iRow, 0, 1, 1); + } + + m_pISOFilePathSelector = new UIFilePathSelector; + if (m_pISOFilePathSelector) + { + m_pISOFilePathSelector->setResetEnabled(false); + m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open); + m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO"); + pLayout->addWidget(m_pISOFilePathSelector, iRow++, 1, 1, 4); + } + + m_pStartHeadlessCheckBox = new QCheckBox; + if (m_pStartHeadlessCheckBox) + pLayout->addWidget(m_pStartHeadlessCheckBox, iRow++, 0, 1, 5); + + pLayout->addWidget(createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ false), iRow, 0, 4, 5); + iRow += 4; + pLayout->addWidget(createGAInstallWidgets(/* fIncreaseLeftIndent */ false), iRow, 0, 2, 5); + iRow += 2; + pLayout->addWidget(createProductKeyWidgets(/* fIncreaseLeftIndent */ false), iRow, 0, 1, 5); + + + return pContainerWidget; } @@ -333,5 +375,4 @@ m_pToolBox->setItemIcon(ExpertToolboxItems_ProductKey, QIcon()); - if (!UIWizardPage::isComplete()) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h (revision 87317) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h (revision 87318) @@ -86,7 +86,9 @@ private: + enum ExpertToolboxItems { ExpertToolboxItems_NameAndOSType, + ExpertToolboxItems_Unattended, ExpertToolboxItems_Disk, ExpertToolboxItems_Hardware, @@ -110,4 +112,6 @@ void disableEnableUnattendedRelatedWidgets(bool fEnabled); void markWidgets() const; + QWidget *createUnattendedWidgets(); + UIToolBox *m_pToolBox;