History

Doing a pass over the input plugins and controller code

Brad Davis committed 10 years ago

Commit 07562f71 parent a73160636 files · +328 −491Browse files

Showing the changes to interface/src/Menu.cpp (1 of 36 files). Show all

Unified · Split

interface/src/Menu.cpp+6−7
@@ -34,7 +34,6 @@ · 33 unmodified lines
34#include "avatar/AvatarManager.h"34#include "avatar/AvatarManager.h"
35#include "devices/DdeFaceTracker.h"35#include "devices/DdeFaceTracker.h"
36#include "devices/Faceshift.h"36#include "devices/Faceshift.h"
37#include "input-plugins/SpacemouseManager.h"
38#include "MainWindow.h"37#include "MainWindow.h"
39#include "render/DrawStatus.h"38#include "render/DrawStatus.h"
40#include "scripting/MenuScriptingInterface.h"39#include "scripting/MenuScriptingInterface.h"
@@ -327,12 +326,6 @@ Menu::Menu() { · 286 unmodified lines
327 connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));326 connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
328#endif327#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 // Developer menu ----------------------------------329 // Developer menu ----------------------------------
337 MenuWrapper* developerMenu = addMenu("Developer", "Developer");330 MenuWrapper* developerMenu = addMenu("Developer", "Developer");
338 331
@@ -410,6 +403,12 @@ Menu::Menu() { · 71 unmodified lines
410 // Developer > Avatar >>>403 // Developer > Avatar >>>
411 MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");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 // Developer > Avatar > Face Tracking412 // Developer > Avatar > Face Tracking
414 MenuWrapper* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking");413 MenuWrapper* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking");
415 {414 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t