From c1bc3bd1548b8c0dc53e7dbfd525003d0298d86f Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 30 May 2018 16:58:35 -0700
Subject: [PATCH] WIP.

---
 interface/src/Application.cpp | 13 +------------
 interface/src/Application.h   |  4 ----
 interface/src/Menu.cpp        |  5 +----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6a271a276b..23657b184a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3180,11 +3180,6 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) {
     updateSystemTabletMode();
 }
 
-void Application::setShowOverlays(bool value) {
-    _hmdTabletBecomesToolbarSetting.set(value);
-    updateSystemTabletMode();
-}
-
 void Application::setPreferStylusOverLaser(bool value) {
     _preferStylusOverLaserSetting.set(value);
 }
@@ -5130,11 +5125,6 @@ void Application::toggleOverlays() {
     menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays));
 }
 
-void Application::setOverlaysVisible(bool visible) {
-    auto menu = Menu::getInstance();
-    menu->setIsOptionChecked(MenuOption::Overlays, visible);
-}
-
 void Application::centerUI() {
     _overlayConductor.centerUI();
 }
@@ -8274,8 +8264,7 @@ void Application::updateSystemTabletMode() {
         if (isHMDMode()) {
             DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
         } else {
-            // Show toolbar if toolbar is enabled AND the Show Overlays menu option is checked
-            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting() && (Menu::getInstance()->isOptionChecked(MenuOption::Overlays)));
+            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
         }
     }
 }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 856537d8e7..0fea476c07 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -218,12 +218,8 @@ public:
 
     bool getDesktopTabletBecomesToolbarSetting() { return _desktopTabletBecomesToolbarSetting.get(); }
     void setDesktopTabletBecomesToolbarSetting(bool value);
-
     bool getHmdTabletBecomesToolbarSetting() { return _hmdTabletBecomesToolbarSetting.get(); }
     void setHmdTabletBecomesToolbarSetting(bool value);
-
-    void setShowOverlays(bool value);
-
     bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); }
     void setPreferStylusOverLaser(bool value);
     // FIXME: Remove setting completely or make available through JavaScript API?
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 38d319aca2..f55c389a1f 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -240,10 +240,7 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
         0, true, qApp, SLOT(rotationModeChanged()));
 
-    action = addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
-    connect(action, &QAction::triggered, [action] {
-        qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked());
-    });
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
 
     // View > Enter First Person Mode in HMD
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);