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

Timestamp:

May 29, 2019 1:32:08 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st page: Make sure GetInstanceInfo progress is used, which is possible since r130942.

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) (1 diff)

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

@@ -1917 +1917 @@
 }
 
-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

@@ -407 +407 @@
     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

@@ -369 +369 @@
 
             /* Populate virtual system description with default values: */
-            /// @todo make sure this is a progress returning call
-            m_comCloudClient.GetInstanceInfo(machineId(), comDescription);
+            CProgress comInstanceInfoProgress = m_comCloudClient.GetInstanceInfo(machineId(), comDescription);
             if (!m_comCloudClient.isOk())
             {
-                msgCenter().cannotAcquireCloudInstanceInfo(m_comCloudClient);
+                msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
+                break;
+            }
+
+            /* Show "Acquire intance info" progress: */
+            msgCenter().showModalProgressDialog(comInstanceInfoProgress, UIWizardImportApp::tr("Acquire intance info..."),
+                                                ":/progress_reading_appliance_90px.png", 0, 0);
+            if (!comInstanceInfoProgress.isOk() || comInstanceInfoProgress.GetResultCode() != 0)
+            {
+                msgCenter().cannotAcquireCloudClientParameter(comInstanceInfoProgress);
                 break;
             }