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

Help: Unify help content loading and error message.

Browse Source 
Task-number: QTCREATORBUG-12352
Change-Id: If74453e75cc8eaf27c114d0976099388be778fa6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2014-06-17 15:37:40 +02:00
parent 46cdd91024
commit be68fe7f4a
5 changed files with 115 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -122,36 +122,11 @@ QUrl TextBrowserHelpViewer::source() const
void TextBrowserHelpViewer::setSource(const QUrl &url)
{
const QString &string = url.toString();
if (url.isValid() && string != QLatin1String("help")) {
if (launchWithExternalApp(url))
return;
QUrl resolvedUrl;
if (url.scheme() == QLatin1String("http"))
resolvedUrl = url;
if (!resolvedUrl.isValid()) {
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
resolvedUrl = engine.findFile(url);
}
if (resolvedUrl.isValid()) {
m_textBrowser->setSource(resolvedUrl);
slotLoadFinished();
return;
}
}
if (launchWithExternalApp(url))
return;
slotLoadStarted();
m_textBrowser->setSource(url);
m_textBrowser->setHtml(string == Help::Constants::AboutBlank
? HelpViewer::tr("<title>about:blank</title>")
: HelpViewer::tr("<html><head><meta http-equiv=\""
"content-type\" content=\"text/html; charset=UTF-8\"><title>Error 404...</title>"
"</head><body><div align=\"center\"><br/><br/><h1>The page could not be found</h1>"
"<br/><h3>\"%1\"</h3></div></body></html>")
.arg(url.toString()));
slotLoadFinished();
}
@@ -321,18 +296,9 @@ TextBrowserHelpWidget::TextBrowserHelpWidget(int zoom, TextBrowserHelpViewer *pa
QVariant TextBrowserHelpWidget::loadResource(int type, const QUrl &name)
{
QByteArray ba;
if (type < 4) {
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
ba = engine.fileData(name);
if (name.toString().endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) {
QImage image;
image.loadFromData(ba, "svg");
if (!image.isNull())
return image;
}
}
return ba;
if (type < 4)
return LocalHelpManager::helpData(name).data;
return QByteArray();
}
bool TextBrowserHelpWidget::hasAnchorAt(const QPoint &pos)