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

Timestamp:

Apr 30, 2020 10:38:09 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137687

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Details pane: Handle errors while acquiring settings form for details editing tasks.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• manager/UITaskCloudGetSettingsForm.cpp (modified) (3 diffs)
• manager/UITaskCloudGetSettingsForm.h (modified) (2 diffs)
• manager/details/UIDetailsElement.cpp (modified) (1 diff)

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

@@ -610 +610 @@
     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);
 }
 
@@ -1893 +1887 @@
 }
 
+void UIMessageCenter::cannotAcquireCloudMachineParameter(const QString &strErrorDetails, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to acquire cloud machine parameter."),
+          strErrorDetails);
+}
+
 bool UIMessageCenter::confirmCloudProfileRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
 {

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

@@ -265 +265 @@
     void cannotAcquireVirtualBoxParameter(const CVirtualBox &comVBox, QWidget *pParent = 0) const;
     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: */
@@ -403 +400 @@
     void cannotAcquireCloudMachineParameter(const CCloudMachine &comMachine, QWidget *pParent = 0) const;
     void cannotAcquireCloudMachineParameter(const CProgress &comProgress, QWidget *pParent = 0) const;
+    void cannotAcquireCloudMachineParameter(const QString &strErrorDetails, 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/manager/UITaskCloudGetSettingsForm.cpp

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QWidget>
+
 /* GUI includes: */
 #include "UICommon.h"
 #include "UICloudNetworkingStuff.h"
+#include "UIMessageCenter.h"
 #include "UITaskCloudGetSettingsForm.h"
 #include "UIThreadPool.h"
@@ -61 +65 @@
 *********************************************************************************************************************************/
 
-UIReceiverCloudGetSettingsForm::UIReceiverCloudGetSettingsForm(QObject *pParent)
+UIReceiverCloudGetSettingsForm::UIReceiverCloudGetSettingsForm(QWidget *pParent)
     : QObject(pParent)
+    , m_pParent(pParent)
 {
     /* Connect receiver: */
@@ -79 +84 @@
 
     /* Redirect to another listeners: */
-    emit sigTaskComplete(pSettingsTask->result());
+    if (pSettingsTask->errorInfo().isNull())
+        emit sigTaskComplete(pSettingsTask->result());
+    else
+    {
+        msgCenter().cannotAcquireCloudMachineParameter(pSettingsTask->errorInfo(), m_pParent);
+        emit sigTaskFailed(pSettingsTask->errorInfo());
+    }
 }

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

@@ -83 +83 @@
     /** Notifies about task is complete with certain comResult. */
     void sigTaskComplete(const CForm &comResult);
+    /** Notifies about task is failed with certain strErrorMessage. */
+    void sigTaskFailed(const QString &strErrorMessage);
 
 public:
 
     /** Constructs receiver passing @a pParent to the base-class. */
-    UIReceiverCloudGetSettingsForm(QObject *pParent);
+    UIReceiverCloudGetSettingsForm(QWidget *pParent);
 
 public slots:
@@ -93 +95 @@
     /** Handles thread-pool signal about @a pTask is complete. */
     void sltHandleTaskComplete(UITask *pTask);
+
+private:
+
+    /** Holds the parent widget reference. */
+    QWidget *m_pParent;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -991 +991 @@
                     UIReceiverCloudGetSettingsForm *pReceiver = new UIReceiverCloudGetSettingsForm(pEditor);
                     if (pReceiver)
+                    {
                         connect(pReceiver, &UIReceiverCloudGetSettingsForm::sigTaskComplete,
                                 pEditor.data(), &UICloudMachineSettingsDialogPage::setForm);
+                        connect(pReceiver, &UIReceiverCloudGetSettingsForm::sigTaskFailed,
+                                pPopup.data(), &QIDialogContainer::close);
+                    }
                     /* Start task: */
                     if (pTask && pReceiver)