Changeset 78850 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 29, 2019 1:38:42 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st page: Expose appliance щиоусе used for cloud operations as a wizard field to be able to use it on other pages and in import operation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (6 diffs)
• UIWizardImportAppPageBasic1.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -39 +39 @@
 
 /* COM includes: */
-#include "CAppliance.h"
 #include "CStringArray.h"
 
@@ -329 +328 @@
 void UIWizardImportAppPage1::populateFormProperties()
 {
+    /* Clear appliance: */
+    m_comAppliance = CAppliance();
     /* Clear form properties: */
     m_comVSDForm = CVirtualSystemDescriptionForm();
@@ -348 +349 @@
             }
 
+            /* Remember appliance: */
+            m_comAppliance = comAppliance;
+
             /* Read cloud instance info: */
-            CProgress comReadProgress = comAppliance.Read(QString("OCI://%1/%2").arg(profileName(), machineId()));
-            if (!comAppliance.isOk())
-            {
-                msgCenter().cannotImportAppliance(comAppliance);
+            CProgress comReadProgress = m_comAppliance.Read(QString("OCI://%1/%2").arg(profileName(), machineId()));
+            if (!m_comAppliance.isOk())
+            {
+                msgCenter().cannotImportAppliance(m_comAppliance);
                 break;
             }
@@ -361 +365 @@
             if (!comReadProgress.isOk() || comReadProgress.GetResultCode() != 0)
             {
-                msgCenter().cannotImportAppliance(comReadProgress, comAppliance.GetPath());
+                msgCenter().cannotImportAppliance(comReadProgress, m_comAppliance.GetPath());
                 break;
             }
 
             /* Interpret cloud instance info: */
-            comAppliance.Interpret();
-            if (!comAppliance.isOk())
-            {
-                msgCenter().cannotImportAppliance(comAppliance);
+            m_comAppliance.Interpret();
+            if (!m_comAppliance.isOk())
+            {
+                msgCenter().cannotImportAppliance(m_comAppliance);
                 break;
             }
 
             /* Create virtual system description: */
-            comAppliance.CreateVirtualSystemDescriptions(1);
-            if (!comAppliance.isOk())
-            {
-                msgCenter().cannotCreateVirtualSystemDescription(comAppliance);
+            m_comAppliance.CreateVirtualSystemDescriptions(1);
+            if (!m_comAppliance.isOk())
+            {
+                msgCenter().cannotCreateVirtualSystemDescription(m_comAppliance);
                 break;
             }
 
             /* Acquire virtual system description: */
-            QVector<CVirtualSystemDescription> descriptions = comAppliance.GetVirtualSystemDescriptions();
-            if (!comAppliance.isOk())
-            {
-                msgCenter().cannotAcquireVirtualSystemDescription(comAppliance);
+            QVector<CVirtualSystemDescription> descriptions = m_comAppliance.GetVirtualSystemDescriptions();
+            if (!m_comAppliance.isOk())
+            {
+                msgCenter().cannotAcquireVirtualSystemDescription(m_comAppliance);
                 break;
             }
@@ -522 +526 @@
 {
     return m_comCloudProfile;
+}
+
+CAppliance UIWizardImportAppPage1::appliance() const
+{
+    return m_comAppliance;
 }
 
@@ -772 +781 @@
     registerField("isSourceCloudOne", this, "isSourceCloudOne");
     registerField("profile", this, "profile");
+    registerField("appliance", this, "appliance");
     registerField("vsdForm", this, "vsdForm");
     registerField("machineId", this, "machineId");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -28 +28 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CAppliance.h"
 #include "CCloudClient.h"
 #include "CCloudProfile.h"
@@ -103 +104 @@
     /** Returns Cloud Profile object. */
     CCloudProfile profile() const;
+    /** Returns Appliance object. */
+    CAppliance appliance() const;
     /** Returns Virtual System Description Form object. */
     CVirtualSystemDescriptionForm vsdForm() const;
@@ -117 +120 @@
     /** Holds the Cloud Client object reference. */
     CCloudClient                   m_comCloudClient;
+    /** Holds the Appliance object reference. */
+    CAppliance                     m_comAppliance;
     /** Holds the Virtual System Description Form object reference. */
     CVirtualSystemDescriptionForm  m_comVSDForm;
@@ -160 +165 @@
     Q_PROPERTY(bool isSourceCloudOne READ isSourceCloudOne);
     Q_PROPERTY(CCloudProfile profile READ profile);
+    Q_PROPERTY(CAppliance appliance READ appliance);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdForm READ vsdForm);
     Q_PROPERTY(QString machineId READ machineId);