Mercurial > hg > touchkeys
comparison 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 |
comparison
equal
deleted
inserted
replaced
40:50e4859d9769 | 41:85577160a0d4 |
---|---|
125 menu.addSeparator(); | 125 menu.addSeparator(); |
126 menu.addCommandItem(&commandManager_, kCommandEnableExperimentalMappings); | 126 menu.addCommandItem(&commandManager_, kCommandEnableExperimentalMappings); |
127 #ifdef ENABLE_TOUCHKEYS_SENSOR_TEST | 127 #ifdef ENABLE_TOUCHKEYS_SENSOR_TEST |
128 menu.addCommandItem(&commandManager_, kCommandTestTouchkeySensors); | 128 menu.addCommandItem(&commandManager_, kCommandTestTouchkeySensors); |
129 #endif | 129 #endif |
130 menu.addSeparator(); | |
131 menu.addCommandItem(&commandManager_, kCommandPreferences); | |
130 } | 132 } |
131 else if(menuIndex == 3) { // Window | 133 else if(menuIndex == 3) { // Window |
132 menu.addCommandItem(&commandManager_, kCommandShowControlWindow); | 134 menu.addCommandItem(&commandManager_, kCommandShowControlWindow); |
133 menu.addCommandItem(&commandManager_, kCommandShowKeyboardWindow); | 135 menu.addCommandItem(&commandManager_, kCommandShowKeyboardWindow); |
134 } | 136 } |
168 kCommandLoggingPlay, | 170 kCommandLoggingPlay, |
169 kCommandEnableExperimentalMappings, | 171 kCommandEnableExperimentalMappings, |
170 #ifdef ENABLE_TOUCHKEYS_SENSOR_TEST | 172 #ifdef ENABLE_TOUCHKEYS_SENSOR_TEST |
171 kCommandTestTouchkeySensors, | 173 kCommandTestTouchkeySensors, |
172 #endif | 174 #endif |
175 kCommandPreferences, | |
176 | |
173 // Window | 177 // Window |
174 kCommandShowControlWindow, | 178 kCommandShowControlWindow, |
175 kCommandShowKeyboardWindow | 179 kCommandShowKeyboardWindow |
176 }; | 180 }; |
177 | 181 |
277 result.setInfo("Test TouchKeys Sensors", "Enables a test of individual TouchKeys sensors", controlCategory, 0); | 281 result.setInfo("Test TouchKeys Sensors", "Enables a test of individual TouchKeys sensors", controlCategory, 0); |
278 result.setActive(controller_.availableTouchkeyDevices().size() > 0); | 282 result.setActive(controller_.availableTouchkeyDevices().size() > 0); |
279 result.setTicked(controller_.touchkeySensorTestIsRunning()); | 283 result.setTicked(controller_.touchkeySensorTestIsRunning()); |
280 break; | 284 break; |
281 #endif | 285 #endif |
286 case kCommandPreferences: | |
287 result.setInfo("Preferences...", "General application preferences", controlCategory, 0); | |
288 result.setTicked(false); | |
289 result.setActive(true); | |
290 break; | |
282 | 291 |
283 // *** Window Menu *** | 292 // *** Window Menu *** |
284 case kCommandShowControlWindow: | 293 case kCommandShowControlWindow: |
285 result.setInfo("TouchKeys Controls", "Show control and mapping window", windowCategory, 0); | 294 result.setInfo("TouchKeys Controls", "Show control and mapping window", windowCategory, 0); |
286 result.setTicked(false); | 295 result.setTicked(false); |
337 controller_.touchkeySensorTestStart(mainComponent_.currentTouchkeysSelectedPath().toUTF8(), controller_.touchkeyDeviceLowestMidiNote()); | 346 controller_.touchkeySensorTestStart(mainComponent_.currentTouchkeysSelectedPath().toUTF8(), controller_.touchkeyDeviceLowestMidiNote()); |
338 else | 347 else |
339 controller_.touchkeySensorTestStop(); | 348 controller_.touchkeySensorTestStop(); |
340 break; | 349 break; |
341 #endif | 350 #endif |
351 case kCommandPreferences: | |
352 controller_.showPreferencesWindow(); | |
353 break; | |
342 case kCommandShowControlWindow: | 354 case kCommandShowControlWindow: |
343 toFront(true); | 355 toFront(true); |
344 break; | 356 break; |
345 case kCommandShowKeyboardWindow: | 357 case kCommandShowKeyboardWindow: |
346 controller_.showKeyboardDisplayWindow(); | 358 controller_.showKeyboardDisplayWindow(); |