Fixes: help: small refactoring

This commit is contained in:
hjk
2009-01-28 13:57:42 +01:00
parent 1969b2ebc0
commit f6f1721a64
2 changed files with 14 additions and 8 deletions

View File

@@ -395,6 +395,11 @@ void HelpPlugin::rightPaneForward()
m_helpViewerForSideBar->forward(); m_helpViewerForSideBar->forward();
} }
void HelpPlugin::activateHelpMode()
{
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP));
}
void HelpPlugin::switchToHelpMode() void HelpPlugin::switchToHelpMode()
{ {
switchToHelpMode(m_helpViewerForSideBar->source()); switchToHelpMode(m_helpViewerForSideBar->source());
@@ -403,14 +408,14 @@ void HelpPlugin::switchToHelpMode()
void HelpPlugin::switchToHelpMode(const QUrl &source) void HelpPlugin::switchToHelpMode(const QUrl &source)
{ {
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
m_centralWidget->setSource(source); m_centralWidget->setSource(source);
m_centralWidget->setFocus(); m_centralWidget->setFocus();
} }
void HelpPlugin::switchToHelpMode(const QMap<QString, QUrl> &urls, const QString &keyword) void HelpPlugin::switchToHelpMode(const QMap<QString, QUrl> &urls, const QString &keyword)
{ {
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
m_centralWidget->showTopicChooser(urls, keyword); m_centralWidget->showTopicChooser(urls, keyword);
} }
@@ -561,7 +566,7 @@ void HelpPlugin::activateContext()
viewer = m_helpViewerForSideBar; viewer = m_helpViewerForSideBar;
} else { } else {
viewer = m_centralWidget->currentHelpViewer(); viewer = m_centralWidget->currentHelpViewer();
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
} }
if (viewer) { if (viewer) {
@@ -579,7 +584,7 @@ void HelpPlugin::activateContext()
viewer = m_helpViewerForSideBar; viewer = m_helpViewerForSideBar;
} else { } else {
viewer = m_centralWidget->currentHelpViewer(); viewer = m_centralWidget->currentHelpViewer();
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
} }
if (viewer) { if (viewer) {
@@ -593,19 +598,19 @@ void HelpPlugin::activateContext()
void HelpPlugin::activateIndex() void HelpPlugin::activateIndex()
{ {
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
m_sideBar->activateItem(m_indexItem); m_sideBar->activateItem(m_indexItem);
} }
void HelpPlugin::activateContents() void HelpPlugin::activateContents()
{ {
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
m_sideBar->activateItem(m_contentItem); m_sideBar->activateItem(m_contentItem);
} }
void HelpPlugin::activateSearch() void HelpPlugin::activateSearch()
{ {
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
m_sideBar->activateItem(m_searchItem); m_sideBar->activateItem(m_searchItem);
} }
@@ -680,7 +685,7 @@ void HelpPlugin::addNewBookmark(const QString &title, const QString &url)
void HelpPlugin::openGettingStarted() void HelpPlugin::openGettingStarted()
{ {
m_core->modeManager()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); activateHelpMode();
m_centralWidget->setSource( m_centralWidget->setSource(
QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html") QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html")
.arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)); .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));

View File

@@ -134,6 +134,7 @@ private slots:
private: private:
QToolBar *createToolBar(); QToolBar *createToolBar();
void createRightPaneSideBar(); void createRightPaneSideBar();
void activateHelpMode();
Core::ICore *m_core; Core::ICore *m_core;
QHelpEngine *m_helpEngine; QHelpEngine *m_helpEngine;