diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-01-05 14:10:36 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-01-05 14:10:36 -0500 |
| commit | 473cb7267affb69fe69b63bedf77d090617f21ae (patch) | |
| tree | ae781783244e2238b3b3a45ed0611953eefaf840 /src-qt5/core-utils | |
| parent | Fix up the context menu enable modes and rearrange the options a bit. (diff) | |
| parent | add quit keyboard shortcut (diff) | |
| download | lumina-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')
| -rw-r--r-- | src-qt5/core-utils/lumina-config/mainWindow.cpp | 6 | ||||
| -rw-r--r-- | src-qt5/core-utils/lumina-config/mainWindow.h | 4 |
2 files changed, 8 insertions, 2 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 diff --git a/src-qt5/core-utils/lumina-config/mainWindow.h b/src-qt5/core-utils/lumina-config/mainWindow.h index 71fda711..4c6bad39 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.h +++ b/src-qt5/core-utils/lumina-config/mainWindow.h @@ -25,7 +25,7 @@ public slots: private: Ui::mainWindow *ui; - QShortcut *backShortcut; + QShortcut *backShortcut, *quitShortcut; QString cpage; //current page @@ -40,6 +40,6 @@ private slots: void on_actionSave_triggered(); void on_actionBack_triggered(); void changeMonitor(QAction*); - + void on_quitShortcut_Triggered(); }; #endif |