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

Revert "F1+F1 behavior was broken if there was no context help found."

Browse Source 
This reverts commit 9eccbbee5c.

After a bit more discussion and considering
2c4eb25168 this wasn't a good idea after
all.
This commit is contained in:
con
2011-03-09 11:37:59 +01:00
parent 9eccbbee5c
commit 4ed1895c68
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,16 +655,12 @@ void HelpPlugin::activateHelpMode()
void HelpPlugin::switchToHelpMode() void HelpPlugin::switchToHelpMode()
{ {
QUrl source = m_helpViewerForSideBar->source(); switchToHelpMode(m_helpViewerForSideBar->source());
if (source == QUrl(Help::Constants::AboutBlank))
source = QUrl();
switchToHelpMode(source);
} }
void HelpPlugin::switchToHelpMode(const QUrl &source) void HelpPlugin::switchToHelpMode(const QUrl &source)
{ {
activateHelpMode(); activateHelpMode();
if (!source.isEmpty())
m_centralWidget->setSource(source); m_centralWidget->setSource(source);
m_centralWidget->setFocus(); m_centralWidget->setFocus();
} }
@@ -881,7 +877,6 @@ void HelpPlugin::activateContext()
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->setFocus(); // we still want the F1+F1 shortcut behavior
} else { } else {
int version = 0; int version = 0;
const QRegExp exp("(\\d+)"); const QRegExp exp("(\\d+)");