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

Timestamp:

Mar 5, 2020 5:53:37 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Rework UITaskCloudAcquireInstances to provide interested parties with error-information.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICloudNetworkingStuff.cpp (modified) (4 diffs)
• globals/UICloudNetworkingStuff.h (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/UITaskCloudAcquireInstances.cpp (modified) (2 diffs)
• manager/UITaskCloudAcquireInstances.h (modified) (3 diffs)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (1 diff)

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

@@ -19 +19 @@
 #include "UICloudNetworkingStuff.h"
 #include "UICommon.h"
+#include "UIErrorString.h"
 #include "UIMessageCenter.h"
 
@@ -30 +31 @@
 
 QList<UICloudMachine> UICloudNetworkingStuff::listInstances(const CCloudClient &comCloudClient,
+                                                            QString &strErrorMessage,
                                                             QWidget *pParent /* = 0 */)
 {
@@ -47 +49 @@
             msgCenter().cannotAcquireCloudClientParameter(comCloudClient, pParent);
         else
-        {
-            /// @todo fetch error info
-        }
+            strErrorMessage = UIErrorString::formatErrorInfo(comCloudClient);
     }
     else
@@ -65 +65 @@
                 msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
             else
-            {
-                /// @todo fetch error info
-            }
+                strErrorMessage = UIErrorString::formatErrorInfo(comProgress);
         }
         else

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

@@ -38 +38 @@
       *                         if no parent set, progress will be executed in blocking way. */
     SHARED_LIBRARY_STUFF QList<UICloudMachine> listInstances(const CCloudClient &comCloudClient,
+                                                             QString &strErrorMessage,
                                                              QWidget *pParent = 0);
 

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

@@ -601 +601 @@
     error(pParent, MessageType_Error,
           tr("Failed to acquire machine parameter."), UIErrorString::formatErrorInfo(comMachine));
+}
+
+void UIMessageCenter::cannotAcquireCloudInstanceList(const QString &strErrorDetails, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to acquire cloud intance list."), strErrorDetails);
 }
 

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

@@ -264 +264 @@
     void warnAboutInvalidEncryptionPassword(const QString &strPasswordId, QWidget *pParent = 0);
     void cannotAcquireMachineParameter(const CMachine &comMachine, QWidget *pParent = 0) const;
+
+    /* API: Global cloud warnings: */
+    void cannotAcquireCloudInstanceList(const QString &strErrorDetails, QWidget *pParent = 0) const;
 
     /* API: Selector warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.cpp

@@ -36 +36 @@
 }
 
-CVirtualBoxErrorInfo UITaskCloudAcquireInstances::errorInfo()
+QString UITaskCloudAcquireInstances::errorInfo()
 {
     m_mutex.lock();
-    CVirtualBoxErrorInfo comErrorInfo = m_comErrorInfo;
+    QString strErrorInfo = m_strErrorInfo;
     m_mutex.unlock();
-    return comErrorInfo;
+    return strErrorInfo;
 }
 
@@ -47 +47 @@
 {
     m_mutex.lock();
-    m_result = listInstances(m_comCloudClient);
+    m_result = listInstances(m_comCloudClient, m_strErrorInfo);
     m_mutex.unlock();
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.h

@@ -32 +32 @@
 #include "COMEnums.h"
 #include "CCloudClient.h"
-#include "CVirtualBoxErrorInfo.h"
 
 /* Forward declaratiuons: */
@@ -55 +54 @@
 
     /** Returns error info. */
-    CVirtualBoxErrorInfo errorInfo();
+    QString errorInfo();
 
     /** Returns the task result. */
@@ -75 +74 @@
     UIChooserNode *m_pParentNode;
 
-    /** Holds the error info object. */
-    CVirtualBoxErrorInfo  m_comErrorInfo;
+    /** Holds the error info. */
+    QString  m_strErrorInfo;
 
     /** Holds the task result. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -275 +275 @@
     /* Cast task to corresponding sub-class: */
     UITaskCloudAcquireInstances *pAcquiringTask = static_cast<UITaskCloudAcquireInstances*>(pTask);
+
+    /* Check whether there was an error: */
+    if (!pAcquiringTask->errorInfo().isNull())
+        return msgCenter().cannotAcquireCloudInstanceList(pAcquiringTask->errorInfo());
 
     /* Acquire parent node we referencing: */