From d8cca2b79d4a7f402bd00551a1a5af30b65192cc Mon Sep 17 00:00:00 2001 From: kh <qtc-committer@nokia.com> Date: Tue, 2 Jun 2009 16:30:56 +0200 Subject: [PATCH] As on request, let the side pane help open and follow help mode. Reviewed-by: Daniel Molkentin --- src/plugins/help/helpplugin.cpp | 18 ++++++++++++++++++ src/plugins/help/helpplugin.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 13a6b13ecbd..7bec07881e8 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -407,6 +407,11 @@ void HelpPlugin::createRightPaneSideBar() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_HELP_SIDEBAR), this)); + connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this, + SLOT(updateSideBarSource(QUrl))); + connect(m_centralWidget, SIGNAL(currentViewerChanged()), this, + SLOT(updateSideBarSource())); + QAction *copyActionSideBar = new QAction(this); Core::Command *cmd = m_core->actionManager()->registerAction(copyActionSideBar, Core::Constants::COPY, QList<int>() @@ -565,6 +570,19 @@ void HelpPlugin::openContextHelpPage(const QString &url) m_helpViewerForSideBar->setSource(QUrl(url)); } +void HelpPlugin::updateSideBarSource() +{ + const QUrl &url = m_centralWidget->currentSource(); + if (url.isValid()) + updateSideBarSource(url); +} + +void HelpPlugin::updateSideBarSource(const QUrl &newUrl) +{ + if (m_helpViewerForSideBar) + m_helpViewerForSideBar->setSource(newUrl); +} + void HelpPlugin::activateContext() { using namespace Core; diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h index b66765177bd..f95e0f0ece4 100644 --- a/src/plugins/help/helpplugin.h +++ b/src/plugins/help/helpplugin.h @@ -132,6 +132,9 @@ private slots: void openHelpPage(const QString& url); void openContextHelpPage(const QString &url); + void updateSideBarSource(); + void updateSideBarSource(const QUrl &newUrl); + private: QToolBar *createToolBar(); void createRightPaneSideBar(); -- GitLab