Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make final changes

Browse source
This commit is contained in:
Dante Ruiz 2018-05-18 09:21:41 -07:00
parent 0f122e3dbc
commit ea771c2325
3 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/CrashHandler.cpp
View file

@ -35,6 +35,8 @@ bool CrashHandler::checkForResetSettings(bool wasLikelyCrash, bool suppressPromp
QSettings settings;
settings.beginGroup("Developer");
QVariant displayCrashOptions = settings.value(MenuOption::DisplayCrashOptions);
settings.endGroup();
settings.beginGroup("Settings");
QVariant askToResetSettingsOption = settings.value(MenuOption::AskToResetSettings);
settings.endGroup();
bool askToResetSettings = askToResetSettingsOption.isValid() && askToResetSettingsOption.toBool();

32
interface/src/Menu.cpp
View file

@ -307,35 +307,6 @@ Menu::Menu() {
QString("hifi/tablet/TabletAvatarPreferences.qml"), "AvatarPreferencesDialog");
});
// Settings > Notifications
MenuWrapper * notificationsMenu = settingsMenu->addMenu("Notifications"); //This was in notifications.js. The menu needs to be moved here.
//TODO: Hookup notification actions below.
// Settings > Notifications > Play Notification Sounds
SettingsScriptingInterface* settings = SettingsScriptingInterface::getInstance();
action = addCheckableActionToQMenuAndActionHash(notificationsMenu, "Play Notification Sounds", 0,
settings->getValue(MenuOption::NotificationSounds).toBool());
connect(action, &QAction::triggered, [action, settings] {
settings->setValue(MenuOption::NotificationSounds, action->isChecked());
});
notificationsMenu->addSeparator();
// Settings > Notifications > Play Sounds for:
addDisabledActionAndSeparator(notificationsMenu, "Show notifications for:");
// Settings > Notifications > Snapshot
action = addCheckableActionToQMenuAndActionHash(notificationsMenu, "Snapshot", 0,
settings->getValue(MenuOption::NotificationSoundsSnapshot).toBool());
connect(action, &QAction::triggered, [action, settings] {
settings->setValue(MenuOption::NotificationSoundsSnapshot, action->isChecked());
});
// Settings > Notifications > Tablet
action = addCheckableActionToQMenuAndActionHash(notificationsMenu, "Tablet", 0,
settings->getValue(MenuOption::NotificationSoundsTablet).toBool());
connect(action, &QAction::triggered, [action, settings] {
settings->setValue(MenuOption::NotificationSoundsTablet, action->isChecked());
});
// Settings > Developer Menu
addCheckableActionToQMenuAndActionHash(settingsMenu, "Developer Menu", 0, false, this, SLOT(toggleDeveloperMenus()));
@ -722,9 +693,6 @@ Menu::Menu() {
addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraints, 0, false, qApp, SLOT(setShowBulletConstraints(bool)));
addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraintLimits, 0, false, qApp, SLOT(setShowBulletConstraintLimits(bool)));
// Developer > Ask to Reset Settings
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AskToResetSettings, 0, false);
// Developer > Display Crash Options
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisplayCrashOptions, 0, true);
// Developer > Crash >>>

2
interface/src/Menu.h
View file

@ -137,7 +137,7 @@ namespace MenuOption {
const QString OnlyDisplayTopTen = "Only Display Top Ten";
const QString OpenVrThreadedSubmit = "OpenVR Threaded Submit";
const QString OutputMenu = "Display";
const QString Overlays = "Overlays";
const QString Overlays = "Show Overlays";
const QString PackageModel = "Package Model as .fst...";
const QString Pair = "Pair";
const QString PhysicsShowHulls = "Draw Collision Shapes";