aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core-utils/lumina-config/mainWindow.cpp
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-01-05 14:10:36 -0500
committerKen Moore <ken@ixsystems.com>2017-01-05 14:10:36 -0500
commit473cb7267affb69fe69b63bedf77d090617f21ae (patch)
treeae781783244e2238b3b3a45ed0611953eefaf840 /src-qt5/core-utils/lumina-config/mainWindow.cpp
parentFix up the context menu enable modes and rearrange the options a bit. (diff)
parentadd quit keyboard shortcut (diff)
downloadlumina-473cb7267affb69fe69b63bedf77d090617f21ae.tar.gz
lumina-473cb7267affb69fe69b63bedf77d090617f21ae.tar.bz2
lumina-473cb7267affb69fe69b63bedf77d090617f21ae.zip
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core-utils/lumina-config/mainWindow.cpp')
-rw-r--r--src-qt5/core-utils/lumina-config/mainWindow.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp
index 595d69f6..d3d864fe 100644
--- a/src-qt5/core-utils/lumina-config/mainWindow.cpp
+++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp
@@ -25,6 +25,8 @@ mainWindow::mainWindow() : QMainWindow(), ui(new Ui::mainWindow()){
ui->toolBar->insertWidget(ui->actionSave, tmp); //after the save button
backShortcut = new QShortcut(Qt::Key_Escape, this);
connect(backShortcut, SIGNAL(activated()), this, SLOT(on_actionBack_triggered()) );
+ quitShortcut = new QShortcut(Qt::CTRL + Qt::Key_Q, this);
+ connect(quitShortcut, SIGNAL(activated()), this, SLOT(on_quitShortcut_Triggered()) );
setupIcons();
loadMonitors();
//changePage(""); //load the default main page
@@ -145,6 +147,10 @@ void mainWindow::on_actionBack_triggered(){
else{ page_change(""); } //Use the interactive wrapper (check for save state, etc).
}
+void mainWindow::on_quitShortcut_Triggered(){
+ QApplication::quit();
+}
+
void mainWindow::changeMonitor(QAction *act){
QString oldWT = ui->actionMonitor->whatsThis();
//Update the current selection shown on the button
bgstack15