History

Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription

ZappoMan committed 8 years ago

Commit cb01bd12 parents 4ad5d34 7c09b21565 files · +16152 −7946Browse files

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

Unified · Split

interface/src/Menu.cpp+9−3
@@ -574,8 +574,6 @@ Menu::Menu() { · 573 unmodified lines
574 avatar.get(), SLOT(setEnableMeshVisible(bool)));574 avatar.get(), SLOT(setEnableMeshVisible(bool)));
575 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisableEyelidAdjustment, 0, false);575 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisableEyelidAdjustment, 0, false);
576 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::TurnWithHead, 0, false);576 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::TurnWithHead, 0, false);
577 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::UseAnimPreAndPostRotations, 0, true,
578 avatar.get(), SLOT(setUseAnimPreAndPostRotations(bool)));
579 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableInverseKinematics, 0, true,577 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableInverseKinematics, 0, true,
580 avatar.get(), SLOT(setEnableInverseKinematics(bool)));578 avatar.get(), SLOT(setEnableInverseKinematics(bool)));
581 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSensorToWorldMatrix, 0, false,579 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSensorToWorldMatrix, 0, false,
@@ -698,7 +696,7 @@ Menu::Menu() { · 116 unmodified lines
698 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,696 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,
699 0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));697 0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));
700 }698 }
701 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);699 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls, 0, false, qApp->getEntities().data(), SIGNAL(setRenderDebugHulls()));
702 700
703 // Developer > Ask to Reset Settings701 // Developer > Ask to Reset Settings
704 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AskToResetSettings, 0, false);702 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AskToResetSettings, 0, false);
@@ -765,6 +763,14 @@ Menu::Menu() { · 60 unmodified lines
765 QString("hifi/tablet/AdvancedPreferencesDialog.qml"), "AdvancedPreferencesDialog");763 QString("hifi/tablet/AdvancedPreferencesDialog.qml"), "AdvancedPreferencesDialog");
766 });764 });
767 765
766 // Developer > API Debugger
767 action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
768 connect(action, &QAction::triggered, [] {
769 auto scriptEngines = DependencyManager::get<ScriptEngines>();
770 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
771 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");
772 scriptEngines->loadScript(defaultScriptsLoc.toString());
773 });
768 774
769#if 0 /// -------------- REMOVED FOR NOW --------------775#if 0 /// -------------- REMOVED FOR NOW --------------
770 addDisabledActionAndSeparator(navigateMenu, "History");776 addDisabledActionAndSeparator(navigateMenu, "History");