Showing the changes to interface/src/Menu.cpp (1 of 36 files). Show all
Unified · Split
| @@ -34,7 +34,6 @@ · 33 unmodified lines | ||
| 34 | 34 | #include "avatar/AvatarManager.h" |
| 35 | 35 | #include "devices/DdeFaceTracker.h" |
| 36 | 36 | #include "devices/Faceshift.h" |
| 37 | −#include "input-plugins/SpacemouseManager.h" | |
| 38 | 37 | #include "MainWindow.h" |
| 39 | 38 | #include "render/DrawStatus.h" |
| 40 | 39 | #include "scripting/MenuScriptingInterface.h" |
| @@ -327,12 +326,6 @@ Menu::Menu() { · 286 unmodified lines | ||
| 327 | 326 | connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool))); |
| 328 | 327 | #endif |
| 329 | 328 | |
| 330 | − // Settings > Input Devices | |
| 331 | − MenuWrapper* inputModeMenu = addMenu(MenuOption::InputMenu, "Advanced"); | |
| 332 | − QActionGroup* inputModeGroup = new QActionGroup(inputModeMenu); | |
| 333 | − inputModeGroup->setExclusive(false); | |
| 334 | − | |
| 335 | − | |
| 336 | 329 | // Developer menu ---------------------------------- |
| 337 | 330 | MenuWrapper* developerMenu = addMenu("Developer", "Developer"); |
| 338 | 331 | |
| @@ -410,6 +403,12 @@ Menu::Menu() { · 71 unmodified lines | ||
| 410 | 403 | // Developer > Avatar >>> |
| 411 | 404 | MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar"); |
| 412 | 405 | |
| 406 | + // Settings > Input Devices | |
| 407 | + MenuWrapper* inputModeMenu = addMenu(MenuOption::InputMenu, "Advanced"); | |
| 408 | + QActionGroup* inputModeGroup = new QActionGroup(inputModeMenu); | |
| 409 | + inputModeGroup->setExclusive(false); | |
| 410 | + | |
| 411 | + | |
| 413 | 412 | // Developer > Avatar > Face Tracking |
| 414 | 413 | MenuWrapper* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking"); |
| 415 | 414 | { |