History

resolve conflicts on merge with origin/protocol

Stephen Birarda committed 11 years ago

Commit e3e529c2 parents eae90cb 80cf7b6112 files · +845 −602Browse files

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

Unified · Split

interface/src/Menu.cpp+10−19
@@ -223,7 +223,7 @@ Menu::Menu() { · 222 unmodified lines
223 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,223 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
224 qApp, SLOT(packageModel()));224 qApp, SLOT(packageModel()));
225 225
226 MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH);226 MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH());
227 {227 {
228 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);228 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
229 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);229 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);
@@ -334,25 +334,8 @@ Menu::Menu() { · 104 unmodified lines
334 ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight8, 0, false));334 ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight8, 0, false));
335 ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight9, 0, false));335 ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight9, 0, false));
336 336
337 {337 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, true,
338 MenuWrapper* framerateMenu = renderOptionsMenu->addMenu(MenuOption::RenderTargetFramerate);
339 QActionGroup* framerateGroup = new QActionGroup(framerateMenu);
340 framerateGroup->setExclusive(true);
341 framerateGroup->addAction(addCheckableActionToQMenuAndActionHash(framerateMenu, MenuOption::RenderTargetFramerateUnlimited, 0, true));
342 framerateGroup->addAction(addCheckableActionToQMenuAndActionHash(framerateMenu, MenuOption::RenderTargetFramerate60, 0, false));
343 framerateGroup->addAction(addCheckableActionToQMenuAndActionHash(framerateMenu, MenuOption::RenderTargetFramerate50, 0, false));
344 framerateGroup->addAction(addCheckableActionToQMenuAndActionHash(framerateMenu, MenuOption::RenderTargetFramerate40, 0, false));
345 framerateGroup->addAction(addCheckableActionToQMenuAndActionHash(framerateMenu, MenuOption::RenderTargetFramerate30, 0, false));
346
347#if defined(Q_OS_MAC)
348#else
349 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::RenderTargetFramerateVSyncOn, 0, true,
350 qApp, SLOT(setVSyncEnabled()));
351#endif
352 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, true,
353 qApp, SLOT(setThrottleFPSEnabled()));338 qApp, SLOT(setThrottleFPSEnabled()));
354 }
355
356 339
357 MenuWrapper* resolutionMenu = renderOptionsMenu->addMenu(MenuOption::RenderResolution);340 MenuWrapper* resolutionMenu = renderOptionsMenu->addMenu(MenuOption::RenderResolution);
358 QActionGroup* resolutionGroup = new QActionGroup(resolutionMenu);341 QActionGroup* resolutionGroup = new QActionGroup(resolutionMenu);
@@ -462,6 +445,8 @@ Menu::Menu() { · 103 unmodified lines
462 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false);445 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false);
463 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false);446 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false);
464 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);447 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
448 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableRigAnimations, 0, false,
449 avatar, SLOT(setEnableRigAnimations(bool)));
465 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisableEyelidAdjustment, 0, false);450 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisableEyelidAdjustment, 0, false);
466 addCheckableActionToQMenuAndActionHash(avatarDebugMenu,451 addCheckableActionToQMenuAndActionHash(avatarDebugMenu,
467 MenuOption::Connexion,452 MenuOption::Connexion,
@@ -591,6 +576,9 @@ Menu::Menu() { · 123 unmodified lines
591 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned);576 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned);
592 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);577 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);
593 578
579 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisplayCrashOptions, 0, true);
580 addActionToQMenuAndActionHash(developerMenu, MenuOption::CrashInterface, 0, qApp, SLOT(crashApplication()));
581
594 MenuWrapper* helpMenu = addMenu("Help");582 MenuWrapper* helpMenu = addMenu("Help");
595 addActionToQMenuAndActionHash(helpMenu, MenuOption::EditEntitiesHelp, 0, qApp, SLOT(showEditEntitiesHelp()));583 addActionToQMenuAndActionHash(helpMenu, MenuOption::EditEntitiesHelp, 0, qApp, SLOT(showEditEntitiesHelp()));
596 584
@@ -1060,6 +1048,9 @@ QAction* MenuWrapper::addAction(const QString& menuName, const QObject* receiver · 463 unmodified lines
1060 1048
1061void MenuWrapper::removeAction(QAction* action) {1049void MenuWrapper::removeAction(QAction* action) {
1062 _realMenu->removeAction(action);1050 _realMenu->removeAction(action);
1051 VrMenu::executeOrQueue([=](VrMenu* vrMenu) {
1052 vrMenu->removeAction(action);
1053 });
1063}1054}
1064 1055
1065void MenuWrapper::insertAction(QAction* before, QAction* action) {1056void MenuWrapper::insertAction(QAction* before, QAction* action) {