From 126106f9b05afb26b339c194f353a726d131cd41 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 24 Apr 2014 16:19:09 -0700 Subject: Quit Subsurface with user manual window in front Add ability to quit Subsurface with a Ctrl-Q shortcut even if the user manual window is active. Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 2 +- qt-ui/usermanual.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index cd8e6d808..2d3388d9e 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -592,7 +592,7 @@ void MainWindow::on_actionUserManual_triggered() { #ifndef NO_USERMANUAL if (!helpView) { - helpView = new UserManual(); + helpView = new UserManual(this); } helpView->show(); #endif diff --git a/qt-ui/usermanual.cpp b/qt-ui/usermanual.cpp index aff9cc1ed..89e556d60 100644 --- a/qt-ui/usermanual.cpp +++ b/qt-ui/usermanual.cpp @@ -13,6 +13,8 @@ UserManual::UserManual(QWidget *parent) : QMainWindow(parent), QShortcut* closeKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this); connect(closeKey, SIGNAL(activated()), this, SLOT(close())); + QShortcut* quitKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this); + connect(quitKey, SIGNAL(activated()), parent, SLOT(close())); QAction *actionShowSearch = new QAction(this); actionShowSearch->setShortcut(Qt::CTRL + Qt::Key_F); -- cgit v1.2.3-70-g09d2