feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

In case of network error print the error string.

Browse Source 
Task-number: QTCREATORBUG-3378
This commit is contained in:
kh1
2011-01-11 16:10:22 +01:00
parent 80cd57a9b1
commit d8035bcaca
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/helpplugin.cpp
View File

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

3
src/plugins/help/helpviewer.h
View File

@@ -129,6 +129,9 @@ private slots:
void actionChanged(); void actionChanged();
void slotLoadStarted(); void slotLoadStarted();
void slotLoadFinished(bool ok); void slotLoadFinished(bool ok);
#if !defined(QT_NO_WEBKIT)
void slotNetworkReplyFinished(QNetworkReply *reply);
#endif
private: private:
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event);

14
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -239,7 +239,10 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
settings()->setAttribute(QWebSettings::PluginsEnabled, false); settings()->setAttribute(QWebSettings::PluginsEnabled, false);
setPage(new HelpPage(this)); 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); QAction* action = pageAction(QWebPage::OpenLinkInNewWindow);
action->setText(tr("Open Link as New Page")); action->setText(tr("Open Link as New Page"));
@@ -433,6 +436,15 @@ void HelpViewer::actionChanged()
emit forwardAvailable(a->isEnabled()); 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 // -- private
bool HelpViewer::eventFilter(QObject *obj, QEvent *event) bool HelpViewer::eventFilter(QObject *obj, QEvent *event)