diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2014-04-24 16:19:09 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-04-25 07:19:18 -0700 |
commit | 126106f9b05afb26b339c194f353a726d131cd41 (patch) | |
tree | e92dce1e53652be92d8f29aa37975b61dc7e8afa | |
parent | b068ae6019982d20a17ca3f366a866c2ee24ee4c (diff) | |
download | subsurface-126106f9b05afb26b339c194f353a726d131cd41.tar.gz |
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 <dirk@hohndel.org>
-rw-r--r-- | qt-ui/mainwindow.cpp | 2 | ||||
-rw-r--r-- | qt-ui/usermanual.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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); |