History

Merge remote-tracking branch 'upstream/master' into plugins

Brad Davis committed 11 years ago

Commit 4417c002 parents a5428ae 8a6ab68128 files · +3167 −2493Browse files

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

Unified · Split

interface/src/Menu.cpp+16−3
@@ -275,9 +275,22 @@ Menu::Menu() { · 274 unmodified lines
275275 SLOT(setFullscreen(bool)));
276276 #endif
277277
278− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson,
279− 0, // QML Qt::Key_P,
280− true, qApp, SLOT(cameraMenuChanged()));
278+ MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode");
279+ QActionGroup* cameraModeGroup = new QActionGroup(cameraModeMenu);
280+ cameraModeGroup->setExclusive(true);
281+ cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
282+ MenuOption::FirstPerson, 0, // QML Qt:: Key_P
283+ false, qApp, SLOT(cameraMenuChanged())));
284+ cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
285+ MenuOption::ThirdPerson, 0,
286+ true, qApp, SLOT(cameraMenuChanged())));
287+ cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
288+ MenuOption::IndependentMode, 0,
289+ false, qApp, SLOT(cameraMenuChanged())));
290+ cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
291+ MenuOption::FullscreenMirror, 0, // QML Qt::Key_H,
292+ false, qApp, SLOT(cameraMenuChanged())));
293+
281294 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror,
282295 0, //QML Qt::SHIFT | Qt::Key_H,
283296 true);