History

Merge branch 'master' into dde-miscellaneous

David Rowe committed 11 years ago

Commit 649d4732 parents 766087c 68a4a1467 files · +1754 −740Browse files

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

Unified · Split

interface/src/Menu.cpp+2−7
@@ -30,7 +30,6 @@ · 29 unmodified lines
30#include "devices/Faceshift.h"30#include "devices/Faceshift.h"
31#include "devices/RealSense.h"31#include "devices/RealSense.h"
32#include "devices/SixenseManager.h"32#include "devices/SixenseManager.h"
33#include "devices/Visage.h"
34#include "MainWindow.h"33#include "MainWindow.h"
35#include "scripting/MenuScriptingInterface.h"34#include "scripting/MenuScriptingInterface.h"
36#if defined(Q_OS_MAC) || defined(Q_OS_WIN)35#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -376,16 +375,12 @@ Menu::Menu() { · 339 unmodified lines
376 0, false,375 0, false,
377 qApp, SLOT(setActiveFaceTracker()));376 qApp, SLOT(setActiveFaceTracker()));
378 faceTrackerGroup->addAction(ddeFaceTracker);377 faceTrackerGroup->addAction(ddeFaceTracker);
379#endif
380#ifdef HAVE_VISAGE
381 QAction* visageFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Visage,
382 0, false,
383 qApp, SLOT(setActiveFaceTracker()));
384 faceTrackerGroup->addAction(visageFaceTracker);
385#endif378#endif
386 }379 }
387#ifdef HAVE_DDE380#ifdef HAVE_DDE
388 faceTrackingMenu->addSeparator();381 faceTrackingMenu->addSeparator();
382 QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);
383 useAudioForMouth->setVisible(false);
389 QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::DDEFiltering, 0, true);384 QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::DDEFiltering, 0, true);
390 ddeFiltering->setVisible(false);385 ddeFiltering->setVisible(false);
391#endif386#endif

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