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

Timestamp:

Oct 23, 2015 3:19:21 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Networking cleanup/rework (part 19): Do not pass static error information from network reply to network request widget since it should be re-acquirable on demand.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UINetworkRequestWidget.cpp (modified) (2 diffs)
• UINetworkRequestWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp

@@ -165 +165 @@
     m_pRetryButton->setHidden(false);
 
+    /* Show error label: */
+    m_pErrorPane->setHidden(false);
+    m_pErrorPane->setText(composeErrorText(strError));
+}
+
+void UINetworkRequestWidget::sltTimeIsOut()
+{
+    /* Stop timer: */
+    m_pTimer->stop();
+
+    /* Set current progress to unknown: */
+    m_pProgressBar->setRange(0, 0);
+}
+
+void UINetworkRequestWidget::retranslateUi()
+{
+    /* Get corresponding title: */
+    const QString &strTitle = m_pNetworkRequest->description();
+
+    /* Set popup title (default if missed): */
+    setTitle(strTitle.isEmpty() ? UINetworkManagerDialog::tr("Network Operation") : strTitle);
+
+    /* Translate retry button: */
+    m_pRetryButton->setStatusTip(UINetworkManagerDialog::tr("Restart network operation"));
+
+    /* Translate cancel button: */
+    m_pCancelButton->setStatusTip(UINetworkManagerDialog::tr("Cancel network operation"));
+
+    /* Translate error label: */
+    if (m_pNetworkRequest->reply())
+        m_pErrorPane->setText(composeErrorText(m_pNetworkRequest->reply()->errorString()));
+}
+
+/* static */
+const QString UINetworkRequestWidget::composeErrorText(QString strErrorText)
+{
+    /* Null-string for null-string: */
+    if (strErrorText.isEmpty())
+        return QString();
+
     /* Try to find all the links in the error-message,
      * replace them with %increment if present: */
-    QString strErrorText(strError);
     QRegExp linkRegExp("[\\S]+[\\./][\\S]+");
     QStringList links;
@@ -184 +223 @@
     strErrorText.prepend("<br>");
 
-    /* Show error label: */
-    m_pErrorPane->setHidden(false);
-    m_pErrorPane->setText(UINetworkManagerDialog::tr("The network operation failed with the following error: %1.").arg(strErrorText));
-}
-
-void UINetworkRequestWidget::sltTimeIsOut()
-{
-    /* Stop timer: */
-    m_pTimer->stop();
-
-    /* Set current progress to unknown: */
-    m_pProgressBar->setRange(0, 0);
-}
-
-void UINetworkRequestWidget::retranslateUi()
-{
-    /* Get corresponding title: */
-    const QString &strTitle = m_pNetworkRequest->description();
-
-    /* Set popup title (default if missed): */
-    setTitle(strTitle.isEmpty() ? UINetworkManagerDialog::tr("Network Operation") : strTitle);
-
-    /* Translate retry button: */
-    m_pRetryButton->setStatusTip(UINetworkManagerDialog::tr("Restart network operation"));
-
-    /* Translate cancel button: */
-    m_pCancelButton->setStatusTip(UINetworkManagerDialog::tr("Cancel network operation"));
-}
+    /* Return final result: */
+    return UINetworkManagerDialog::tr("The network operation failed with the following error: %1.").arg(strErrorText);
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.h

@@ -72 +72 @@
     void retranslateUi();
 
+    /** Composes error text on the basis of the passed @a strErrorText. */
+    static const QString composeErrorText(QString strErrorText);
+
     /* Widgets: */
     QWidget *m_pContentWidget;