Changeset 91145 in vbox

Timestamp:

Sep 7, 2021 7:10:39 PM (4 years ago)

Author:

vboxsync

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

146799

Message:

FE/Qt: bugref:10067: Reuse UICloudNetworkingStuff in Export / Import Appliance wizards, few more places.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICloudNetworkingStuff.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageBasic1.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp

@@ -76 +76 @@
         CCloudProvider comProvider = comProviderManager.GetProviderById(uProviderId);
         if (!comProviderManager.isOk())
-            msgCenter().cannotAcquireCloudProviderManagerParameter(comProviderManager, pParent);
+            msgCenter().cannotFindCloudProvider(comProviderManager, uProviderId, pParent);
         else
             return comProvider;

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

@@ -176 +176 @@
     {
         /* (Re)initialize Cloud Provider: */
-        m_comCloudProvider = m_comCloudProviderManager.GetProviderById(providerId());
-        /* Show error message if necessary: */
-        if (!m_comCloudProviderManager.isOk())
-            msgCenter().cannotFindCloudProvider(m_comCloudProviderManager, providerId());
-        else
+        m_comCloudProvider = cloudProviderById(providerId(), wizardImp());
+        if (m_comCloudProvider.isNotNull())
         {
-            /* Acquire existing profile names: */
-            const QVector<QString> profileNames = m_comCloudProvider.GetProfileNames();
-            /* Show error message if necessary: */
-            if (!m_comCloudProvider.isOk())
-                msgCenter().cannotAcquireCloudProviderParameter(m_comCloudProvider);
-            else
-            {
-                /* Iterate through existing profile names: */
-                foreach (const QString &strProfileName, profileNames)
+            /* Iterate through existing profile names: */
+            foreach (const CCloudProfile &comProfile, listCloudProfiles(m_comCloudProvider, wizardImp()))
+            {
+                /* Acquire profile name: */
+                QString strProfileName;
+                if (cloudProfileName(comProfile, strProfileName, wizardImp()))
                 {
-                    /* Skip if we have nothing to show (wtf happened?): */
-                    if (strProfileName.isEmpty())
-                        continue;
-
                     /* Compose item, fill it's data: */
                     m_pProfileComboBox->addItem(strProfileName);
@@ -225 +215 @@
 
     /* If both provider and profile chosen: */
-    if (!m_comCloudProvider.isNull() && !profileName().isNull())
+    if (!providerShortName().isNull() && !profileName().isNull())
     {
         /* Acquire Cloud Profile: */
-        m_comCloudProfile = m_comCloudProvider.GetProfileByName(profileName());
-        /* Show error message if necessary: */
-        if (!m_comCloudProvider.isOk())
-            msgCenter().cannotFindCloudProfile(m_comCloudProvider, profileName());
+        m_comCloudProfile = cloudProfileByName(providerShortName(), profileName(), wizardImp());
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -130 +130 @@
     if (!sourceId().isNull())
     {
-        /* Main API request sequence, can be interrupted after any step: */
-        do
-        {
-            /* (Re)initialize Cloud Provider: */
-            m_comCloudProvider = m_comCloudProviderManager.GetProviderById(sourceId());
-            if (!m_comCloudProviderManager.isOk())
-            {
-                msgCenter().cannotFindCloudProvider(m_comCloudProviderManager, sourceId());
-                break;
-            }
-
-            /* Acquire existing profile names: */
-            const QVector<QString> profileNames = m_comCloudProvider.GetProfileNames();
-            if (!m_comCloudProvider.isOk())
-            {
-                msgCenter().cannotAcquireCloudProviderParameter(m_comCloudProvider);
-                break;
-            }
-
+        /* (Re)initialize Cloud Provider: */
+        m_comCloudProvider = cloudProviderById(sourceId(), wizardImp());
+        if (m_comCloudProvider.isNotNull())
+        {
             /* Iterate through existing profile names: */
-            foreach (const QString &strProfileName, profileNames)
-            {
-                /* Skip if we have nothing to show (wtf happened?): */
-                if (strProfileName.isEmpty())
-                    continue;
-
-                /* Compose item, fill it's data: */
-                m_pProfileComboBox->addItem(strProfileName);
-                m_pProfileComboBox->setItemData(m_pProfileComboBox->count() - 1, strProfileName, ProfileData_Name);
-            }
-
-            /* Set previous/default item if possible: */
-            int iNewIndex = -1;
-            if (   iNewIndex == -1
-                && !strOldData.isNull())
-                iNewIndex = m_pProfileComboBox->findData(strOldData, ProfileData_Name);
-            if (   iNewIndex == -1
-                && m_pProfileComboBox->count() > 0)
-                iNewIndex = 0;
-            if (iNewIndex != -1)
-                m_pProfileComboBox->setCurrentIndex(iNewIndex);
-        }
-        while (0);
+            foreach (const CCloudProfile &comProfile, listCloudProfiles(m_comCloudProvider, wizardImp()))
+            {
+                /* Acquire profile name: */
+                QString strProfileName;
+                if (cloudProfileName(comProfile, strProfileName, wizardImp()))
+                {
+                    /* Compose item, fill it's data: */
+                    m_pProfileComboBox->addItem(strProfileName);
+                    m_pProfileComboBox->setItemData(m_pProfileComboBox->count() - 1, strProfileName, ProfileData_Name);
+                }
+            }
+        }
+
+        /* Set previous/default item if possible: */
+        int iNewIndex = -1;
+        if (   iNewIndex == -1
+            && !strOldData.isNull())
+            iNewIndex = m_pProfileComboBox->findData(strOldData, ProfileData_Name);
+        if (   iNewIndex == -1
+            && m_pProfileComboBox->count() > 0)
+            iNewIndex = 0;
+        if (iNewIndex != -1)
+            m_pProfileComboBox->setCurrentIndex(iNewIndex);
     }
 
@@ -185 +170 @@
 
     /* If both provider and profile chosen: */
-    if (m_comCloudProvider.isNotNull() && !profileName().isNull())
+    if (!source().isNull() && !profileName().isNull())
     {
         /* Acquire Cloud Profile: */
-        m_comCloudProfile = m_comCloudProvider.GetProfileByName(profileName());
-        /* Show error message if necessary: */
-        if (!m_comCloudProvider.isOk())
-            msgCenter().cannotFindCloudProfile(m_comCloudProvider, profileName());
+        m_comCloudProfile = cloudProfileByName(source(), profileName(), wizardImp());
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -170 +170 @@
 protected:
 
+    /** Allows access wizard from base part. */
+    UIWizard *wizardImp() const { return UIWizardPage::wizard(); }
+
     /** Handles translation event. */
     virtual void retranslateUi() /* override */;