From b89a208b8d26b6f9ec91be9690e2d0c30585f350 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Mon, 23 Jun 2014 12:30:54 +0200
Subject: [PATCH] Help: Close external window when opening page in help mode

Change-Id: I863e819c0e85185e74aa931b6f7eeb49766d3759
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 src/plugins/help/helpwidget.cpp | 11 +++++++----
 src/plugins/help/helpwidget.h   |  3 ++-
 2 files changed, 9 insertions(+), 5 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
diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h
index c366c94cd3c..f89bd01eef7 100644
--- a/src/plugins/help/helpwidget.h
+++ b/src/plugins/help/helpwidget.h
@@ -71,7 +71,7 @@ private slots:
     void updateBackMenu();
     void updateForwardMenu();
     void updateWindowTitle();
-    void emitOpenHelpMode();
+    void helpModeButtonClicked();
 
 private:
     QMenu *m_backMenu;
@@ -83,6 +83,7 @@ private:
     QAction *m_copy;
 
     HelpViewer *m_viewer;
+    WidgetStyle m_style;
 };
 
 } // Internal