aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-04-15 12:53:34 +0200
committerDavid Schulz <david.schulz@digia.com>2013-05-08 13:07:05 +0200
commit65ce453c4e22540a934684c62a561e9cc59abc8f (patch)
tree4a2ab7605588cf7ac36439a586a9311c0425eb70 /src/plugins/help
parentd1cb5dade0c7e66ade8899cddac5669c1514fde9 (diff)
Add split in new window action for editor views.
A few details are still to be done: - extra windows are not restored yet - window title of extra windows should show information about current editor - the "raise main window" hack for Linux doesn't work with Qt 5 But it should already now be quite usable. Change-Id: I638583ee4b2abe32e95c261bdf31b4a10b472748 Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/help')
-rw-r--r--src/plugins/help/externalhelpwindow.cpp2
-rw-r--r--src/plugins/help/helpplugin.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/help/externalhelpwindow.cpp b/src/plugins/help/externalhelpwindow.cpp
index d4fad1c23e..0fbb160fed 100644
--- a/src/plugins/help/externalhelpwindow.cpp
+++ b/src/plugins/help/externalhelpwindow.cpp
@@ -193,7 +193,7 @@ bool ExternalHelpWindow::eventFilter(QObject *obj, QEvent *event)
QKeyEvent *keyEvent = static_cast<QKeyEvent*> (event);
switch (keyEvent->key()) {
case Qt::Key_Escape:
- Core::ICore::mainWindow()->activateWindow();
+ Core::ICore::raiseWindow(Core::ICore::mainWindow());
default:
break;
}
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a2a73e6495..40927ed169 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -729,9 +729,10 @@ void HelpPlugin::showExternalWindow()
doSetupIfNeeded();
m_externalWindow->show();
connectExternalHelpWindow();
- m_externalWindow->activateWindow();
if (firstTime)
- Core::ICore::mainWindow()->activateWindow();
+ Core::ICore::raiseWindow(Core::ICore::mainWindow());
+ else
+ Core::ICore::raiseWindow(m_externalWindow);
}
void HelpPlugin::modeChanged(Core::IMode *mode, Core::IMode *old)