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

Timestamp:

Nov 9, 2018 7:11:40 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9230: Cloud Profile Manager: Using recent API improvements done in r126506.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/cloud

Files:

• UICloudProfileDetailsWidget.h (modified) (2 diffs)
• UICloudProfileManager.cpp (modified) (9 diffs)
• UICloudProfileManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.h

@@ -20 +20 @@
 
 /* Qt includes: */
+#include <QMap>
 #include <QUuid>
 #include <QWidget>
@@ -62 +63 @@
     /** Holds the provider name. */
     QString  m_strName;
+
+    /** Holds the profile supported property descriptions. */
+    QMap<QString, QString>  m_propertyDescriptions;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp

@@ -265 +265 @@
                     /* Update profile in the tree: */
                     UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, data);
+                    loadCloudProfile(comCloudProfile, *pProviderItem, data);
                     updateItemForCloudProfile(data, true, pProfileItem);
 
@@ -333 +333 @@
         {
             /* Create new profile: */
-            QVector<QString> keys;
-            QVector<QString> values;
+            const QVector<QString> keys = pProviderItem->m_propertyDescriptions.keys().toVector();
+            const QVector<QString> values(keys.size());
             comCloudProvider.CreateProfile(strProfileName, keys, values);
 
@@ -351 +351 @@
                     /* Add profile to the tree: */
                     UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, data);
+                    loadCloudProfile(comCloudProfile, *pProviderItem, data);
                     createItemForCloudProfile(pProviderItem, data, true);
-
-                    /* If profile still Ok: */
-                    if (comCloudProfile.isOk())
-                    {
-                        /* Acquire supported property names: */
-                        const QVector<QString> supportedNames = comCloudProvider.GetSupportedPropertyNames();
-                        /* Show error message if necessary: */
-                        if (!comCloudProfile.isOk())
-                            msgCenter().cannotAcquireCloudProfileParameter(comCloudProfile, this);
-                        else
-                        {
-                            /* Add unknown supported properties to known properties list.
-                             * That allows to have at least something if we have nothing. */
-                            foreach (const QString &strSupportedName, supportedNames)
-                                if (!data.m_data.contains(strSupportedName))
-                                    data.m_data[strSupportedName] = qMakePair(QString(), QString());
-                        }
-                    }
 
                     /* If profile still Ok: */
@@ -390 +372 @@
                             /* Update profile in the tree: */
                             UIDataCloudProfile updatedData;
-                            loadCloudProfile(comCloudProfile, updatedData);
+                            loadCloudProfile(comCloudProfile, *pProviderItem, updatedData);
                             updateItemForCloudProfile(updatedData, true, static_cast<UIItemCloudProfile*>(m_pTreeWidget->currentItem()));
                             sltHandleCurrentItemChange();
@@ -778 +760 @@
                 /* Load profile data: */
                 UIDataCloudProfile profileData;
-                loadCloudProfile(comCloudProfile, profileData);
+                loadCloudProfile(comCloudProfile, providerData, profileData);
                 createItemForCloudProfile(pItem, profileData, false);
             }
@@ -794 +776 @@
 void UICloudProfileManagerWidget::loadCloudProvider(const CCloudProvider &comProvider, UIDataCloudProvider &data)
 {
-    Q_UNUSED(comProvider);
-    Q_UNUSED(data);
-
     /* Gather provider settings: */
     if (comProvider.isOk())
@@ -802 +781 @@
     if (comProvider.isOk())
         data.m_strName = comProvider.GetName();
+    foreach (const QString &strSupportedPropertyName, comProvider.GetSupportedPropertyNames())
+        data.m_propertyDescriptions[strSupportedPropertyName] = comProvider.GetPropertyDescription(strSupportedPropertyName);
 
     /* Show error message if necessary: */
@@ -808 +789 @@
 }
 
-void UICloudProfileManagerWidget::loadCloudProfile(const CCloudProfile &comProfile, UIDataCloudProfile &data)
-{
-    Q_UNUSED(comProfile);
-    Q_UNUSED(data);
-
+void UICloudProfileManagerWidget::loadCloudProfile(const CCloudProfile &comProfile, const UIDataCloudProvider &providerData, UIDataCloudProfile &profileData)
+{
     /* Gather profile settings: */
     if (comProfile.isOk())
-        data.m_strName = comProfile.GetName();
+        profileData.m_strName = comProfile.GetName();
 
     if (comProfile.isOk())
@@ -831 +809 @@
         if (comProfile.isOk())
         {
-            /* Acquire descriptions: */
-//          for (int i = 0; i < keys.size(); ++i)
-//          {
-//              descriptions[i] = comProfile.GetPropertyDescription(keys.at(i));
-//              if (!comProfile.isOk())
-//                  continue;
-//          }
-
             /* Enumerate all the keys: */
             for (int i = 0; i < keys.size(); ++i)
-                data.m_data[keys.at(i)] = qMakePair(values.at(i), descriptions.at(i));
+                profileData.m_data[keys.at(i)] = qMakePair(values.at(i), providerData.m_propertyDescriptions.value(keys.at(i)));
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.h

@@ -138 +138 @@
         /** Loads cloud @a comProvider data to passed @a data container. */
         void loadCloudProvider(const CCloudProvider &comProvider, UIDataCloudProvider &data);
-        /** Loads cloud @a comProfile data to passed @a data container. */
-        void loadCloudProfile(const CCloudProfile &comProfile, UIDataCloudProfile &data);
+        /** Loads cloud @a comProfile data to passed @a profileData container, using @a providerData as hint. */
+        void loadCloudProfile(const CCloudProfile &comProfile, const UIDataCloudProvider &providerData, UIDataCloudProfile &profileData);
     /** @} */