Changeset 73175 in vbox

Timestamp:

Jul 17, 2018 11:52:22 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123777

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Appliance and Expert pages: Integrating KCloudProviderId.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (3 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic3.h (modified) (3 diffs)
• wizards/exportappliance/UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -136 +136 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<KChipsetType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<KNATProtocol>();
+template<> SHARED_LIBRARY_STUFF bool canConvert<KCloudProviderId>();
 
 
@@ -253 +254 @@
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const KNATProtocol &protocol);
 template<> SHARED_LIBRARY_STUFF KNATProtocol fromInternalString<KNATProtocol>(const QString &strProtocol);
+template<> SHARED_LIBRARY_STUFF QString toInternalString(const KCloudProviderId &enmProvider);
 
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -59 +59 @@
 template<> bool canConvert<KChipsetType>() { return true; }
 template<> bool canConvert<KNATProtocol>() { return true; }
+template<> bool canConvert<KCloudProviderId>() { return true; }
 
 
@@ -654 +655 @@
     return values.at(keys.indexOf(QRegExp(strProtocol, Qt::CaseInsensitive)));
 }
+
+/* QString <= KCloudProviderId: */
+template<> QString toInternalString(const KCloudProviderId &enmProvider)
+{
+    switch (enmProvider)
+    {
+        case KCloudProviderId_OCI:            return "OCI";
+        case KCloudProviderId_GCP:            return "GCP";
+        case KCloudProviderId_AWS:            return "AWS";
+        case KCloudProviderId_MicrosoftAzure: return "Microsoft Azure";
+        case KCloudProviderId_IBMCloud:       return "IBM Cloud";
+        case KCloudProviderId_DigitalOcean:   return "Digital Ocean";
+        default: AssertMsgFailed(("No text for %d", enmProvider)); break;
+    }
+    return QString();
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -35 +35 @@
 # include "QIRichTextLabel.h"
 # include "VBoxGlobal.h"
+# include "UIConverter.h"
 # include "UIEmptyFilePathSelector.h"
 # include "UIWizardExportApp.h"
@@ -103 +104 @@
 void UIWizardExportAppPage3::populateProviders()
 {
+    /* Make sure this combo isn't filled yet: */
     AssertReturnVoid(m_pProviderComboBox->count() == 0);
 
-    /* Acquire provider list: */
+    /* Acquire provider ID list: */
     // Here goes the experiamental list with
     // arbitrary contents for testing purposes.
-    QStringList providers;
-    providers << "OCI";
-    providers << "Dummy Provider 2";
-    providers << "Dummy Provider 3";
-    providers << "Dummy Provider 4";
-    m_pProviderComboBox->addItems(providers);
-
-    /* Duplicate non-translated names to data fields: */
-    for (int i = 0; i < m_pProviderComboBox->count(); ++i)
-        m_pProviderComboBox->setItemData(i, m_pProviderComboBox->itemText(i));
+    QVector<KCloudProviderId> providerIds;
+    providerIds << KCloudProviderId_OCI;
+    providerIds << KCloudProviderId_GCP;
+    providerIds << KCloudProviderId_AWS;
+    providerIds << KCloudProviderId_MicrosoftAzure;
+    providerIds << KCloudProviderId_IBMCloud;
+    providerIds << KCloudProviderId_DigitalOcean;
+
+    /* Add non-translated provider names into combo: */
+    foreach (KCloudProviderId enmType, providerIds)
+    {
+        m_pProviderComboBox->addItem(gpConverter->toInternalString(enmType));
+        m_pProviderComboBox->setItemData(m_pProviderComboBox->count() - 1, (int)enmType);
+    }
 
     /* Set default: */
-    setProvider("OCI");
+    setProvider(KCloudProviderId_OCI);
 }
 
@@ -365 +371 @@
 }
 
-QString UIWizardExportAppPage3::provider() const
+KCloudProviderId UIWizardExportAppPage3::provider() const
 {
     const int iIndex = m_pProviderComboBox->currentIndex();
-    return m_pProviderComboBox->itemData(iIndex).toString();
-}
-
-void UIWizardExportAppPage3::setProvider(const QString &strProvider)
-{
-    const int iIndex = m_pProviderComboBox->findData(strProvider);
+    return (KCloudProviderId)m_pProviderComboBox->itemData(iIndex).toInt();
+}
+
+void UIWizardExportAppPage3::setProvider(KCloudProviderId enmProvider)
+{
+    const int iIndex = m_pProviderComboBox->findData((int)enmProvider);
     AssertMsg(iIndex != -1, ("Field not found!"));
     m_pProviderComboBox->setCurrentIndex(iIndex);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h

@@ -25 +25 @@
 #include "UIWizardPage.h"
 
+/* COM includes: */
+#include "COMEnums.h"
+
 /* Forward declarations: */
 class QCheckBox;
@@ -116 +119 @@
 
     /** Returns provider. */
-    QString provider() const;
+    KCloudProviderId provider() const;
     /** Defines @a strProvider. */
-    void setProvider(const QString &strProvider);
+    void setProvider(KCloudProviderId enmProvider);
 
     /** Returns profile. */
@@ -181 +184 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
-    Q_PROPERTY(QString provider READ provider WRITE setProvider);
+    Q_PROPERTY(KCloudProviderId provider READ provider WRITE setProvider);
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

@@ -46 +46 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
+    Q_PROPERTY(KCloudProviderId provider READ provider WRITE setProvider);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);