Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 06:53:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates

Browse source
This commit is contained in:
Dante Ruiz 2018-05-16 13:49:02 -07:00
commit 237b0d7483
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Menu.cpp
View file

@ -757,9 +757,6 @@ Menu::Menu() {
action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);
connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
// Developer > Display Crash Options
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisplayCrashOptions, 0, true);
// Developer > Stats
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats);

5
interface/src/ui/PreferencesDialog.cpp
View file

@ -79,9 +79,6 @@ void setupPreferences() {
wodSlider->setMin(0);
wodSlider->setMax(2000);
preferences->addPreference(wodSlider);
auto getterSQ = []()->float { return 1.0; };
auto setterSQ = [](float value) { };
preferences->addPreference(new SliderPreference(GRAPHICS_QUALITY, "Shadow Quality", getterSQ, setterSQ));
auto getterShadow = []()->bool {
bool ret = false;
@ -104,7 +101,7 @@ void setupPreferences() {
}
}
};
preferences->addPreference(new CheckPreference(GRAPHICS_QUALITY, "Enable/disable shadows", getterShadow, setterShadow));
preferences->addPreference(new CheckPreference(GRAPHICS_QUALITY, "Show Shadows", getterShadow, setterShadow));
}
// UI