History

Merge branch 'master' into 20639

David Rowe committed 11 years ago

Commit 02ae0082 parents 212327d 4ebc75d19 files · +1611 −1Browse files

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

Unified · Split

interface/src/Menu.cpp+6−0
@@ -29,6 +29,7 @@ · 28 unmodified lines
2929 #include "devices/Faceshift.h"
3030 #include "devices/RealSense.h"
3131 #include "devices/SixenseManager.h"
32+#include "devices/3Dconnexion.h"
3233 #include "MainWindow.h"
3334 #include "scripting/MenuScriptingInterface.h"
3435 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -455,6 +456,11 @@ Menu::Menu() { · 420 unmodified lines
455456 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderLookAtVectors, 0, false);
456457 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false);
457458 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false);
459+ addCheckableActionToQMenuAndActionHash(avatarDebugMenu,
460+ MenuOption::Connexion,
461+ 0, false,
462+ &ConnexionClient::getInstance(),
463+ SLOT(toggleConnexion(bool)));
458464
459465 MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");
460466 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false);