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

Timestamp:

Sep 7, 2021 6:24:49 PM (3 years ago)

Author:

vboxsync

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

146798

Message:

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

Location:

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

Files:

• exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (2 diffs)
• importappliance/UIWizardImportAppPageBasic1.cpp (modified) (3 diffs)

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

@@ -31 +31 @@
 #include "QIRichTextLabel.h"
 #include "QIToolButton.h"
+#include "UICloudNetworkingStuff.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -95 +96 @@
     /* Initialize Cloud Provider Manager: */
     bool fOCIPresent = false;
-    CVirtualBox comVBox = uiCommon().virtualBox();
-    m_comCloudProviderManager = comVBox.GetCloudProviderManager();
-    /* Show error message if necessary: */
-    if (!comVBox.isOk())
-        msgCenter().cannotAcquireCloudProviderManager(comVBox);
-    else
-    {
-        /* Acquire existing providers: */
-        const QVector<CCloudProvider> providers = m_comCloudProviderManager.GetProviders();
-        /* Show error message if necessary: */
-        if (!m_comCloudProviderManager.isOk())
-            msgCenter().cannotAcquireCloudProviderManagerParameter(m_comCloudProviderManager);
-        else
+    m_comCloudProviderManager = cloudProviderManager(wizardImp());
+    if (m_comCloudProviderManager.isNotNull())
+    {
+        /* Iterate through existing providers: */
+        foreach (const CCloudProvider &comProvider, listCloudProviders(wizardImp()))
         {
-            /* Iterate through existing providers: */
-            foreach (const CCloudProvider &comProvider, providers)
-            {
-                /* 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);
-                if (m_pFormatComboBox->itemData(m_pFormatComboBox->count() - 1, FormatData_ShortName).toString() == "OCI")
-                    fOCIPresent = true;
-            }
+            /* 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);
+            if (m_pFormatComboBox->itemData(m_pFormatComboBox->count() - 1, FormatData_ShortName).toString() == "OCI")
+                fOCIPresent = true;
         }
     }

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

@@ -29 +29 @@
 #include "QIRichTextLabel.h"
 #include "QIToolButton.h"
+#include "UICloudNetworkingStuff.h"
 #include "UICommon.h"
 #include "UIEmptyFilePathSelector.h"
@@ -81 +82 @@
     }
 
-    /* Do we have OCI source? */
+    /* Initialize Cloud Provider Manager: */
     bool fOCIPresent = false;
-
-    /* Main API request sequence, can be interrupted after any step: */
-    do
-    {
-        /* Initialize Cloud Provider Manager: */
-        CVirtualBox comVBox = uiCommon().virtualBox();
-        m_comCloudProviderManager = comVBox.GetCloudProviderManager();
-        if (!comVBox.isOk())
-        {
-            msgCenter().cannotAcquireCloudProviderManager(comVBox);
-            break;
-        }
-
-        /* Acquire existing providers: */
-        const QVector<CCloudProvider> providers = m_comCloudProviderManager.GetProviders();
-        if (!m_comCloudProviderManager.isOk())
-        {
-            msgCenter().cannotAcquireCloudProviderManagerParameter(m_comCloudProviderManager);
-            break;
-        }
-
+    m_comCloudProviderManager = cloudProviderManager(wizardImp());
+    if (m_comCloudProviderManager.isNotNull())
+    {
         /* Iterate through existing providers: */
-        foreach (const CCloudProvider &comProvider, providers)
+        foreach (const CCloudProvider &comProvider, listCloudProviders(wizardImp()))
         {
             /* Skip if we have nothing to populate (file missing?): */
@@ -121 +104 @@
         }
     }
-    while (0);
 
     /* Set default: */