History

Merge with master

Sam Gondelman committed 11 years ago

Commit 19ec0802 parents 778e19a 0bef506214 files · +6701 −6001Browse files

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

Unified · Split

interface/src/Menu.cpp+6−0
@@ -287,6 +287,12 @@ Menu::Menu() { · 286 unmodified lines
287 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror,287 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror,
288 0, //QML Qt::SHIFT | Qt::Key_H,288 0, //QML Qt::SHIFT | Qt::Key_H,
289 true);289 true);
290 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror,
291 0, // QML Qt::Key_H,
292 false, qApp, SLOT(cameraMenuChanged()));
293
294 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
295 0, false, qApp, SLOT(rotationModeChanged()));
290 296
291 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools,297 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools,
292#ifdef Q_OS_MAC298#ifdef Q_OS_MAC