Index: /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro (revision 64683) @@ -48,6 +48,5 @@ src/settings/machine/UIMachineSettingsSF.ui \ src/settings/machine/UIMachineSettingsSFDetails.ui \ - src/settings/machine/UIMachineSettingsInterface.ui \ - src/widgets/UIApplianceEditorWidget.ui + src/settings/machine/UIMachineSettingsInterface.ui TRANSLATIONS = \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64683) @@ -25,8 +25,11 @@ # include # include -# include # include # include # include +# include +# include +# include +# include /* GUI includes: */ @@ -1119,22 +1122,92 @@ initSystemSettings(); - /* Apply UI decorations */ - Ui::UIApplianceEditorWidget::setupUi(this); - - /* Make the tree looking nicer */ - m_pTvSettings->setRootIsDecorated(false); - m_pTvSettings->setAlternatingRowColors(true); - m_pTvSettings->setAllColumnsShowFocus(true); - m_pTvSettings->header()->setStretchLastSection(true); -#if QT_VERSION >= 0x050000 - m_pTvSettings->header()->setSectionResizeMode(QHeaderView::ResizeToContents); -#else /* QT_VERSION < 0x050000 */ - m_pTvSettings->header()->setResizeMode(QHeaderView::ResizeToContents); -#endif /* QT_VERSION < 0x050000 */ - - /* Hidden by default */ - m_pReinitMACsCheckBox->setHidden(true); - - /* Applying language settings */ + /* Create layout: */ + QVBoxLayout *pLayout = new QVBoxLayout(this); + { + /* Configure information layout: */ + pLayout->setContentsMargins(0, 0, 0, 0); + + /* Create information pane: */ + m_pPaneInformation = new QWidget; + { + /* Create information layout: */ + QVBoxLayout *pLayoutInformation = new QVBoxLayout(m_pPaneInformation); + { + /* Configure information layout: */ + pLayoutInformation->setContentsMargins(0, 0, 0, 0); + + /* Create tree-view: */ + m_pTreeViewSettings = new QTreeView; + { + /* Configure tree-view: */ + m_pTreeViewSettings->setRootIsDecorated(false); + m_pTreeViewSettings->setAlternatingRowColors(true); + m_pTreeViewSettings->setAllColumnsShowFocus(true); + m_pTreeViewSettings->header()->setStretchLastSection(true); + m_pTreeViewSettings->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); +#if QT_VERSION < 0x050000 + m_pTreeViewSettings->header()->setResizeMode(QHeaderView::ResizeToContents); +#else + m_pTreeViewSettings->header()->setSectionResizeMode(QHeaderView::ResizeToContents); +#endif + + /* Add tree-view into information layout: */ + pLayoutInformation->addWidget(m_pTreeViewSettings); + } + + /* Create check-box: */ + m_pCheckBoxReinitMACs = new QCheckBox; + { + /* Configure check-box: */ + m_pCheckBoxReinitMACs->setHidden(true); + + /* Add tree-view into information layout: */ + pLayoutInformation->addWidget(m_pCheckBoxReinitMACs); + } + } + + /* Add information pane into layout: */ + pLayout->addWidget(m_pPaneInformation); + } + + /* Create warning pane: */ + m_pPaneWarning = new QWidget; + { + /* Configure warning pane: */ + m_pPaneWarning->hide(); + m_pPaneWarning->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + + /* Create warning layout: */ + QVBoxLayout *pLayoutWarning = new QVBoxLayout(m_pPaneWarning); + { + /* Configure warning layout: */ + pLayoutWarning->setContentsMargins(0, 0, 0, 0); + + /* Create label: */ + m_pLabelWarning = new QLabel; + { + /* Add label into warning layout: */ + pLayoutWarning->addWidget(m_pLabelWarning); + } + + /* Create text-edit: */ + m_pTextEditWarning = new QTextEdit; + { + /* Configure text-edit: */ + m_pTextEditWarning->setReadOnly(true); + m_pTextEditWarning->setMaximumHeight(50); + m_pTextEditWarning->setAutoFormatting(QTextEdit::AutoBulletList); + + /* Add text-edit into warning layout: */ + pLayoutWarning->addWidget(m_pTextEditWarning); + } + } + + /* Add warning pane into layout: */ + pLayout->addWidget(m_pPaneWarning); + } + } + + /* Translate finally: */ retranslateUi(); } @@ -1147,6 +1220,10 @@ void UIApplianceEditorWidget::retranslateUi() { - /* Translate uic generated strings */ - Ui::UIApplianceEditorWidget::retranslateUi(this); + /* Translate information pane check-box: */ + m_pCheckBoxReinitMACs->setText(tr("&Reinitialize the MAC address of all network cards")); + m_pCheckBoxReinitMACs->setToolTip(tr("When checked a new unique MAC address will assigned to all configured network cards.")); + + /* Translate warning pane label: */ + m_pLabelWarning->setText(tr("Warnings:")); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64683) @@ -24,5 +24,4 @@ /* GUI includes: */ -#include "UIApplianceEditorWidget.gen.h" #include "QIWithRetranslateUI.h" @@ -33,4 +32,9 @@ /* Forward declarations: */ class ModelItem; +class QWidget; +class QTreeView; +class QCheckBox; +class QLabel; +class QTextEdit; //////////////////////////////////////////////////////////////////////////////// @@ -251,6 +255,5 @@ // UIApplianceEditorWidget -class UIApplianceEditorWidget: public QIWithRetranslateUI, - public Ui::UIApplianceEditorWidget +class UIApplianceEditorWidget: public QIWithRetranslateUI { Q_OBJECT; @@ -276,4 +279,18 @@ CAppliance *m_pAppliance; VirtualSystemModel *m_pModel; + + /** Holds the information pane instance. */ + QWidget *m_pPaneInformation; + /** Holds the settings tree-view instance. */ + QTreeView *m_pTreeViewSettings; + /** Holds the 'reinit MACs' check-box instance. */ + QCheckBox *m_pCheckBoxReinitMACs; + + /** Holds the warning pane instance. */ + QWidget *m_pPaneWarning; + /** Holds the warning label instance. */ + QLabel *m_pLabelWarning; + /** Holds the warning browser instance. */ + QTextEdit *m_pTextEditWarning; private: Index: unk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui (revision 64682) +++ (revision ) @@ -1,103 +1,0 @@ - - - VBox frontends: Qt4 GUI ("VirtualBox"): - - Copyright (C) 2009-2016 Oracle Corporation - - This file is part of VirtualBox Open Source Edition (OSE), as - available from http://www.virtualbox.org. This file is free software; - you can redistribute it and/or modify it under the terms of the GNU - General Public License (GPL) as published by the Free Software - Foundation, in version 2 as it comes in the "COPYING" file of the - VirtualBox OSE distribution. VirtualBox OSE is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - - UIApplianceEditorWidget - - - - 0 - 0 - 548 - 411 - - - - - 0 - - - - - - 0 - - - - - - 0 - 0 - - - - - - - - When checked a new unique MAC address will assigned to all configured network cards. - - - &Reinitialize the MAC address of all network cards - - - - - - - - - - false - - - - 0 - 0 - - - - - 0 - - - - - Warnings: - - - - - - - - 16777215 - 50 - - - - QTextEdit::AutoBulletList - - - true - - - - - - - - - - - Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (revision 64683) @@ -19,4 +19,8 @@ # include #else /* !VBOX_WITH_PRECOMPILED_HEADERS */ + +/* Qt includes: */ +# include +# include /* GUI includes: */ @@ -91,11 +95,11 @@ /* Set our own model */ - m_pTvSettings->setModel(pProxy); + m_pTreeViewSettings->setModel(pProxy); /* Set our own delegate */ - m_pTvSettings->setItemDelegate(pDelegate); + m_pTreeViewSettings->setItemDelegate(pDelegate); /* For now we hide the original column. This data is displayed as tooltip also. */ - m_pTvSettings->setColumnHidden(OriginalValueSection, true); - m_pTvSettings->expandAll(); + m_pTreeViewSettings->setColumnHidden(OriginalValueSection, true); + m_pTreeViewSettings->expandAll(); /* Check for warnings & if there are one display them. */ @@ -105,8 +109,8 @@ { foreach (const QString& text, warnings) - mWarningTextEdit->append("- " + text); + m_pTextEditWarning->append("- " + text); fWarningsEnabled = true; } - m_pWarningWidget->setVisible(fWarningsEnabled); + m_pPaneWarning->setVisible(fWarningsEnabled); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (revision 64683) @@ -19,4 +19,9 @@ # include #else /* !VBOX_WITH_PRECOMPILED_HEADERS */ + +/* Qt includes: */ +# include +# include +# include /* GUI includes: */ @@ -51,5 +56,5 @@ { /* Show the MAC check box */ - m_pReinitMACsCheckBox->setHidden(false); + m_pCheckBoxReinitMACs->setHidden(false); } @@ -96,11 +101,11 @@ /* Set our own model */ - m_pTvSettings->setModel(pProxy); + m_pTreeViewSettings->setModel(pProxy); /* Set our own delegate */ - m_pTvSettings->setItemDelegate(pDelegate); + m_pTreeViewSettings->setItemDelegate(pDelegate); /* For now we hide the original column. This data is displayed as tooltip also. */ - m_pTvSettings->setColumnHidden(OriginalValueSection, true); - m_pTvSettings->expandAll(); + m_pTreeViewSettings->setColumnHidden(OriginalValueSection, true); + m_pTreeViewSettings->expandAll(); /* Check for warnings & if there are one display them. */ @@ -110,8 +115,8 @@ { foreach (const QString& text, warnings) - mWarningTextEdit->append("- " + text); + m_pTextEditWarning->append("- " + text); fWarningsEnabled = true; } - m_pWarningWidget->setVisible(fWarningsEnabled); + m_pPaneWarning->setVisible(fWarningsEnabled); } } @@ -145,5 +150,5 @@ CProgress progress; QVector options; - if (!m_pReinitMACsCheckBox->isChecked()) + if (!m_pCheckBoxReinitMACs->isChecked()) options.append(KImportOptions_KeepAllMACs); progress = m_pAppliance->ImportMachines(options); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp (revision 64683) @@ -22,5 +22,7 @@ /* Global includes: */ # include +# include # include +# include # include Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp (revision 64682) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp (revision 64683) @@ -25,4 +25,5 @@ # include # include +# include /* Local includes: */