From 71633105de77e193ad7f66c005a879f421ce2d48 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 15 May 2018 11:31:58 -0700
Subject: [PATCH] adding back some menus

---
 interface/src/Menu.cpp                 | 27 ++++++++++++++++++++++++++
 interface/src/ui/PreferencesDialog.cpp |  6 +++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index dad79faedf..5633089019 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -141,9 +141,20 @@ Menu::Menu() {
     // Edit > Reload All Content
     addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
 
+
+    MenuWrapper* avatarMenu = addMenu("Avatar");
     auto avatarManager = DependencyManager::get<AvatarManager>();
     auto avatar = avatarManager->getMyAvatar();
 
+    // Avatar > Attachments...
+    action = addActionToQMenuAndActionHash(avatarMenu, MenuOption::Attachments);
+    connect(action, &QAction::triggered, [] {
+        qApp->showDialog(QString("hifi/dialogs/AttachmentsDialog.qml"),
+                     QString("hifi/tablet/TabletAttachmentsDialog.qml"), "AttachmentsDialog");
+    });
+
+    auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
+    avatarBookmarks->setupMenus(this, avatarMenu);
     // Display menu ----------------------------------
     // FIXME - this is not yet matching Alan's spec because it doesn't have
     // menus for "2D"/"3D" - we need to add support for detecting the appropriate
@@ -772,6 +783,22 @@ Menu::Menu() {
     connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
 #endif
 
+    // console
+    addActionToQMenuAndActionHash(developerMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,
+                                  DependencyManager::get<StandAloneJSConsole>().data(),
+                                  SLOT(toggleConsole()),
+                                  QAction::NoRole,
+                                  UNSPECIFIED_POSITION);
+
+     // Developer > API Debugger
+    action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
+    connect(action, &QAction::triggered, [] {
+        auto scriptEngines = DependencyManager::get<ScriptEngines>();
+        QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
+        defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");
+        scriptEngines->loadScript(defaultScriptsLoc.toString());
+    });
+
     // Developer > Log...
     addActionToQMenuAndActionHash(developerMenu, MenuOption::Log, Qt::CTRL | Qt::SHIFT | Qt::Key_L,
                                   qApp, SLOT(toggleLogDialog()));
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index a1b2c93adc..7e373ac160 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -62,13 +62,13 @@ void setupPreferences() {
     {
         auto getterY = []()->float { return 1.0; };
         auto setterY = [](float value) {  };
-        preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Y Input", getterY, setterY));
+        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, "X Input", getterX, setterX));
+        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, "Scroll Wheel", getterSW, setterSW));
+        preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Zoom", getterSW, setterSW));
     }
     // Graphics quality
     static const QString GRAPHICS_QUALITY { "Graphics Quality" };