add menu option for AvatarEntitiesBookmarks

interface/src/Application.cpp

@@ -64,6 +64,7 @@
 #include <Midi.h>
 #include <AudioInjectorManager.h>
 #include <AvatarBookmarks.h>
+#include <AvatarEntitiesBookmarks.h>
 #include <CursorManager.h>
 #include <DebugDraw.h>
 #include <DeferredLightingEffect.h>
@@ -701,6 +702,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<GooglePolyScriptingInterface>();
     DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
     DependencyManager::set<AvatarBookmarks>();
+    DependencyManager::set<AvatarEntitiesBookmarks>();
     DependencyManager::set<LocationBookmarks>();
     DependencyManager::set<Snapshot>();
     DependencyManager::set<CloseEventSender>();
@@ -2367,6 +2369,7 @@ void Application::initializeUi() {
     surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
     surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
+    surfaceContext->setContextProperty("AvatarEntitiesBookmarks", DependencyManager::get<AvatarEntitiesBookmarks>().data());
     surfaceContext->setContextProperty("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
 
     // Caches
@@ -5762,6 +5765,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
     scriptEngine->registerGlobalObject("AudioScope", DependencyManager::get<AudioScope>().data());
     scriptEngine->registerGlobalObject("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
+    scriptEngine->registerGlobalObject("AvatarEntitiesBookmarks", DependencyManager::get<AvatarEntitiesBookmarks>().data());
     scriptEngine->registerGlobalObject("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
 
     scriptEngine->registerGlobalObject("RayPick", DependencyManager::get<RayPickScriptingInterface>().data());

interface/src/AvatarEntitiesBookmarks.cpp

@@ -0,0 +1,85 @@
+//
+//  AvatarEntitiesBookmarks.cpp
+//  interface/src
+//
+//  Created by Dante Ruiz on /01/18.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <QAction>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QStandardPaths>
+#include <QQmlContext>
+#include <QList>
+
+#include <Application.h>
+#include <OffscreenUi.h>
+#include <avatar/AvatarManager.h>
+
+#include "MainWindow.h"
+#include "Menu.h"
+#include "AvatarEntitiesBookmarks.h"
+#include "InterfaceLogging.h"
+
+#include "QVariantGLM.h"
+
+#include <QtQuick/QQuickWindow>
+
+AvatarEntitiesBookmarks::AvatarEntitiesBookmarks() {
+    _bookmarksFilename = PathUtils::getAppDataPath() + "/" + AVATAR_ENTITIES_BOOKMARKS_FILENAME;
+    readFromFile();
+}
+
+void AvatarEntitiesBookmarks::readFromFile() {
+    QString oldConfigPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + AVATAR_ENTITIES_BOOKMARKS_FILENAME;
+    QFile oldConfig(oldConfigPath);
+    // I imagine that in a year from now, this code for migrating (as well as the two lines above)
+    // may be removed since all bookmarks should have been migrated by then
+    // - Robbie Uvanni (6.8.2017)
+    if (oldConfig.exists()) {
+        if (QDir().rename(oldConfigPath, _bookmarksFilename)) {
+            qCDebug(interfaceapp) << "Successfully migrated" << AVATAR_ENTITIES_BOOKMARKS_FILENAME;
+        } else {
+            qCDebug(interfaceapp) << "Failed to migrate" << AVATAR_ENTITIES_BOOKMARKS_FILENAME;
+        }
+    }
+
+    Bookmarks::readFromFile();
+}
+
+void AvatarEntitiesBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
+    auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkAvatarEntities);
+    QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(addBookmark()), Qt::QueuedConnection);
+    _bookmarksMenu = menu->addMenu(MenuOption::AvatarEntitiesBookmarks);
+    _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteAvatarBookmark);
+    QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
+
+    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it) {
+        addBookmarkToMenu(menubar, it.key(), it.value());
+    }
+
+    Bookmarks::sortActions(menubar, _bookmarksMenu);
+}
+
+void AvatarEntitiesBookmarks::applyBookmarkedAvatarEntities() {
+}
+
+void AvatarEntitiesBookmarks::addBookmark() {
+}
+
+void AvatarEntitiesBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) {
+    QAction* changeAction = _bookmarksMenu->newAction();
+    changeAction->setData(bookmark);
+    connect(changeAction, SIGNAL(triggered()), this, SLOT(applyBookedAvatarEntities()));
+    if (!_isMenuSorted) {
+        menubar->addActionToQMenuAndActionHash(_bookmarksMenu, changeAction, name, 0, QAction::NoRole);
+    } else {
+        // TODO: this is aggressive but other alternatives have proved less fruitful so far.
+        menubar->addActionToQMenuAndActionHash(_bookmarksMenu, changeAction, name, 0, QAction::NoRole);
+        Bookmarks::sortActions(menubar, _bookmarksMenu);
+    }
+}

interface/src/AvatarEntitiesBookmarks.h

@@ -0,0 +1,45 @@
+//
+//  AvatarEntitiesBookmarks.h
+//  interface/src
+//
+//  Created by Dante Ruiz on 15/01/18.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AvatarEntitiesBookmarks_h
+#define hifi_AvatarEntitiesBookmarks_h
+
+#include <DependencyManager.h>
+#include "Bookmarks.h"
+
+class AvatarEntitiesBookmarks: public Bookmarks, public Dependency {
+  Q_OBJECT
+  SINGLETON_DEPENDENCY
+
+public:
+    AvatarEntitiesBookmarks();
+    void setupMenus(Menu* menubar, MenuWrapper* menu) override;
+
+public slots:
+    void addBookmark();
+
+protected:
+    void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) override;
+    void readFromFile() override;
+
+private:
+    const QString AVATAR_ENTITIES_BOOKMARKS_FILENAME = "AvatarEntitiesbookmarks.json";
+    const QString AVATAR_ENTITIES_ATTACHMENTS = "AvatarEntitiesName";
+    const QString ENTITY_PROPERTIES = "AvatarEntitiesData";
+    const QString ENTRY_VERSION = "version";
+
+    const int ATTACHMENT_BOOKMARK_VERSION = 1;
+
+private slots:
+  void applyBookmarkedAvatarEntities();
+};
+
+#endif

interface/src/Menu.cpp

@@ -34,6 +34,7 @@
 #include "audio/AudioScope.h"
 #include "avatar/AvatarManager.h"
 #include "AvatarBookmarks.h"
+#include "AvatarEntitiesBookmarks.h"
 #include "devices/DdeFaceTracker.h"
 #include "MainWindow.h"
 #include "render/DrawStatus.h"
@@ -206,6 +207,9 @@ Menu::Menu() {
     auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
     avatarBookmarks->setupMenus(this, avatarMenu);
 
+    auto avatarEntitiesBookmarks = DependencyManager::get<AvatarEntitiesBookmarks>();
+    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

interface/src/Menu.h

@@ -46,9 +46,11 @@ namespace MenuOption {
     const QString AutoMuteAudio = "Auto Mute Microphone";
     const QString AvatarReceiveStats = "Show Receive Stats";
     const QString AvatarBookmarks = "Avatar Bookmarks";
+    const QString AvatarEntitiesBookmarks = "Avatar Entities  Bookmarks";
     const QString Back = "Back";
     const QString BinaryEyelidControl = "Binary Eyelid Control";
     const QString BookmarkAvatar = "Bookmark Avatar";
+    const QString BookmarkAvatarEntities = "Bookmark Avatar Entities";
     const QString BookmarkLocation = "Bookmark Location";
     const QString CalibrateCamera = "Calibrate Camera";
     const QString CameraEntityMode = "Entity Mode";