Changeset 78166 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2019 2:46:26 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st basic page: Use progress-aware ListInstances API available after r130056; Use proper error-messages as well.

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) (5 diffs)

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

@@ -1660 +1660 @@
 }
 
+void UIMessageCenter::cannotAcquireCloudClientParameter(const CProgress &comProgress, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to acquire cloud client parameter."),
+          UIErrorString::formatErrorInfo(comProgress));
+}
+
 bool UIMessageCenter::confirmCloudProfileRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
 {

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

@@ -373 +373 @@
     void cannotCreateCloudClient(const CCloudProfile &comProfile, QWidget *pParent = 0) const;
     void cannotAcquireCloudClientParameter(const CCloudClient &comClient, QWidget *pParent = 0) const;
+    void cannotAcquireCloudClientParameter(const CProgress &comProgress, QWidget *pParent = 0) const;
     bool confirmCloudProfileRemoval(const QString &strName, QWidget *pParent = 0) const;
     bool confirmCloudProfilesImport(QWidget *pParent = 0) const;

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

@@ -37 +37 @@
 #include "UIWizardImportAppPageBasic1.h"
 #include "UIWizardImportAppPageBasic2.h"
+
+/* COM includes: */
+#include "CStringArray.h"
 
 
@@ -278 +281 @@
         else
         {
-#if 0
-            /* Read Cloud Client instances: */
-            QVector<QString> vmNames;
-            /*const QVector<QString> vmIDs =*/
-            m_comCloudClient.ListInstances(KCloudMachineState_Running, vmNames);
+            /* Read Cloud Client VM instances: */
+            CStringArray comNames;
+            CStringArray comIDs;
+            CProgress comProgress = m_comCloudClient.ListInstances(KCloudMachineState_Running, comNames, comIDs);
+
             /* Show error message if necessary: */
             if (!m_comCloudClient.isOk())
@@ -288 +291 @@
             else
             {
-                /* Push acquired names to list rows: */
-                for (int i = 0; i < vmNames.size(); ++i)
+                /* Show "Acquire cloud instances" progress: */
+                msgCenter().showModalProgressDialog(comProgress,
+                                                    UIWizardImportApp::tr("Acquire cloud instances..."),
+                                                    ":/progress_reading_appliance_90px.png");
+
+                /* Show error message if necessary: */
+                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+                    msgCenter().cannotAcquireCloudClientParameter(comProgress);
+                else
                 {
-                    /* Create list item: */
-                    QListWidgetItem *pItem = new QListWidgetItem(vmNames.at(i), m_pAccountInstanceList);
-                    if (pItem)
+                    /* Push acquired names to list rows: */
+                    foreach (const QString &strName, comNames.GetValues())
                     {
-                        /* Make item non-editable: */
-                        pItem->setFlags(pItem->flags() & ~Qt::ItemIsEditable);
+                        /* Create list item: */
+                        QListWidgetItem *pItem = new QListWidgetItem(strName, m_pAccountInstanceList);
+                        if (pItem)
+                        {
+                            /* Make item non-editable: */
+                            pItem->setFlags(pItem->flags() & ~Qt::ItemIsEditable);
+                        }
                     }
                 }
             }
-#else  // XXX: uwe
-            msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
-#endif
         }
     }
@@ -729 +740 @@
     if (isSourceCloudOne())
     {
+        /* Read Cloud Client description form: */
         CVirtualSystemDescriptionForm comForm;
         CProgress comProgress = m_comCloudClient.GetExportLaunchDescriptionForm(comForm);
+
         /* Show error message if necessary: */
         if (!m_comCloudClient.isOk())
         {
-            /// @todo add real error message
-            //msgCenter().cannotAcquireExportLaunchDescriptionForm(comCloudClient, this);
+            msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
             return false;
         }
@@ -741 +753 @@
         {
             /* Show "Acquire export form" progress: */
-            msgCenter().showModalProgressDialog(comProgress, UIWizardImportApp::tr("Acquire export form..."),
-                                                ":/progress_media_move_90px.png", this);
+            msgCenter().showModalProgressDialog(comProgress,
+                                                UIWizardImportApp::tr("Acquire export form..."),
+                                                ":/progress_reading_appliance_90px.png");
 
             /* Show error message if necessary: */
             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
             {
-                /// @todo add real error message
-                //msgCenter().cannotAcquireExportLaunchDescriptionForm(comProgress, this);
+                msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
                 return false;
             }