From 3be4b01d2c7e815bf2781284f2f55c526049a88d Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 16 May 2018 14:36:55 -0700
Subject: [PATCH] move overlays menu back

---
 interface/src/Application.cpp          |  8 ++++++--
 interface/src/Application.h            |  3 ---
 interface/src/Menu.cpp                 |  2 ++
 interface/src/ui/OverlayConductor.cpp  |  2 +-
 interface/src/ui/PreferencesDialog.cpp | 12 ------------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0bdf358aa2..303089fc14 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5104,10 +5104,14 @@ void Application::updateThreads(float deltaTime) {
     }
 }
 
-void Application::toggleOverlays() {}
+void Application::toggleOverlays() {
+    auto meu = Menu::getInstance();
+    menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(menuOption::Overlays));
+}
 
 void Application::setOverlaysVisible(bool visible) {
-    _overlaysVisible = visible;
+    auto menu = Menu::getInstance();
+    menu->setIsOptionChecked(MenuOption::Overlays, visible)
 }
 
 void Application::centerUI() {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 4a3bc22de0..5a29dd23e8 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -377,7 +377,6 @@ public slots:
     void cameraMenuChanged();
     void toggleOverlays();
     void setOverlaysVisible(bool visible);
-    bool getOverlaysVisible() { return _overlaysVisible; };
     Q_INVOKABLE void centerUI();
 
     void resetPhysicsReadyInformation();
@@ -694,8 +693,6 @@ private:
 
     bool _fakedMouseEvent { false };
 
-    bool _overlaysVisible { true };
-
     void checkChangeCursor();
     mutable QMutex _changeCursorLock { QMutex::Recursive };
     Qt::CursorShape _desiredCursor{ Qt::BlankCursor };
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index fe49ec3d8a..9b21a06483 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -239,6 +239,8 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
         0, true, qApp, SLOT(rotationModeChanged()));
 
+    addCheckableActrionToQMenuActionHash(viewMenu, MenuOption::Overlays, 0, true);
+
     // View > Enter First Person Mode in HMD
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);
 
diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index 5393306286..e7e3c91d13 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -144,7 +144,7 @@ void OverlayConductor::update(float dt) {
     }
 
 
-    bool targetVisible = qApp->getOverlaysVisible() && (0 == (_flags & SuppressMask));
+    bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && (0 == (_flags & SuppressMask));
     if (targetVisible != currentVisible) {
         offscreenUi->setPinned(!targetVisible);
     }
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index ede02c5016..083ed68090 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -58,18 +58,6 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
 
-    static const QString MOUSE_SENSIVITY { "Mouse Sensivity" };
-    {
-        auto getterY = []()->float { return 1.0; };
-        auto setterY = [](float value) {  };
-        preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Y", getterY, setterY));
-        auto getterX = []()->float { return 1.0; };
-        auto setterX = [](float value) { };
-        preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look X", getterX, setterX));
-        auto getterSW = []()->float { return 1.0; };
-        auto setterSW = [](float value) { };
-        preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Zoom", getterSW, setterSW));
-    }
     // Graphics quality
     static const QString GRAPHICS_QUALITY { "Graphics Quality" };
     {