Showing the changes to interface/src/Menu.cpp (1 of 19 files). Show all
Unified · Split
| @@ -29,6 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include "devices/Faceshift.h" |
| 30 | 30 | #include "devices/RealSense.h" |
| 31 | 31 | #include "devices/SixenseManager.h" |
| 32 | +#include "devices/3Dconnexion.h" | |
| 32 | 33 | #include "MainWindow.h" |
| 33 | 34 | #include "scripting/MenuScriptingInterface.h" |
| 34 | 35 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| @@ -455,6 +456,11 @@ Menu::Menu() { · 420 unmodified lines | ||
| 455 | 456 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderLookAtVectors, 0, false); |
| 456 | 457 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false); |
| 457 | 458 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false); |
| 459 | + addCheckableActionToQMenuAndActionHash(avatarDebugMenu, | |
| 460 | + MenuOption::Connexion, | |
| 461 | + 0, false, | |
| 462 | + &ConnexionClient::getInstance(), | |
| 463 | + SLOT(toggleConnexion(bool))); | |
| 458 | 464 | |
| 459 | 465 | MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands"); |
| 460 | 466 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false); |