Changeset 78823 in vbox for trunk/src

Timestamp:

May 28, 2019 2:36:45 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st page: Integrate CCloudClient::GetImportDescriptionForm function to acquire actual import parameters.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1899 +1899 @@
 }
 
+void UIMessageCenter::cannotCreateAppliance(const CVirtualBox &comVBox, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Critical, tr("<p>Cannot create a virtual appliance.</p>"),
+          UIErrorString::formatErrorInfo(comVBox));
+}
+
+void UIMessageCenter::cannotCreateVirtualSystemDescription(const CAppliance &comAppliance, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Critical, tr("<p>Cannot create a virtual system description.</p>"),
+          UIErrorString::formatErrorInfo(comAppliance));
+}
+
+void UIMessageCenter::cannotAcquireVirtualSystemDescription(const CAppliance &comAppliance, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Critical, tr("<p>Cannot create a virtual system description.</p>"),
+          UIErrorString::formatErrorInfo(comAppliance));
+}
+
+void UIMessageCenter::cannotAcquireCloudInstanceInfo(const CCloudClient &comClient, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Critical, tr("<p>Cannot acquire a cloud instance information.</p>"),
+          UIErrorString::formatErrorInfo(comClient));
+}
+
 void UIMessageCenter::cannotImportAppliance(CAppliance &appliance, QWidget *pParent /* = 0*/) const
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -404 +404 @@
     void cannotRewriteMachineFolder(const QString &strFolderName, QWidget *pParent = 0) const;
     void cannotCreateMachineFolder(const QString &strFolderName, QWidget *pParent = 0) const;
+    void cannotCreateAppliance(const CVirtualBox &comVBox, QWidget *pParent = 0) const;
+    void cannotCreateVirtualSystemDescription(const CAppliance &comAppliance, QWidget *pParent = 0) const;
+    void cannotAcquireVirtualSystemDescription(const CAppliance &comAppliance, QWidget *pParent = 0) const;
+    void cannotAcquireCloudInstanceInfo(const CCloudClient &comClient, QWidget *pParent = 0) const;
     void cannotImportAppliance(CAppliance &appliance, QWidget *pParent = 0) const;
     void cannotImportAppliance(const CProgress &progress, const QString &strPath, QWidget *pParent = 0) const;

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

@@ -39 +39 @@
 
 /* COM includes: */
+#include "CAppliance.h"
 #include "CStringArray.h"
 
@@ -334 +335 @@
     if (!m_comCloudClient.isNull())
     {
-        /* Read Cloud Client description form: */
-        CVirtualSystemDescriptionForm comForm;
-        CProgress comProgress = m_comCloudClient.GetExportLaunchDescriptionForm(comForm);
+        /* Create appliance: */
+        CVirtualBox comVBox = vboxGlobal().virtualBox();
+        CAppliance comAppliance = comVBox.CreateAppliance();
 
         /* Show error message if necessary: */
-        if (!m_comCloudClient.isOk())
-            msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
+        if (!comVBox.isOk())
+            msgCenter().cannotCreateAppliance(comVBox);
         else
         {
-            /* Show "Acquire export form" progress: */
-            msgCenter().showModalProgressDialog(comProgress,
-                                                UIWizardImportApp::tr("Acquire export form..."),
-                                                ":/progress_reading_appliance_90px.png",
-                                                0, 0);
+            /* Create virtual system description: */
+            comAppliance.CreateVirtualSystemDescriptions(1);
 
             /* Show error message if necessary: */
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                msgCenter().cannotAcquireCloudClientParameter(comProgress);
+            if (!comAppliance.isOk())
+                msgCenter().cannotCreateVirtualSystemDescription(comAppliance);
             else
-                m_comVSDForm = comForm;
+            {
+                /* Acquire virtual system description: */
+                QVector<CVirtualSystemDescription> descriptions = comAppliance.GetVirtualSystemDescriptions();
+
+                /* Show error message if necessary: */
+                if (!comAppliance.isOk())
+                    msgCenter().cannotAcquireVirtualSystemDescription(comAppliance);
+                else
+                {
+                    /* Make sure there is at least one virtual system description created: */
+                    AssertReturnVoid(!descriptions.isEmpty());
+                    CVirtualSystemDescription comDescription = descriptions.at(0);
+
+                    /* Load default virtual system description values: */
+                    /// @todo make sure this is a progress returning call
+                    m_comCloudClient.GetInstanceInfo(machineId(), comDescription);
+
+                    /* Show error message if necessary: */
+                    if (!m_comCloudClient.isOk())
+                        msgCenter().cannotAcquireCloudInstanceInfo(m_comCloudClient);
+                    else
+                    {
+                        /* Read Cloud Client description form: */
+                        CVirtualSystemDescriptionForm comForm;
+                        CProgress comProgress = m_comCloudClient.GetImportDescriptionForm(comDescription, 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;
+                        }
+                    }
+                }
+            }
         }
     }