Mercurial > hg > touchkeys
diff Source/GUI/MainWindow.cpp @ 41:85577160a0d4
Many changes: implement global application preferences on devices etc.; extended editor window support with Control mapping features for now
author | Andrew McPherson <andrewm@eecs.qmul.ac.uk> |
---|---|
date | Sat, 21 Jun 2014 23:32:33 +0100 |
parents | 239b039d3000 |
children | 114427cb39f0 |
line wrap: on
line diff
--- a/Source/GUI/MainWindow.cpp Fri Mar 21 23:13:19 2014 +0000 +++ b/Source/GUI/MainWindow.cpp Sat Jun 21 23:32:33 2014 +0100 @@ -127,6 +127,8 @@ #ifdef ENABLE_TOUCHKEYS_SENSOR_TEST menu.addCommandItem(&commandManager_, kCommandTestTouchkeySensors); #endif + menu.addSeparator(); + menu.addCommandItem(&commandManager_, kCommandPreferences); } else if(menuIndex == 3) { // Window menu.addCommandItem(&commandManager_, kCommandShowControlWindow); @@ -170,6 +172,8 @@ #ifdef ENABLE_TOUCHKEYS_SENSOR_TEST kCommandTestTouchkeySensors, #endif + kCommandPreferences, + // Window kCommandShowControlWindow, kCommandShowKeyboardWindow @@ -279,6 +283,11 @@ result.setTicked(controller_.touchkeySensorTestIsRunning()); break; #endif + case kCommandPreferences: + result.setInfo("Preferences...", "General application preferences", controlCategory, 0); + result.setTicked(false); + result.setActive(true); + break; // *** Window Menu *** case kCommandShowControlWindow: @@ -339,6 +348,9 @@ controller_.touchkeySensorTestStop(); break; #endif + case kCommandPreferences: + controller_.showPreferencesWindow(); + break; case kCommandShowControlWindow: toFront(true); break;