Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp (revision 78275) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp (revision 78276) @@ -19,10 +19,19 @@ #include #include +#include +#include +#include +#include +#include #include /* GUI includes: */ +#include "QIComboBox.h" +#include "QIToolButton.h" #include "VBoxGlobal.h" #include "UIApplianceImportEditorWidget.h" #include "UIEmptyFilePathSelector.h" +#include "UIIconPool.h" +#include "UIVirtualBoxManager.h" #include "UIWizardImportApp.h" #include "UIWizardImportAppPageExpert.h" @@ -31,49 +40,203 @@ UIWizardImportAppPageExpert::UIWizardImportAppPageExpert(bool fImportFromOCIByDefault, const QString &strFileName) : UIWizardImportAppPage1(fImportFromOCIByDefault) - , m_pApplianceCnt(0) + , m_pCntSource(0) , m_pSettingsCnt(0) { /* Create main layout: */ - QVBoxLayout *pMainLayout = new QVBoxLayout(this); + QHBoxLayout *pMainLayout = new QHBoxLayout(this); + if (pMainLayout) { - /* Create appliance container: */ - m_pApplianceCnt = new QGroupBox(this); + /* Create source container: */ + m_pCntSource = new QGroupBox(this); + if (m_pCntSource) { - /* Create appliance container layout: */ - QVBoxLayout *pApplianceCntLayout = new QVBoxLayout(m_pApplianceCnt); + /* Create source layout: */ + m_pSourceLayout = new QGridLayout(m_pCntSource); + if (m_pSourceLayout) { - /* Create file-path selector: */ - m_pFileSelector = new UIEmptyFilePathSelector(m_pApplianceCnt); + /* Create source selector: */ + m_pSourceComboBox = new QIComboBox(m_pCntSource); + if (m_pSourceComboBox) { - m_pFileSelector->setHomeDir(vboxGlobal().documentsPath()); - m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Open); - m_pFileSelector->setButtonPosition(UIEmptyFilePathSelector::RightPosition); - m_pFileSelector->setEditable(true); - m_pFileSelector->setPath(strFileName); - /* Add into layout: */ - pApplianceCntLayout->addWidget(m_pFileSelector); + m_pSourceLayout->addWidget(m_pSourceComboBox, 0, 0); + } + + /* Create stacked layout: */ + m_pStackedLayout = new QStackedLayout(m_pCntSource); + if (m_pStackedLayout) + { + /* Create local container: */ + QWidget *pLocalContainer = new QWidget(m_pCntSource); + if (pLocalContainer) + { + /* Create local container layout: */ + m_pLocalContainerLayout = new QGridLayout(pLocalContainer); + if (m_pLocalContainerLayout) + { + m_pLocalContainerLayout->setContentsMargins(0, 0, 0, 0); + m_pLocalContainerLayout->setRowStretch(2, 1); + + /* Create file-path selector: */ + m_pFileSelector = new UIEmptyFilePathSelector(pLocalContainer); + if (m_pFileSelector) + { + m_pFileSelector->setHomeDir(vboxGlobal().documentsPath()); + m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Open); + m_pFileSelector->setButtonPosition(UIEmptyFilePathSelector::RightPosition); + m_pFileSelector->setEditable(true); + + /* Add into layout: */ + m_pLocalContainerLayout->addWidget(m_pFileSelector, 0, 0); + } + } + + /* Add into layout: */ + m_pStackedLayout->addWidget(pLocalContainer); + } + + /* Create cloud container: */ + QWidget *pCloudContainer = new QWidget(m_pCntSource); + if (pCloudContainer) + { + /* Create cloud container layout: */ + m_pCloudContainerLayout = new QGridLayout(pCloudContainer); + if (m_pCloudContainerLayout) + { + m_pCloudContainerLayout->setContentsMargins(0, 0, 0, 0); + m_pCloudContainerLayout->setRowStretch(3, 1); + + /* Create sub-layout: */ + QHBoxLayout *pSubLayout = new QHBoxLayout; + if (pSubLayout) + { + pSubLayout->setContentsMargins(0, 0, 0, 0); + pSubLayout->setSpacing(1); + + /* Create account combo-box: */ + m_pAccountComboBox = new QComboBox(pCloudContainer); + if (m_pAccountComboBox) + { + /* Add into layout: */ + pSubLayout->addWidget(m_pAccountComboBox); + } + + /* Create account tool-button: */ + m_pAccountToolButton = new QIToolButton(pCloudContainer); + 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); + } + + /* Create profile property table: */ + m_pAccountPropertyTable = new QTableWidget(pCloudContainer); + 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: */ + m_pCloudContainerLayout->addWidget(m_pAccountPropertyTable, 1, 0); + } + + /* Create profile instances table: */ + m_pAccountInstanceList = new QListWidget(pCloudContainer); + if (m_pAccountInstanceList) + { + const QFontMetrics fm(m_pAccountInstanceList->font()); + const int iFontWidth = fm.width('x'); + const int iTotalWidth = 50 * iFontWidth; + const int iFontHeight = fm.height(); + const int iTotalHeight = 4 * iFontHeight; + m_pAccountInstanceList->setMinimumSize(QSize(iTotalWidth, iTotalHeight)); +// m_pAccountInstanceList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + m_pAccountInstanceList->setAlternatingRowColors(true); + + /* Add into layout: */ + m_pCloudContainerLayout->addWidget(m_pAccountInstanceList, 2, 0); + } + } + + /* Add into layout: */ + m_pStackedLayout->addWidget(pCloudContainer); + } + + /* Add into layout: */ + m_pSourceLayout->addLayout(m_pStackedLayout, 1, 0); } } /* Add into layout: */ - pMainLayout->addWidget(m_pApplianceCnt); + pMainLayout->addWidget(m_pCntSource); } /* Create settings container: */ m_pSettingsCnt = new QGroupBox(this); + if (m_pSettingsCnt) { /* Create settings container layout: */ - QVBoxLayout *pSettingsCntLayout = new QVBoxLayout(m_pSettingsCnt); + m_pSettingsCntLayout = new QStackedLayout(m_pSettingsCnt); + if (m_pSettingsCntLayout) { - /* Create appliance widget: */ - m_pApplianceWidget = new UIApplianceImportEditorWidget(m_pSettingsCnt); + /* Create appliance widget container: */ + QWidget *pApplianceWidgetCnt = new QWidget(m_pSettingsCnt); + if (pApplianceWidgetCnt) { - m_pApplianceWidget->setMinimumHeight(300); - m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); - m_pApplianceWidget->setFile(strFileName); + /* Create appliance widget layout: */ + QVBoxLayout *pApplianceWidgetLayout = new QVBoxLayout(pApplianceWidgetCnt); + if (pApplianceWidgetLayout) + { + /* Create appliance widget: */ + m_pApplianceWidget = new UIApplianceImportEditorWidget(pApplianceWidgetCnt); + if (m_pApplianceWidget) + { + m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + m_pApplianceWidget->setFile(strFileName); + + /* Add into layout: */ + pApplianceWidgetLayout->addWidget(m_pApplianceWidget); + } + } /* Add into layout: */ - pSettingsCntLayout->addWidget(m_pApplianceWidget); + m_pSettingsCntLayout->addWidget(pApplianceWidgetCnt); + } + + /* Create form editor container: */ + QWidget *pFormEditorCnt = new QWidget(m_pSettingsCnt); + if (pFormEditorCnt) + { + /* Create form editor layout: */ + QVBoxLayout *pFormEditorLayout = new QVBoxLayout(pFormEditorCnt); + if (pFormEditorLayout) + { + /* Create form editor widget: */ + m_pFormEditor = new UIFormEditorWidget(pFormEditorCnt); + if (m_pFormEditor) + { + /* Add into layout: */ + pFormEditorLayout->addWidget(m_pFormEditor); + } + } + + /* Add into layout: */ + m_pSettingsCntLayout->addWidget(pFormEditorCnt); } } @@ -84,11 +247,170 @@ } + /* Populate sources: */ + populateSources(); + /* Populate accounts: */ + populateAccounts(); + /* Populate account properties: */ + populateAccountProperties(); + /* Populate account instances: */ + populateAccountInstances(); + /* Populate form properties: */ + populateFormProperties(); + populateFormPropertiesTable(); + /* Setup connections: */ - connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged, this, &UIWizardImportAppPageExpert::sltFilePathChangeHandler); + if (gpManager) + connect(gpManager, &UIVirtualBoxManager::sigCloudProfileManagerChange, + this, &UIWizardImportAppPageExpert::sltHandleSourceChange); + connect(m_pSourceComboBox, static_cast(&QIComboBox::activated), + this, &UIWizardImportAppPageExpert::sltHandleSourceChange); + connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged, + this, &UIWizardImportAppPageExpert::sltFilePathChangeHandler); + connect(m_pAccountComboBox, static_cast(&QComboBox::currentIndexChanged), + this, &UIWizardImportAppPageExpert::sltHandleAccountComboChange); + connect(m_pAccountToolButton, &QIToolButton::clicked, + this, &UIWizardImportAppPageExpert::sltHandleAccountButtonClick); + connect(m_pAccountInstanceList, &QListWidget::currentRowChanged, + this, &UIWizardImportAppPageExpert::completeChanged); /* Register classes: */ qRegisterMetaType(); /* Register fields: */ + registerField("source", this, "source"); + registerField("isSourceCloudOne", this, "isSourceCloudOne"); + registerField("profile", this, "profile"); + registerField("vsdForm", this, "vsdForm"); + registerField("machineId", this, "machineId"); registerField("applianceWidget", this, "applianceWidget"); +} + +bool UIWizardImportAppPageExpert::event(QEvent *pEvent) +{ + /* Handle known event types: */ + switch (pEvent->type()) + { + case QEvent::Show: + case QEvent::Resize: + { + /* Adjust profile property table: */ + adjustAccountPropertyTable(); + break; + } + default: + break; + } + + /* Call to base-class: */ + return UIWizardPage::event(pEvent); +} + +void UIWizardImportAppPageExpert::retranslateUi() +{ + /* Translate appliance container: */ + m_pCntSource->setTitle(UIWizardImportApp::tr("Source")); + + /* Translate hardcoded values of Source combo-box: */ + m_pSourceComboBox->setItemText(0, UIWizardImportApp::tr("Local File System")); + m_pSourceComboBox->setItemData(0, UIWizardImportApp::tr("Import from local file system."), Qt::ToolTipRole); + /* Translate received values of Source combo-box. + * We are enumerating starting from 0 for simplicity: */ + for (int i = 0; i < m_pSourceComboBox->count(); ++i) + if (isSourceCloudOne(i)) + { + m_pSourceComboBox->setItemText(i, m_pSourceComboBox->itemData(i, SourceData_Name).toString()); + m_pSourceComboBox->setItemData(i, UIWizardImportApp::tr("Import from cloud service provider."), Qt::ToolTipRole); + } + + /* Translate file selector: */ + m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import...")); + m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import")); + m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf")); + + /* Translate settings container: */ + m_pSettingsCnt->setTitle(UIWizardImportApp::tr("Settings")); + + /* Update page appearance: */ + updatePageAppearance(); + + /* Update tool-tips: */ + updateSourceComboToolTip(); + updateAccountPropertyTableToolTips(); +} + +void UIWizardImportAppPageExpert::initializePage() +{ + /* Translate page: */ + retranslateUi(); +} + +bool UIWizardImportAppPageExpert::isComplete() const +{ + bool fResult = true; + + /* Check appliance settings: */ + if (fResult) + { + const bool fOVF = !isSourceCloudOne(); +// const bool fCSP = !fOVF; + + fResult = ( fOVF + && VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), OVFFileExts) + && QFile::exists(m_pFileSelector->path()) + && m_pApplianceWidget->isValid()) +// || ( fCSP +// && !m_comCloudProfile.isNull() +// && !m_comCloudClient.isNull() +// && !machineId().isNull()) + ; + } + + return fResult; +} + +bool UIWizardImportAppPageExpert::validatePage() +{ + /* Initial result: */ + bool fResult = true; + + /* Lock finish button: */ + startProcessing(); + + /* Try to import appliance: */ + if (fResult) + fResult = qobject_cast(wizard())->importAppliance(); + + /* Unlock finish button: */ + endProcessing(); + + /* Return result: */ + return fResult; +} + +void UIWizardImportAppPageExpert::updatePageAppearance() +{ + /* Call to base-class: */ + UIWizardImportAppPage1::updatePageAppearance(); + UIWizardImportAppPage2::updatePageAppearance(); + + /* Update page appearance according to chosen storage-type: */ + if (isSourceCloudOne()) + m_pAccountInstanceList->setFocus(); + else + m_pFileSelector->setFocus(); +} + +void UIWizardImportAppPageExpert::sltHandleSourceChange() +{ + /* Update tool-tip: */ + updateSourceComboToolTip(); + + /* Refresh required settings: */ + updatePageAppearance(); + populateAccounts(); + populateAccountProperties(); + populateAccountInstances(); + populateFormProperties(); + populateFormPropertiesTable(); + emit completeChanged(); } @@ -106,43 +428,18 @@ } -void UIWizardImportAppPageExpert::retranslateUi() -{ - /* Translate widgets: */ - m_pApplianceCnt->setTitle(UIWizardImportApp::tr("Appliance to import")); - m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import...")); - m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import")); - m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf")); - m_pSettingsCnt->setTitle(UIWizardImportApp::tr("Appliance settings")); -} - -void UIWizardImportAppPageExpert::initializePage() -{ - retranslateUi(); -} - -bool UIWizardImportAppPageExpert::isComplete() const -{ - /* Make sure appliance file has allowed extension and exists and appliance widget is valid: */ - return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), OVFFileExts) - && QFile::exists(m_pFileSelector->path()) - && m_pApplianceWidget->isValid(); -} - -bool UIWizardImportAppPageExpert::validatePage() -{ - /* Initial result: */ - bool fResult = true; - - /* Lock finish button: */ - startProcessing(); - - /* Try to import appliance: */ - if (fResult) - fResult = qobject_cast(wizard())->importAppliance(); - - /* Unlock finish button: */ - endProcessing(); - - /* Return result: */ - return fResult; -} +void UIWizardImportAppPageExpert::sltHandleAccountComboChange() +{ + /* Refresh required settings: */ + populateAccountProperties(); + populateAccountInstances(); + populateFormProperties(); + populateFormPropertiesTable(); + emit completeChanged(); +} + +void UIWizardImportAppPageExpert::sltHandleAccountButtonClick() +{ + /* Open Cloud Profile Manager: */ + if (gpManager) + gpManager->openCloudProfileManager(); +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.h (revision 78275) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.h (revision 78276) @@ -35,4 +35,9 @@ { Q_OBJECT; + Q_PROPERTY(QString source READ source WRITE setSource); + Q_PROPERTY(bool isSourceCloudOne READ isSourceCloudOne); + Q_PROPERTY(CCloudProfile profile READ profile); + Q_PROPERTY(CVirtualSystemDescriptionForm vsdForm READ vsdForm); + Q_PROPERTY(QString machineId READ machineId); Q_PROPERTY(ImportAppliancePointer applianceWidget READ applianceWidget); @@ -43,10 +48,11 @@ UIWizardImportAppPageExpert(bool fImportFromOCIByDefault, const QString &strFileName); -private slots: +protected: - /** Handles file-path change. */ - void sltFilePathChangeHandler(); + /** Allows to access 'field()' from base part. */ + virtual QVariant fieldImp(const QString &strFieldName) const /* override */ { return UIWizardPage::field(strFieldName); } -private: + /** Handle any Qt @a pEvent. */ + virtual bool event(QEvent *pEvent) /* override */; /** Handles translation event. */ @@ -62,6 +68,24 @@ virtual bool validatePage() /* override */; - /** Holds the appliance container instance. */ - QGroupBox *m_pApplianceCnt; + /** Updates page appearance. */ + virtual void updatePageAppearance() /* override */; + +private slots: + + /** Handles import source change. */ + void sltHandleSourceChange(); + + /** Handles file-path change. */ + void sltFilePathChangeHandler(); + + /** Handles change in account combo-box. */ + void sltHandleAccountComboChange(); + /** Handles account tool-button click. */ + void sltHandleAccountButtonClick(); + +private: + + /** Holds the source container instance. */ + QGroupBox *m_pCntSource; /** Holds the settings container instance. */ QGroupBox *m_pSettingsCnt;