Changeset 73728 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 17, 2018 8:14:49 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Fixes and improvement for OCI API redesign presented in r124395.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportApp.cpp (modified) (1 diff)
• UIWizardExportAppPageBasic2.cpp (modified) (6 diffs)
• UIWizardExportAppPageBasic2.h (modified) (3 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (2 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

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

@@ -152 +152 @@
     /* For Cloud Service Providers: */
     if (field("format").toString() == "csp-1.0")
-        return QString("OCI://%1").arg(field("profileName").toString());
+        return QString("%1://%2").arg(field("providerShortName").toString(), field("profileName").toString());
     else
     {

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

@@ -128 +128 @@
         if (comProvider.isNull())
             continue;
-        QString strProviderId = comProvider.GetId();
-        QString strProviderShortName = comProvider.GetShortName();
 
         /* Iterate through profile names: */
@@ -135 +133 @@
         {
             m_pAccountComboBox->addItem(QString());
-            m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProviderId, ProviderID);
-            m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProviderShortName, ProviderName);
+            m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, comProvider.GetId(), ProviderID);
+            m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, comProvider.GetName(), ProviderName);
+            m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, comProvider.GetShortName(), ProviderShortName);
             m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProfileName, ProfileName);
         }
@@ -154 +153 @@
         return;
 
+    /* Acquire Cloud Profile: */
     m_comCloudProfile = comCloudProvider.GetProfileByName(profileName());
     /* Return if the profile has disappeared: */
     if (m_comCloudProfile.isNull())
+        return;
 
     /* Clear table initially: */
@@ -431 +432 @@
     const int iIndex = m_pAccountComboBox->currentIndex();
     return m_pAccountComboBox->itemData(iIndex, ProviderID).toString();
+}
+
+QString UIWizardExportAppPage2::providerShortName() const
+{
+    const int iIndex = m_pAccountComboBox->currentIndex();
+    return m_pAccountComboBox->itemData(iIndex, ProviderShortName).toString();
 }
 
@@ -699 +706 @@
     registerField("manifestSelected", this, "manifestSelected");
     registerField("includeISOsSelected", this, "includeISOsSelected");
+    registerField("providerShortName", this, "providerShortName");
     registerField("profileName", this, "profileName");
-    registerField("provider", this, "provider");
+    registerField("profile", this, "profile");
 }
 
@@ -791 +799 @@
     for (int i = 0; i < m_pAccountComboBox->count(); ++i)
     {
-        if (m_pAccountComboBox->itemData(i, ProviderID).toString() == "54e11de4-afcc-47fb-9c39-b24244cfa044")
-        {
-            m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("Oracle Cloud Infrastructure: %1", "provider: profile")
-                .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
-        }
-        else
-        {
-            m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile")
-                .arg(m_pAccountComboBox->itemData(i, ProviderName).toString())
-                .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
-        }
+        m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile")
+            .arg(m_pAccountComboBox->itemData(i, ProviderName).toString())
+            .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
     }
 

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

@@ -56 +56 @@
 enum
 {
-    ProviderID      = Qt::UserRole + 1,
-    ProviderName    = Qt::UserRole + 2,
-    ProfileName     = Qt::UserRole + 3
+    ProviderID        = Qt::UserRole + 1,
+    ProviderName      = Qt::UserRole + 2,
+    ProviderShortName = Qt::UserRole + 3,
+    ProfileName       = Qt::UserRole + 4
 };
 
@@ -131 +132 @@
     /** Returns provider ID. */
     QString providerId() const;
+    /** Returns provider short name. */
+    QString providerShortName() const;
     /** Returns profile name. */
     QString profileName() const;
@@ -199 +202 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
+    Q_PROPERTY(QString providerShortName READ providerShortName);
+    Q_PROPERTY(QString profileName READ profileName);
     Q_PROPERTY(CCloudProfile profile READ profile);
-    Q_PROPERTY(QString profileName READ profileName);
 
 public:

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

@@ -349 +349 @@
     registerField("manifestSelected", this, "manifestSelected");
     registerField("includeISOsSelected", this, "includeISOsSelected");
+    registerField("providerShortName", this, "providerShortName");
     registerField("profileName", this, "profileName");
-    registerField("provider", this, "provider");
+    registerField("profile", this, "profile");
     registerField("applianceWidget", this, "applianceWidget");
 }
@@ -432 +433 @@
     for (int i = 0; i < m_pAccountComboBox->count(); ++i)
     {
-        if (m_pAccountComboBox->itemData(i, ProviderID).toString() == "OCI")
-        {
-            m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("Oracle Cloud Infrastructure: %1", "provider: profile")
-                .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
-        }
-        else
-        {
-            m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile")
-                .arg(m_pAccountComboBox->itemData(i, ProviderID).toString())
-                .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
-        }
+        m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile")
+            .arg(m_pAccountComboBox->itemData(i, ProviderName).toString())
+            .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
     }
 

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

@@ -41 +41 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
+    Q_PROPERTY(QString providerShortName READ providerShortName);
+    Q_PROPERTY(QString profileName READ profileName);
     Q_PROPERTY(CCloudProfile profile READ profile);
-    Q_PROPERTY(QString profileName READ profileName);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);