From ea771c232576982e5fdb364a758d2ba90b9608db Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 18 May 2018 09:21:41 -0700
Subject: [PATCH] make final changes

---
 interface/src/CrashHandler.cpp |  2 ++
 interface/src/Menu.cpp         | 32 --------------------------------
 interface/src/Menu.h           |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/interface/src/CrashHandler.cpp b/interface/src/CrashHandler.cpp
index f7d71de3fe..d3079b9bf4 100644
--- a/interface/src/CrashHandler.cpp
+++ b/interface/src/CrashHandler.cpp
@@ -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();
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 499ceae81c..2fed4fc5cd 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -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 >>>
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 4a957fcb69..9be24aa1d9 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -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";