From daf8d590858d610e9a2702c70399c0d7bb2778ee Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 17 Feb 2015 06:10:13 +0100 Subject: shortcuts: allow customize whether to center on startup Issue: #128 --- facetracknoir/keyboard.ui | 145 ++++++++++++++++++++------------------ facetracknoir/shortcut-dialog.cpp | 2 + 2 files changed, 78 insertions(+), 69 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/keyboard.ui b/facetracknoir/keyboard.ui index 903bb20f..cdfc0657 100644 --- a/facetracknoir/keyboard.ui +++ b/facetracknoir/keyboard.ui @@ -7,7 +7,7 @@ 0 0 461 - 174 + 181 @@ -39,6 +39,45 @@ QFrame::Plain + + + + + 50 + 16777215 + + + + Shift + + + + + + + + 50 + 16777215 + + + + Ctrl + + + + + + + + 50 + 16777215 + + + + Shift + + + @@ -100,24 +139,8 @@ - - - - - 0 - 0 - - - - Center - - - false - - - - - + + 50 @@ -125,7 +148,7 @@ - Shift + Alt @@ -142,8 +165,8 @@ - - + + 50 @@ -151,36 +174,23 @@ - Alt - - - - - - - - 90 - 0 - - - - Select Number - - - QComboBox::InsertAlphabetically + Shift - - - - - 50 - 16777215 - + + + + + 0 + 0 + - Alt + Center + + + false @@ -216,34 +226,24 @@ - - - + + + - 50 - 16777215 + 90 + 0 - - Shift - - - - - - - - 50 - 16777215 - + + Select Number - - Ctrl + + QComboBox::InsertAlphabetically - - + + 50 @@ -251,7 +251,7 @@ - Shift + Alt @@ -274,6 +274,13 @@ + + + + Center at startup + + + diff --git a/facetracknoir/shortcut-dialog.cpp b/facetracknoir/shortcut-dialog.cpp index f2934c15..437365b4 100644 --- a/facetracknoir/shortcut-dialog.cpp +++ b/facetracknoir/shortcut-dialog.cpp @@ -29,6 +29,8 @@ KeyboardShortcutDialog::KeyboardShortcutDialog() tie_setting(s.zero.ctrl, ui.chkZeroCtrl); tie_setting(s.s_main.tray_enabled, ui.trayp); + + tie_setting(s.s_main.center_at_startup, ui.center_at_startup); } void KeyboardShortcutDialog::doOK() { -- cgit v1.2.3