Changeset 79542 in vbox for trunk/src/VBox

Timestamp:

Jul 5, 2019 7:41:33 AM (6 years ago)

Author:

vboxsync

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

131827

Message:

FE/Qt: bugref:9484: A bit of refactoring preparing Export wizard to 2 phase'd export, s.a. bugref:9489.

Location:

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

Files:

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

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

@@ -299 +299 @@
     m_comAppliance = CAppliance();
     /* Clear form properties: */
-    m_comVSDForm = CVirtualSystemDescriptionForm();
+    m_comVSDExportForm = CVirtualSystemDescriptionForm();
 
     /* If profile chosen: */
@@ -348 +348 @@
             }
 
-            /* Read Cloud Client description form: */
-            CVirtualSystemDescriptionForm comForm;
-            CProgress comExportDescriptionFormProgress = comCloudClient.GetExportLaunchDescriptionForm(comVSD, comForm);
+            /* Read Cloud Client Export description form: */
+            CVirtualSystemDescriptionForm comExportForm;
+            CProgress comExportDescriptionFormProgress = comCloudClient.GetExportDescriptionForm(comVSD, comExportForm);
             if (!comCloudClient.isOk())
             {
@@ -367 +367 @@
 
             /* Remember form: */
-            m_comVSDForm = comForm;
+            m_comVSDExportForm = comExportForm;
         }
         while (0);
@@ -616 +616 @@
 }
 
-CVirtualSystemDescriptionForm UIWizardExportAppPage2::vsdForm() const
-{
-    return m_comVSDForm;
+CVirtualSystemDescriptionForm UIWizardExportAppPage2::vsdExportForm() const
+{
+    return m_comVSDExportForm;
 }
 
@@ -908 +908 @@
     registerField("providerShortName", this, "providerShortName");
     registerField("appliance", this, "appliance");
-    registerField("vsdForm", this, "vsdForm");
+    registerField("vsdExportForm", this, "vsdExportForm");
 }
 
@@ -1065 +1065 @@
         /* Which are required to continue to the next page: */
         fResult =    field("appliance").value<CAppliance>().isNotNull()
-                  && field("vsdForm").value<CVirtualSystemDescriptionForm>().isNotNull();
+                  && field("vsdExportForm").value<CVirtualSystemDescriptionForm>().isNotNull();
     }
 

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

@@ -155 +155 @@
     /** Returns Appliance object. */
     CAppliance appliance() const;
-    /** Returns Virtual System Description Form object. */
-    CVirtualSystemDescriptionForm vsdForm() const;
+    /** Returns Virtual System Description Export Form object. */
+    CVirtualSystemDescriptionForm vsdExportForm() const;
 
     /** Holds whether default format should be Export to OCI. */
@@ -169 +169 @@
     /** Holds the Appliance object reference. */
     CAppliance                     m_comAppliance;
-    /** Holds the Virtual System Description Form object reference. */
-    CVirtualSystemDescriptionForm  m_comVSDForm;
+    /** Holds the Virtual System Description Export Form object reference. */
+    CVirtualSystemDescriptionForm  m_comVSDExportForm;
 
     /** Holds the default appliance name. */
@@ -235 +235 @@
     Q_PROPERTY(QString providerShortName READ providerShortName);
     Q_PROPERTY(CAppliance appliance READ appliance);
-    Q_PROPERTY(CVirtualSystemDescriptionForm vsdForm READ vsdForm);
+    Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
 
 public:

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

@@ -92 +92 @@
 {
     /* Acquire VSD form: */
-    CVirtualSystemDescriptionForm comForm = fieldImp("vsdForm").value<CVirtualSystemDescriptionForm>();
+    CVirtualSystemDescriptionForm comForm = fieldImp("vsdExportForm").value<CVirtualSystemDescriptionForm>();
     /* Make sure the properties table get the new description form: */
     if (comForm.isNotNull())
@@ -216 +216 @@
     {
         /* Check whether we have proper VSD form: */
-        CVirtualSystemDescriptionForm comForm = fieldImp("vsdForm").value<CVirtualSystemDescriptionForm>();
+        CVirtualSystemDescriptionForm comForm = fieldImp("vsdExportForm").value<CVirtualSystemDescriptionForm>();
         fResult = comForm.isNotNull();
         Assert(fResult);

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

@@ -428 +428 @@
     registerField("providerShortName", this, "providerShortName");
     registerField("appliance", this, "appliance");
-    registerField("vsdForm", this, "vsdForm");
+    registerField("vsdExportForm", this, "vsdExportForm");
     registerField("applianceWidget", this, "applianceWidget");
 }
@@ -580 +580 @@
                       && m_comCloudProfile.isNotNull()
                       && m_comAppliance.isNotNull()
-                      && m_comVSDForm.isNotNull());
+                      && m_comVSDExportForm.isNotNull());
     }
 
@@ -599 +599 @@
     {
         /* Check whether we have proper VSD form: */
-        CVirtualSystemDescriptionForm comForm = fieldImp("vsdForm").value<CVirtualSystemDescriptionForm>();
+        CVirtualSystemDescriptionForm comForm = fieldImp("vsdExportForm").value<CVirtualSystemDescriptionForm>();
         fResult = comForm.isNotNull();
         Assert(fResult);

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

@@ -47 +47 @@
     Q_PROPERTY(QString providerShortName READ providerShortName);
     Q_PROPERTY(CAppliance appliance READ appliance);
-    Q_PROPERTY(CVirtualSystemDescriptionForm vsdForm READ vsdForm);
+    Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);