History

Merge branch 'master' of https://github.com/worklist/hifi into metavoxels

Andrzej Kapolka committed 12 years ago

Commit 6888dc42 parents 0ca2320 4e618fc18 files · +215 −81Browse files

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

Unified · Split

interface/src/Menu.cpp+10−4
@@ -358,11 +358,17 @@ Menu::Menu() : · 357 unmodified lines
358 appInstance->getWebcam()->getGrabber(),358 appInstance->getWebcam()->getGrabber(),
359 SLOT(setDepthOnly(bool)));359 SLOT(setDepthOnly(bool)));
360 360
361 QMenu* raveGloveOptionsMenu = developerMenu->addMenu("Hand Options");361 QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");
362 362
363 addCheckableActionToQMenuAndActionHash(raveGloveOptionsMenu, MenuOption::SimulateLeapHand);363 addCheckableActionToQMenuAndActionHash(handOptionsMenu,
364 addCheckableActionToQMenuAndActionHash(raveGloveOptionsMenu, MenuOption::DisplayLeapHands, 0, true);364 MenuOption::FilterSixense,
365 addCheckableActionToQMenuAndActionHash(raveGloveOptionsMenu, MenuOption::LeapDrive, 0, false);365 0,
366 true,
367 appInstance->getSixenseManager(),
368 SLOT(setFilter(bool)));
369 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::SimulateLeapHand);
370 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayLeapHands, 0, true);
371 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::LeapDrive, 0, false);
366 372
367 373
368 QMenu* trackingOptionsMenu = developerMenu->addMenu("Tracking Options");374 QMenu* trackingOptionsMenu = developerMenu->addMenu("Tracking Options");