In case of network error print the error string.

Task-number: QTCREATORBUG-3378

In case of network error print the error string.
Task-number: QTCREATORBUG-3378
d8035bca · kh1 · 80cd57a9 · d8035bca · d8035bca · d8035bca
Commit d8035bca authored Jan 11, 2011 by kh1
Showing with 17 additions and 2 deletions

src/plugins/help/helpplugin.cpp src/plugins/help/helpplugin.cpp +1 -1

src/plugins/help/helpviewer.h src/plugins/help/helpviewer.h +3 -0

src/plugins/help/helpviewer_qwv.cpp src/plugins/help/helpviewer_qwv.cpp +13 -1

No files found.
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -868,10 +868,10 @@ void HelpPlugin::activateContext()
    if (HelpViewer* viewer = viewerForContextMode()) {
        if (links.isEmpty()) {
            // No link found or no context object
+            viewer->setSource(QUrl(Help::Constants::AboutBlank));
            viewer->setHtml(tr("<html><head><title>No Documentation</title>"
                "</head><body><br/><center><b>%1</b><br/>No documentation "
                "available.</center></body></html>").arg(m_idFromContext));
-            viewer->setSource(QUrl());
        } else {
            int version = 0;
            const QRegExp exp("(\\d+)");

--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -129,6 +129,9 @@ private slots:
    void actionChanged();
    void slotLoadStarted();
    void slotLoadFinished(bool ok);
+#if !defined(QT_NO_WEBKIT)
+    void slotNetworkReplyFinished(QNetworkReply *reply);
+#endif

 private:
    bool eventFilter(QObject *obj, QEvent *event);

--- a/src/plugins/help/helpviewer_qwv.cpp
+++ b/src/plugins/help/helpviewer_qwv.cpp
@@ -239,7 +239,10 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
    settings()->setAttribute(QWebSettings::PluginsEnabled, false);

    setPage(new HelpPage(this));
-    page()->setNetworkAccessManager(new HelpNetworkAccessManager(this));
+    HelpNetworkAccessManager *manager = new HelpNetworkAccessManager(this);
+    page()->setNetworkAccessManager(manager);
+    connect(manager, SIGNAL(finished(QNetworkReply*)), this,
+        SLOT(slotNetworkReplyFinished(QNetworkReply*)));

    QAction* action = pageAction(QWebPage::OpenLinkInNewWindow);
    action->setText(tr("Open Link as New Page"));
@@ -433,6 +436,15 @@ void HelpViewer::actionChanged()
        emit forwardAvailable(a->isEnabled());
 }

+void HelpViewer::slotNetworkReplyFinished(QNetworkReply *reply)
+{
+    if (reply && reply->error() != QNetworkReply::NoError) {
+        setSource(QUrl(Help::Constants::AboutBlank));
+        setHtml(HelpViewer::PageNotFoundMessage.arg(reply->url().toString()
+            + QString::fromLatin1("<br><br>Error: %1").arg(reply->errorString())));
+    }
+}
+
 // -- private

 bool HelpViewer::eventFilter(QObject *obj, QEvent *event)