Changeset 78273 in vbox for trunk/src/VBox

Timestamp:

Apr 24, 2019 2:34:22 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st basic page: Move form properties acquiring code to separate method, to be reused from the expert wizard page.

Location:

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

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (2 diffs)
• UIWizardImportAppPageBasic1.h (modified) (1 diff)

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

@@ -326 +326 @@
 }
 
+void UIWizardImportAppPage1::populateFormProperties()
+{
+    /* Clear form properties: */
+    m_comVSDForm = CVirtualSystemDescriptionForm();
+
+    /* If client created: */
+    if (!m_comCloudClient.isNull())
+    {
+        /* Read Cloud Client description form: */
+        CVirtualSystemDescriptionForm comForm;
+        CProgress comProgress = m_comCloudClient.GetExportLaunchDescriptionForm(comForm);
+
+        /* Show error message if necessary: */
+        if (!m_comCloudClient.isOk())
+            msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
+        else
+        {
+            /* Show "Acquire export form" progress: */
+            msgCenter().showModalProgressDialog(comProgress,
+                                                UIWizardImportApp::tr("Acquire export form..."),
+                                                ":/progress_reading_appliance_90px.png",
+                                                0, 0);
+
+            /* Show error message if necessary: */
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+                msgCenter().cannotAcquireCloudClientParameter(comProgress);
+            else
+                m_comVSDForm = comForm;
+        }
+    }
+}
+
 void UIWizardImportAppPage1::updatePageAppearance()
 {
@@ -774 +806 @@
     if (isSourceCloudOne())
     {
-        /* Read Cloud Client description form: */
-        CVirtualSystemDescriptionForm comForm;
-        CProgress comProgress = m_comCloudClient.GetExportLaunchDescriptionForm(comForm);
-
-        /* Show error message if necessary: */
-        if (!m_comCloudClient.isOk())
-        {
-            msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
-            return false;
-        }
-        else
-        {
-            /* Show "Acquire export form" progress: */
-            msgCenter().showModalProgressDialog(comProgress,
-                                                UIWizardImportApp::tr("Acquire export form..."),
-                                                ":/progress_reading_appliance_90px.png",
-                                                0, 0);
-
-            /* Show error message if necessary: */
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
-                return false;
-            }
-            else
-                m_comVSDForm = comForm;
-        }
-        return true;
+        /* Populate form properties: */
+        populateFormProperties();
+        /* And make sure they are not null: */
+        return m_comVSDForm.isNotNull();
     }
     else

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

@@ -75 +75 @@
     /** Populates account instances. */
     void populateAccountInstances();
+    /** Populates form properties. */
+    void populateFormProperties();
 
     /** Updates page appearance. */