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

Help: Option to open links in window

Browse Source 
Task-number: QTCREATORBUG-16842
Change-Id: I420f48a00c56ebc89bade7e91ceb8ec391316e36
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2016-09-09 15:37:01 +02:00
parent 2cd307a7b0
commit a416a5b6e3
12 changed files with 153 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,8 @@ static const char kToolTipHelpContext[] = "Help.ToolTip";
using namespace Core;
using namespace Utils;
static HelpPlugin *m_instance = nullptr;
HelpPlugin::HelpPlugin()
: m_mode(0),
m_centralWidget(0),
@@ -116,6 +118,7 @@ HelpPlugin::HelpPlugin()
m_helpManager(0),
m_openPagesManager(0)
{
m_instance = this;
}
HelpPlugin::~HelpPlugin()
@@ -476,7 +479,7 @@ void HelpPlugin::setupHelpEngineIfNeeded()
LocalHelpManager::setupGuiHelpEngine();
}
bool HelpPlugin::canShowHelpSideBySide() const
bool HelpPlugin::canShowHelpSideBySide()
{
RightPanePlaceHolder *placeHolder = RightPanePlaceHolder::current();
if (!placeHolder)
@@ -503,19 +506,19 @@ HelpViewer *HelpPlugin::viewerForHelpViewerLocation(HelpManager::HelpViewerLocat
: HelpManager::HelpModeAlways;
if (actualLocation == HelpManager::ExternalHelpAlways)
return externalHelpViewer();
return m_instance->externalHelpViewer();
if (actualLocation == HelpManager::SideBySideAlways) {
createRightPaneContextViewer();
RightPaneWidget::instance()->setWidget(m_rightPaneSideBarWidget);
m_instance->createRightPaneContextViewer();
RightPaneWidget::instance()->setWidget(m_instance->m_rightPaneSideBarWidget);
RightPaneWidget::instance()->setShown(true);
return m_rightPaneSideBarWidget->currentViewer();
return m_instance->m_rightPaneSideBarWidget->currentViewer();
}
QTC_CHECK(actualLocation == HelpManager::HelpModeAlways);
activateHelpMode(); // should trigger an createPage...
HelpViewer *viewer = m_centralWidget->currentViewer();
HelpViewer *viewer = m_instance->m_centralWidget->currentViewer();
if (!viewer)
viewer = OpenPagesManager::instance().createPage();
return viewer;