Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 74768) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 74769) @@ -68,5 +68,5 @@ /* For Filesystem formats only: */ - if (field("format").toString() != "csp-1.0") + if (!field("isFormatCloudOne").toBool()) { /* We need to know every filename which will be created, so that we can ask the user for confirmation of overwriting. @@ -150,6 +150,6 @@ QString UIWizardExportApp::uri(bool fWithFile) const { - /* For Cloud Service Providers: */ - if (field("format").toString() == "csp-1.0") + /* For Cloud formats: */ + if (field("isFormatCloudOne").toBool()) return QString("%1://%2").arg(field("providerShortName").toString(), field("profileName").toString()); else Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 74768) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 74769) @@ -86,5 +86,4 @@ formats << "ovf-2.0"; formats << "opc-1.0"; - formats << "csp-1.0"; /* Add that list to combo: */ foreach (const QString &strShortName, formats) @@ -95,4 +94,19 @@ } + /* Iterate through existing providers: */ + foreach (const CCloudProvider &comProvider, m_comCloudProviderManager.GetProviders()) + { + /* Skip if we have nothing to populate (file missing?): */ + if (comProvider.isNull()) + continue; + + /* Compose empty item, fill it's data: */ + m_pFormatComboBox->addItem(QString()); + m_pFormatComboBox->setItemData(m_pFormatComboBox->count() - 1, comProvider.GetId(), FormatData_ID); + m_pFormatComboBox->setItemData(m_pFormatComboBox->count() - 1, comProvider.GetName(), FormatData_Name); + m_pFormatComboBox->setItemData(m_pFormatComboBox->count() - 1, comProvider.GetShortName(), FormatData_ShortName); + m_pFormatComboBox->setItemData(m_pFormatComboBox->count() - 1, true, FormatData_IsItCloudFormat); + } + /* Set default: */ setFormat("ovf-1.0"); @@ -116,28 +130,26 @@ void UIWizardExportAppPage2::populateAccounts() { - /* Make sure this combo isn't filled yet: */ - AssertReturnVoid(m_pAccountComboBox->count() == 0); - - /* Iterate through providers: */ - foreach (const CCloudProvider &comCloudProvider, m_comCloudProviderManager.GetProviders()) - { - /* Skip if we have nothing to populate (file missing?): */ - if (comCloudProvider.isNull()) - continue; - - /* Iterate through profile names: */ - foreach (const QString &strProfileName, comCloudProvider.GetProfileNames()) - { - m_pAccountComboBox->addItem(QString()); - m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, comCloudProvider.GetId(), AccountData_ProviderID); - m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, comCloudProvider.GetName(), AccountData_ProviderName); - m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, comCloudProvider.GetShortName(), AccountData_ProviderShortName); - m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProfileName, AccountData_ProfileName); - } + /* Clear combo initially: */ + m_pAccountComboBox->clear(); + /* Return if no provider chosen: */ + if (providerId().isNull()) + return; + + /* Acquire Cloud Provider: */ + CCloudProvider comCloudProvider = m_comCloudProviderManager.GetProviderById(providerId()); + /* Return if the provider has disappeared: */ + if (comCloudProvider.isNull()) + return; + + /* Iterate through profile names: */ + foreach (const QString &strProfileName, comCloudProvider.GetProfileNames()) + { + m_pAccountComboBox->addItem(strProfileName); + m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProfileName, AccountData_ProfileName); } /* Set default: */ if (m_pAccountComboBox->count() != 0) - setProviderById("54e11de4-afcc-47fb-9c39-b24244cfa044"); + m_pAccountComboBox->setCurrentIndex(0); } @@ -146,4 +158,7 @@ /* Clear table initially: */ m_pAccountPropertyTable->clear(); + /* Return if no provider chosen: */ + if (providerId().isNull()) + return; /* Acquire Cloud Provider: */ @@ -214,6 +229,5 @@ { /* Update page appearance according to chosen storage-type: */ - const bool fCSP = fieldImp("format").toString() == "csp-1.0"; - m_pSettingsWidget->setCurrentIndex((int)fCSP); + m_pSettingsWidget->setCurrentIndex((int)isFormatCloudOne()); } @@ -233,6 +247,6 @@ void UIWizardExportAppPage2::refreshFileSelectorExtension() { - /* If the format is set to CSP: */ - if (fieldImp("format").toString() == "csp-1.0") + /* If format is cloud one: */ + if (isFormatCloudOne()) { /* We use no extension: */ @@ -279,6 +293,6 @@ void UIWizardExportAppPage2::refreshManifestCheckBoxAccess() { - /* If the format is set to CSP || OPC: */ - if ( fieldImp("format").toString() == "csp-1.0" + /* If format is cloud one or OPC: */ + if ( isFormatCloudOne() || fieldImp("format").toString() == "opc-1.0") { @@ -298,6 +312,6 @@ void UIWizardExportAppPage2::refreshIncludeISOsCheckBoxAccess() { - /* If the format is set to CSP || OPC: */ - if ( fieldImp("format").toString() == "csp-1.0" + /* If format is cloud one or OPC: */ + if ( isFormatCloudOne() || fieldImp("format").toString() == "opc-1.0") { @@ -375,4 +389,11 @@ } +bool UIWizardExportAppPage2::isFormatCloudOne(int iIndex /* = -1 */) const +{ + if (iIndex == -1) + iIndex = m_pFormatComboBox->currentIndex(); + return m_pFormatComboBox->itemData(iIndex, FormatData_IsItCloudFormat).toBool(); +} + void UIWizardExportAppPage2::setPath(const QString &strPath) { @@ -420,19 +441,19 @@ void UIWizardExportAppPage2::setProviderById(const QString &strId) { - const int iIndex = m_pAccountComboBox->findData(strId, AccountData_ProviderID); + const int iIndex = m_pFormatComboBox->findData(strId, FormatData_ID); AssertMsg(iIndex != -1, ("Data not found!")); - m_pAccountComboBox->setCurrentIndex(iIndex); + m_pFormatComboBox->setCurrentIndex(iIndex); } QString UIWizardExportAppPage2::providerId() const { - const int iIndex = m_pAccountComboBox->currentIndex(); - return m_pAccountComboBox->itemData(iIndex, AccountData_ProviderID).toString(); + const int iIndex = m_pFormatComboBox->currentIndex(); + return m_pFormatComboBox->itemData(iIndex, FormatData_ID).toString(); } QString UIWizardExportAppPage2::providerShortName() const { - const int iIndex = m_pAccountComboBox->currentIndex(); - return m_pAccountComboBox->itemData(iIndex, AccountData_ProviderShortName).toString(); + const int iIndex = m_pFormatComboBox->currentIndex(); + return m_pFormatComboBox->itemData(iIndex, FormatData_ShortName).toString(); } @@ -699,4 +720,5 @@ /* Register fields: */ registerField("format", this, "format"); + registerField("isFormatCloudOne", this, "isFormatCloudOne"); registerField("path", this, "path"); registerField("macAddressPolicy", this, "macAddressPolicy"); @@ -759,5 +781,4 @@ m_pFormatComboBox->setItemText(2, UIWizardExportApp::tr("Open Virtualization Format 2.0")); m_pFormatComboBox->setItemText(3, UIWizardExportApp::tr("Oracle Public Cloud Format 1.0")); - m_pFormatComboBox->setItemText(4, UIWizardExportApp::tr("Cloud Service Provider")); m_pFormatComboBox->setItemData(0, UIWizardExportApp::tr("Write in legacy OVF 0.9 format for compatibility " "with other virtualization products."), Qt::ToolTipRole); @@ -765,5 +786,12 @@ m_pFormatComboBox->setItemData(2, UIWizardExportApp::tr("Write in new OVF 2.0 format."), Qt::ToolTipRole); m_pFormatComboBox->setItemData(3, UIWizardExportApp::tr("Write in Oracle Public Cloud 1.0 format."), Qt::ToolTipRole); - m_pFormatComboBox->setItemData(4, UIWizardExportApp::tr("Export to Cloud Service Provider."), Qt::ToolTipRole); + /* Translate received values of Format combo-box. + * We are enumerating starting from 0 for simplicity: */ + for (int i = 0; i < m_pFormatComboBox->count(); ++i) + if (isFormatCloudOne(i)) + { + m_pFormatComboBox->setItemText(i, m_pFormatComboBox->itemData(i, FormatData_Name).toString()); + m_pFormatComboBox->setItemData(i, UIWizardExportApp::tr("Export to cloud service provider."), Qt::ToolTipRole); + } /* Translate MAC address policy combo-box: */ @@ -794,10 +822,4 @@ /* Translate Account combo-box: */ m_pAccountComboBoxLabel->setText(UIWizardExportApp::tr("&Account:")); - for (int i = 0; i < m_pAccountComboBox->count(); ++i) - { - m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile") - .arg(m_pAccountComboBox->itemData(i, AccountData_ProviderName).toString()) - .arg(m_pAccountComboBox->itemData(i, AccountData_ProfileName).toString())); - } /* Adjust label widths: */ @@ -855,5 +877,5 @@ || field("format").toString() == "ovf-2.0"; const bool fOPC = field("format").toString() == "opc-1.0"; - const bool fCSP = field("format").toString() == "csp-1.0"; + const bool fCSP = isFormatCloudOne(); fResult = ( fOVF @@ -873,5 +895,5 @@ /* Update page appearance according to chosen storage-type: */ - if (field("format").toString() == "csp-1.0") + if (isFormatCloudOne()) { m_pLabelSettings->setText(UIWizardExportApp:: @@ -902,4 +924,6 @@ refreshManifestCheckBoxAccess(); refreshIncludeISOsCheckBoxAccess(); + populateAccounts(); + populateAccountProperties(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (revision 74768) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (revision 74769) @@ -56,5 +56,8 @@ enum { - FormatData_ShortName = Qt::UserRole + 1 + FormatData_ID = Qt::UserRole + 1, + FormatData_Name = Qt::UserRole + 2, + FormatData_ShortName = Qt::UserRole + 3, + FormatData_IsItCloudFormat = Qt::UserRole + 4 }; @@ -62,8 +65,5 @@ enum { - AccountData_ProviderID = Qt::UserRole + 1, - AccountData_ProviderName = Qt::UserRole + 2, - AccountData_ProviderShortName = Qt::UserRole + 3, - AccountData_ProfileName = Qt::UserRole + 4 + AccountData_ProfileName = Qt::UserRole + 1 }; @@ -113,4 +113,6 @@ /** Returns format. */ QString format() const; + /** Returns whether format under certain @a iIndex is cloud one. */ + bool isFormatCloudOne(int iIndex = -1) const; /** Defines @a strPath. */ @@ -204,4 +206,5 @@ Q_OBJECT; Q_PROPERTY(QString format READ format WRITE setFormat); + Q_PROPERTY(bool isFormatCloudOne READ isFormatCloudOne); Q_PROPERTY(QString path READ path WRITE setPath); Q_PROPERTY(MACAddressPolicy macAddressPolicy READ macAddressPolicy WRITE setMACAddressPolicy); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 74768) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 74769) @@ -262,5 +262,5 @@ if (comMachine.isOk() && comVsd.isNotNull()) { - if (fieldImp("format").toString() == "csp-1.0") + if (fieldImp("isFormatCloudOne").toBool()) { /* Populate Cloud Client parameters: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 74768) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 74769) @@ -345,4 +345,5 @@ registerField("machineIDs", this, "machineIDs"); registerField("format", this, "format"); + registerField("isFormatCloudOne", this, "isFormatCloudOne"); registerField("path", this, "path"); registerField("macAddressPolicy", this, "macAddressPolicy"); @@ -396,5 +397,4 @@ m_pFormatComboBox->setItemText(2, UIWizardExportApp::tr("Open Virtualization Format 2.0")); m_pFormatComboBox->setItemText(3, UIWizardExportApp::tr("Oracle Public Cloud Format 1.0")); - m_pFormatComboBox->setItemText(4, UIWizardExportApp::tr("Cloud Service Provider")); m_pFormatComboBox->setItemData(0, UIWizardExportApp::tr("Write in legacy OVF 0.9 format for compatibility " "with other virtualization products."), Qt::ToolTipRole); @@ -402,5 +402,12 @@ m_pFormatComboBox->setItemData(2, UIWizardExportApp::tr("Write in new OVF 2.0 format."), Qt::ToolTipRole); m_pFormatComboBox->setItemData(3, UIWizardExportApp::tr("Write in Oracle Public Cloud 1.0 format."), Qt::ToolTipRole); - m_pFormatComboBox->setItemData(4, UIWizardExportApp::tr("Export to Cloud Service Provider."), Qt::ToolTipRole); + /* Translate received values of Format combo-box. + * We are enumerating starting from 0 for simplicity: */ + for (int i = 0; i < m_pFormatComboBox->count(); ++i) + if (isFormatCloudOne(i)) + { + m_pFormatComboBox->setItemText(i, m_pFormatComboBox->itemData(i, FormatData_Name).toString()); + m_pFormatComboBox->setItemData(i, UIWizardExportApp::tr("Export to cloud service provider."), Qt::ToolTipRole); + } /* Translate MAC address policy combo-box: */ @@ -431,10 +438,4 @@ /* Translate Account combo-box: */ m_pAccountComboBoxLabel->setText(UIWizardExportApp::tr("&Account:")); - for (int i = 0; i < m_pAccountComboBox->count(); ++i) - { - m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile") - .arg(m_pAccountComboBox->itemData(i, AccountData_ProviderName).toString()) - .arg(m_pAccountComboBox->itemData(i, AccountData_ProfileName).toString())); - } /* Adjust label widths: */ @@ -495,5 +496,5 @@ || field("format").toString() == "ovf-2.0"; const bool fOPC = field("format").toString() == "opc-1.0"; - const bool fCSP = field("format").toString() == "csp-1.0"; + const bool fCSP = isFormatCloudOne(); fResult = ( fOVF @@ -545,4 +546,6 @@ refreshManifestCheckBoxAccess(); refreshIncludeISOsCheckBoxAccess(); + populateAccounts(); + populateAccountProperties(); refreshApplianceSettingsWidget(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 74768) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 74769) @@ -37,4 +37,5 @@ Q_PROPERTY(QStringList machineIDs READ machineIDs); Q_PROPERTY(QString format READ format WRITE setFormat); + Q_PROPERTY(bool isFormatCloudOne READ isFormatCloudOne); Q_PROPERTY(QString path READ path WRITE setPath); Q_PROPERTY(MACAddressPolicy macAddressPolicy READ macAddressPolicy WRITE setMACAddressPolicy);