diff options
| author | Eike Ziller <[email protected]> | 2014-06-23 12:30:54 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-06-25 18:03:31 +0200 |
| commit | b89a208b8d26b6f9ec91be9690e2d0c30585f350 (patch) | |
| tree | b0a264ec31b45da340b2b2935341b9db5f6f4f27 /src/plugins/help/helpwidget.cpp | |
| parent | 839502e204482a00caacecee4d392e0ba7301d90 (diff) | |
Help: Close external window when opening page in help mode
Change-Id: I863e819c0e85185e74aa931b6f7eeb49766d3759
Reviewed-by: Karsten Heimrich <[email protected]>
Diffstat (limited to 'src/plugins/help/helpwidget.cpp')
| -rw-r--r-- | src/plugins/help/helpwidget.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index e4ba016de2c..aac98239fbc 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -61,12 +61,13 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget QWidget(parent), m_scaleUp(0), m_scaleDown(0), - m_resetScale(0) + m_resetScale(0), + m_style(style) { Utils::StyledBar *toolBar = new Utils::StyledBar(); QAction *switchToHelp = new QAction(tr("Go to Help Mode"), toolBar); - connect(switchToHelp, SIGNAL(triggered()), this, SLOT(emitOpenHelpMode())); + connect(switchToHelp, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); QAction *back = new QAction(QIcon(QLatin1String(":/help/images/previous.png")), tr("Back"), toolBar); @@ -123,7 +124,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget cmd = Core::ActionManager::registerAction(m_openHelpMode, Help::Constants::CONTEXT_HELP, context); - connect(m_openHelpMode, SIGNAL(triggered()), this, SLOT(emitOpenHelpMode())); + connect(m_openHelpMode, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED); QTC_CHECK(advancedMenu); @@ -206,9 +207,11 @@ void HelpWidget::updateWindowTitle() setWindowTitle(tr("Help - %1").arg(pageTitle)); } -void HelpWidget::emitOpenHelpMode() +void HelpWidget::helpModeButtonClicked() { emit openHelpMode(m_viewer->source()); + if (m_style == ExternalWindow) + close(); } } // Internal |