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

Timestamp:

Apr 11, 2019 4:03:18 PM (6 years ago)

Author:

vboxsync

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

129980

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st basic page: Pass cloud client through as wizard field, it will be used on 2nd page.

Location:

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

Files:

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

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

@@ -37 +37 @@
 #include "UIWizardImportAppPageBasic1.h"
 #include "UIWizardImportAppPageBasic2.h"
-
-/* COM includes: */
-#include "CCloudClient.h"
 
 
@@ -268 +265 @@
     /* Clear list initially: */
     m_pAccountInstanceList->clear();
+    /* Clear Cloud Client: */
+    m_comCloudClient = CCloudClient();
 
     /* If profile chosen: */
     if (!m_comCloudProfile.isNull())
     {
-        /* Create Cloud Client: */
-        CCloudClient comCloudClient = m_comCloudProfile.CreateCloudClient();
+        /* Acquire Cloud Client: */
+        m_comCloudClient = m_comCloudProfile.CreateCloudClient();
         /* Show error message if necessary: */
         if (!m_comCloudProfile.isOk())
@@ -282 +281 @@
             QVector<QString> vmNames;
             /*const QVector<QString> vmIDs =*/
-            comCloudClient.ListInstances(KCloudMachineState_Running, vmNames);
+            m_comCloudClient.ListInstances(KCloudMachineState_Running, vmNames);
             /* Show error message if necessary: */
-            if (!comCloudClient.isOk())
-                msgCenter().cannotAcquireCloudClientParameter(comCloudClient);
+            if (!m_comCloudClient.isOk())
+                msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
             else
             {
@@ -385 +384 @@
 {
     return m_comCloudProfile;
+}
+
+CCloudClient UIWizardImportAppPage1::client() const
+{
+    return m_comCloudClient;
 }
 
@@ -615 +619 @@
     registerField("isSourceCloudOne", this, "isSourceCloudOne");
     registerField("profile", this, "profile");
+    registerField("client", this, "client");
 }
 
@@ -709 +714 @@
                       && QFile::exists(m_pFileSelector->path()))
                   || (   fCSP
-                      && !m_comCloudProfile.isNull());
+                      && !m_comCloudProfile.isNull()
+                      && !m_comCloudClient.isNull());
     }
 
@@ -753 +759 @@
     populateAccountProperties();
     populateAccountInstances();
+    emit completeChanged();
 }
 

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

@@ -28 +28 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CCloudClient.h"
 #include "CCloudProfile.h"
 #include "CCloudProvider.h"
@@ -97 +98 @@
     /** Returns Cloud Profile object. */
     CCloudProfile profile() const;
+    /** Returns Cloud Client object. */
+    CCloudClient client() const;
 
     /** Holds whether default source should be Import from OCI. */
@@ -107 +110 @@
     /** Holds the Cloud Profile object reference. */
     CCloudProfile          m_comCloudProfile;
+    /** Holds the Cloud Client object reference. */
+    CCloudClient           m_comCloudClient;
 
     /** Holds the source layout instance. */
@@ -144 +149 @@
     Q_PROPERTY(bool isSourceCloudOne READ isSourceCloudOne);
     Q_PROPERTY(CCloudProfile profile READ profile);
+    Q_PROPERTY(CCloudClient client READ client);
 
 public: