Changeset 75371 in vbox

Timestamp:

Nov 9, 2018 5:13:31 PM (6 years ago)

Author:

vboxsync

Message:

bugref:9152. getSupportedPropertyNames and getPropertyDescription were moved from CloudProfile to CloudProvider.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (5 diffs)

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

@@ -358 +358 @@
                     {
                         /* Acquire supported property names: */
-                        const QVector<QString> supportedNames = comCloudProfile.GetSupportedPropertyNames();
+                        const QVector<QString> supportedNames = comCloudProvider.GetSupportedPropertyNames();
                         /* Show error message if necessary: */
                         if (!comCloudProfile.isOk())
@@ -832 +832 @@
         {
             /* Acquire descriptions: */
-            for (int i = 0; i < keys.size(); ++i)
-            {
-                descriptions[i] = comProfile.GetPropertyDescription(keys.at(i));
-                if (!comProfile.isOk())
-                    continue;
-            }
+//          for (int i = 0; i < keys.size(); ++i)
+//          {
+//              descriptions[i] = comProfile.GetPropertyDescription(keys.at(i));
+//              if (!comProfile.isOk())
+//                  continue;
+//          }
 
             /* Enumerate all the keys: */

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

@@ -255 +255 @@
 
                         /* Use non-translated description as tool-tip: */
-                        const QString strToolTip = m_comCloudProfile.GetPropertyDescription(keys.at(i));
+                        const QString strToolTip = m_comCloudProvider.GetPropertyDescription(keys.at(i));
                         /* Show error message if necessary: */
                         if (!m_comCloudProfile.isOk())

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -25320 +25320 @@
   <interface
     name="ICloudProfile" extends="$unknown"
-    uuid="011d1e9a-a48b-4d15-91a0-6101b087155c"
+    uuid="5f2ba3a2-f899-4261-877f-08b7bc52c15a"
     wsmap="managed" reservedMethods="4" reservedAttributes="4"
     >
@@ -25333 +25333 @@
       <desc>
         Returns provider identifier tied with this profile.
-      </desc>
-    </attribute>
-
-    <attribute name="supportedPropertyNames" type="wstring" safearray="yes" readonly="yes">
-      <desc>
-        Returns the supported property names.
       </desc>
     </attribute>
@@ -25433 +25427 @@
     </method>
 
-    <!--- @todo r=klaus Is this the best placement of this method? To me it's
-         not obvious that it processes the object's state at all, and could be
-         moved up to ICloudProvider unless there's any chance that the
-         description changes with the profile. -->
-    <method name="getPropertyDescription" const="yes">
-      <param name="name" type="wstring" dir="in">
-        <desc>Property name.</desc>
-      </param>
-      <param name="description" type="wstring" dir="return">
-        <desc>Property description.</desc>
-      </param>
-    </method>
-
     <method name="remove">
       <desc>
@@ -25472 +25453 @@
   <interface
     name="ICloudProvider" extends="$unknown"
-    uuid="6e500583-602c-49bc-894d-2f53b8e371e9"
+    uuid="8154fa84-35d7-4a9b-86b4-cb2635b0d9f5"
     wsmap="managed" reservedMethods="4" reservedAttributes="4"
     >
@@ -25502 +25483 @@
       <desc>Returns all profile names for this cloud provider.</desc>
     </attribute>
+
+    <attribute name="supportedPropertyNames" type="wstring" safearray="yes" readonly="yes">
+      <desc>
+        Returns the supported property names.
+      </desc>
+    </attribute>
+
+    <method name="getPropertyDescription" const="yes">
+      <param name="name" type="wstring" dir="in">
+        <desc>Property name.</desc>
+      </param>
+      <param name="description" type="wstring" dir="return">
+        <desc>Property description.</desc>
+      </param>
+    </method>
 
     <method name="createProfile">