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

Timestamp:

Jul 6, 2019 11:41:55 AM (6 years ago)

Author:

vboxsync

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

131856

Message:

FE/Qt: bugref:9484: Export Appliance wizard: 2nd basic and Expert pages: Extending with cloud client 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

@@ -42 +42 @@
 
 /* COM includes: */
-#include "CCloudClient.h"
 #include "CMachine.h"
 
@@ -294 +293 @@
     /* Clear appliance: */
     m_comAppliance = CAppliance();
+    /* Clear cloud client: */
+    m_comClient = CCloudClient();
     /* Clear description: */
     m_comVSD = CVirtualSystemDescription();
@@ -342 +343 @@
 
             /* Create Cloud Client: */
-            CCloudClient comCloudClient = m_comCloudProfile.CreateCloudClient();
+            CCloudClient comClient = m_comCloudProfile.CreateCloudClient();
             if (!m_comCloudProfile.isOk())
             {
@@ -349 +350 @@
             }
 
+            /* Remember client: */
+            m_comClient = comClient;
+
             /* Read Cloud Client Export description form: */
             CVirtualSystemDescriptionForm comExportForm;
-            CProgress comExportDescriptionFormProgress = comCloudClient.GetExportLaunchDescriptionForm(m_comVSD, comExportForm);
-            if (!comCloudClient.isOk())
+            CProgress comExportDescriptionFormProgress = m_comClient.GetExportLaunchDescriptionForm(m_comVSD, comExportForm);
+            if (!m_comClient.isOk())
             {
-                msgCenter().cannotAcquireCloudClientParameter(comCloudClient);
+                msgCenter().cannotAcquireCloudClientParameter(m_comClient);
                 break;
             }
@@ -615 +619 @@
 {
     return m_comAppliance;
+}
+
+CCloudClient UIWizardExportAppPage2::client() const
+{
+    return m_comClient;
 }
 
@@ -949 +958 @@
     registerField("providerShortName", this, "providerShortName");
     registerField("appliance", this, "appliance");
+    registerField("client", this, "client");
     registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
@@ -1117 +1127 @@
         /* Which are required to continue to the next page: */
         fResult =    field("appliance").value<CAppliance>().isNotNull()
+                  && field("client").value<CCloudClient>().isNotNull()
                   && field("vsd").value<CVirtualSystemDescription>().isNotNull()
                   && field("vsdExportForm").value<CVirtualSystemDescriptionForm>().isNotNull();

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

@@ -32 +32 @@
 #include "COMEnums.h"
 #include "CAppliance.h"
+#include "CCloudClient.h"
 #include "CCloudProfile.h"
 #include "CCloudProvider.h"
@@ -157 +158 @@
     /** Returns Appliance object. */
     CAppliance appliance() const;
+    /** Returns Cloud Client object. */
+    CCloudClient client() const;
     /** Returns Virtual System Description object. */
     CVirtualSystemDescription vsd() const;
@@ -173 +176 @@
     /** Holds the Appliance object reference. */
     CAppliance                     m_comAppliance;
+    /** Holds the Cloud Client object reference. */
+    CCloudClient                   m_comClient;
     /** Holds the Virtual System Description object reference. */
     CVirtualSystemDescription      m_comVSD;
@@ -250 +255 @@
     Q_PROPERTY(QString providerShortName READ providerShortName);
     Q_PROPERTY(CAppliance appliance READ appliance);
+    Q_PROPERTY(CCloudClient client READ client);
     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("client", this, "client");
     registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
@@ -565 +566 @@
                       && UICommon::hasAllowedExtension(path().toLower(), OVFFileExts))
                   || (   fCSP
-                      && m_comCloudProfile.isNotNull()
-                      && m_comAppliance.isNotNull()
-                      && m_comVSD.isNotNull()
-                      && m_comVSDExportForm.isNotNull());
+                      && field("appliance").value<CAppliance>().isNotNull()
+                      && field("client").value<CCloudClient>().isNotNull()
+                      && field("vsd").value<CVirtualSystemDescription>().isNotNull()
+                      && field("vsdExportForm").value<CVirtualSystemDescriptionForm>().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(CCloudClient client READ client);
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);