Changeset 79565 in vbox

Timestamp:

Jul 6, 2019 11:25:16 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9484: Export Appliance wizard: 2nd basic and Expert pages: Extending with VSD field for 2 phase'd export, s.a. bugref:9489.

Location:

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

Files:

• UIWizardExportAppPageBasic2.cpp (modified) (7 diffs)
• UIWizardExportAppPageBasic2.h (modified) (4 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (2 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

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

@@ -294 +294 @@
     /* Clear appliance: */
     m_comAppliance = CAppliance();
-    /* Clear form properties: */
+    /* Clear description: */
+    m_comVSD = CVirtualSystemDescription();
+    /* Clear description form: */
     m_comVSDExportForm = CVirtualSystemDescriptionForm();
 
@@ -336 +338 @@
             }
 
+            /* Remember description: */
+            m_comVSD = comVSD;
+
             /* Create Cloud Client: */
             CCloudClient comCloudClient = m_comCloudProfile.CreateCloudClient();
@@ -346 +351 @@
             /* Read Cloud Client Export description form: */
             CVirtualSystemDescriptionForm comExportForm;
-            CProgress comExportDescriptionFormProgress = comCloudClient.GetExportLaunchDescriptionForm(comVSD, comExportForm);
+            CProgress comExportDescriptionFormProgress = comCloudClient.GetExportLaunchDescriptionForm(m_comVSD, comExportForm);
             if (!comCloudClient.isOk())
             {
@@ -362 +367 @@
             }
 
-            /* Remember form: */
+            /* Remember description form: */
             m_comVSDExportForm = comExportForm;
         }
@@ -610 +615 @@
 {
     return m_comAppliance;
+}
+
+CVirtualSystemDescription UIWizardExportAppPage2::vsd() const
+{
+    return m_comVSD;
 }
 
@@ -939 +949 @@
     registerField("providerShortName", this, "providerShortName");
     registerField("appliance", this, "appliance");
+    registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
 }
@@ -1106 +1117 @@
         /* Which are required to continue to the next page: */
         fResult =    field("appliance").value<CAppliance>().isNotNull()
+                  && field("vsd").value<CVirtualSystemDescription>().isNotNull()
                   && field("vsdExportForm").value<CVirtualSystemDescriptionForm>().isNotNull();
     }

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

@@ -35 +35 @@
 #include "CCloudProvider.h"
 #include "CCloudProviderManager.h"
+#include "CVirtualSystemDescription.h"
 #include "CVirtualSystemDescriptionForm.h"
 
@@ -156 +157 @@
     /** Returns Appliance object. */
     CAppliance appliance() const;
+    /** Returns Virtual System Description object. */
+    CVirtualSystemDescription vsd() const;
     /** Returns Virtual System Description Export Form object. */
     CVirtualSystemDescriptionForm vsdExportForm() const;
@@ -170 +173 @@
     /** Holds the Appliance object reference. */
     CAppliance                     m_comAppliance;
+    /** Holds the Virtual System Description object reference. */
+    CVirtualSystemDescription      m_comVSD;
     /** Holds the Virtual System Description Export Form object reference. */
     CVirtualSystemDescriptionForm  m_comVSDExportForm;
@@ -245 +250 @@
     Q_PROPERTY(QString providerShortName READ providerShortName);
     Q_PROPERTY(CAppliance appliance READ appliance);
+    Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
 

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

@@ -423 +423 @@
     registerField("providerShortName", this, "providerShortName");
     registerField("appliance", this, "appliance");
+    registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
     registerField("applianceWidget", this, "applianceWidget");
@@ -566 +567 @@
                       && m_comCloudProfile.isNotNull()
                       && m_comAppliance.isNotNull()
+                      && m_comVSD.isNotNull()
                       && m_comVSDExportForm.isNotNull());
     }

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(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);