create AvatarBookmarks

derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted

interface/resources/qml/dialogs/preferences/AvatarPreference.qml

@@ -15,8 +15,9 @@ import "../../controls-uit"
 
 Preference {
     id: root
+    objectName: "avatarPreferencesRoot"
+    signal bookmarkAvatarSignal()
     property alias text: dataTextField.text
-    property alias buttonText: button.text
     property alias placeholderText: dataTextField.placeholderText
     property var browser;
     height: control.height + hifi.dimensions.controlInterlineHeight
@@ -58,7 +59,7 @@ Preference {
             right: parent.right
             bottom: parent.bottom
         }
-        height: Math.max(dataTextField.controlHeight, button.height)
+        height: dataTextField.controlHeight + bookmarkAvatarButton.height + hifi.dimensions.contentSpacing.y
 
         TextField {
             id: dataTextField
@@ -67,19 +68,33 @@ Preference {
             label: root.label
             anchors {
                 left: parent.left
-                right: button.left
-                rightMargin: hifi.dimensions.contentSpacing.x
-                bottom: parent.bottom
+                right: parent.right
+                bottom: bookmarkAvatarButton.top
+                bottomMargin: hifi.dimensions.contentSpacing.y
             }
             colorScheme: hifi.colorSchemes.dark
         }
 
         Button {
-            id: button
-            text: "Browse"
+            id: bookmarkAvatarButton
+            text: "Bookmark Avatar"
+            width: 140
             anchors {
-                right: parent.right
-                verticalCenter: dataTextField.verticalCenter
+                left: parent.left
+                bottom: parent.bottom
+                rightMargin: hifi.dimensions.contentSpacing.x
+            }
+            onClicked: root.bookmarkAvatarSignal()
+        }
+
+        Button {
+            id: browseAvatarsButton
+            text: "Browse Avatars"
+            width: 140
+            anchors {
+                left: bookmarkAvatarButton.right
+                bottom: parent.bottom
+                leftMargin: hifi.dimensions.contentSpacing.x
             }
             onClicked: {
                 // Load dialog via OffscreenUi so that JavaScript EventBridge is available.
@@ -89,5 +104,6 @@ Preference {
                 });
             }
         }
+
     }
 }

interface/src/Application.cpp

@@ -691,7 +691,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         usleep(USECS_PER_MSEC * 50); // 20hz
     }
 
-    _bookmarks = new Bookmarks();  // Before setting up the menu
+    _locationBookmarks = new LocationBookmarks();  // Before setting up the menu
+    _avatarBookmarks = new AvatarBookmarks();
 
     // start the nodeThread so its event loop is running
     QThread* nodeThread = new QThread(this);

interface/src/Application.h

@@ -52,7 +52,8 @@
 
 #include "avatar/MyAvatar.h"
 #include "BandwidthRecorder.h"
-#include "Bookmarks.h"
+#include "LocationBookmarks.h"
+#include "AvatarBookmarks.h"
 #include "Camera.h"
 #include "ConnectionMonitor.h"
 #include "gpu/Context.h"
@@ -263,7 +264,8 @@ public:
     glm::mat4 getEyeProjection(int eye) const;
 
     QRect getDesirableApplicationGeometry() const;
-    Bookmarks* getBookmarks() const { return _bookmarks; }
+    LocationBookmarks* getLocationBookmarks() const { return _locationBookmarks; }
+    AvatarBookmarks* getAvatarBookmarks() const { return _avatarBookmarks; }
 
     virtual bool canAcceptURL(const QString& url) const override;
     virtual bool acceptURL(const QString& url, bool defaultUpload = false) override;
@@ -596,7 +598,8 @@ private:
 
     bool _aboutToQuit;
 
-    Bookmarks* _bookmarks;
+    QPointer<LocationBookmarks> _locationBookmarks;
+    QPointer<AvatarBookmarks> _avatarBookmarks;
 
     bool _notifiedPacketVersionMismatchThisDomain;
 

interface/src/AvatarBookmarks.cpp

@@ -0,0 +1,116 @@
+//
+//  AvatarBookmarks.cpp
+//  interface/src
+//
+//  Created by Triplelexx on 23/03/17.
+//  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 <Application.h>
+#include <OffscreenUi.h>
+
+#include "MainWindow.h"
+#include "Menu.h"
+
+#include <avatar/AvatarManager.h>
+
+#include "AvatarBookmarks.h"
+#include <QtQuick/QQuickWindow>
+
+AvatarBookmarks::AvatarBookmarks() {
+    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/" + AvatarBookmarks_FILENAME;
+    readFromFile();
+}
+
+void AvatarBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
+    // Add menus/actions
+    auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkAvatar);
+    QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(addBookmark()), Qt::QueuedConnection);
+    _bookmarksMenu = menu->addMenu(MenuOption::AvatarBookmarks);
+    _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteAvatarBookmark);
+    QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
+
+    Bookmarks::setupMenus(menubar, menu);
+
+    // connect bookmarkAvatarButton in AvatarPreferencesDialog.qml
+
+    // TODO: attempt at connecting to bookmarkAvatarSignal in AvatarPreferencesDialog.qml
+    // the OffscreenUi doesn't seem available this early to recurse through to find the root object where the signal is declared
+    // I've added a delay for now
+
+    // The OffscreenUi also doesn't create the object till it is shown first, so I'm forcing it to show so the object exists
+    QTimer::singleShot(2000, [&] {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        offscreenUi->show(QString("hifi/dialogs/AvatarPreferencesDialog.qml"), "AvatarPreferencesDialog");
+        auto bookmarkAvatarButton = offscreenUi->getRootItem()->findChild<QQuickItem*>("avatarPreferencesRoot");
+        if (bookmarkAvatarButton) {
+            QObject::connect(bookmarkAvatarButton, SIGNAL(bookmarkAvatarSignal()), this, SLOT(addBookmark()));
+        }
+    });
+}
+
+void AvatarBookmarks::changeToBookmarkedAvatar() {
+    QAction* action = qobject_cast<QAction*>(sender());
+    const QString& address = action->data().toString();
+
+    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+    myAvatar->useFullAvatarURL(address);
+}
+
+void AvatarBookmarks::addBookmark() {
+    // TODO:  if you press the Bookmark Avatar button in the dialog it seems to maintain focus.
+    // Clicking afterwards results in multiple calls
+    //  hide enforced till cause is determined 
+    DependencyManager::get<OffscreenUi>()->hide(QString("AvatarPreferencesDialog"));
+
+    bool ok = false;
+    auto bookmarkName = OffscreenUi::getText(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString(), &ok);
+    if (!ok) {
+        return;
+    }
+
+    bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
+    if (bookmarkName.length() == 0) {
+        return;
+    }
+
+    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+    const QString& bookmarkAddress = myAvatar->getSkeletonModelURL().toString();
+
+    Menu* menubar = Menu::getInstance();
+    if (contains(bookmarkName)) {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        auto duplicateBookmarkMessage = offscreenUi->createMessageBox(OffscreenUi::ICON_WARNING, "Duplicate Bookmark",
+            "The bookmark name you entered already exists in your list.",
+            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+        duplicateBookmarkMessage->setProperty("informativeText", "Would you like to overwrite it?");
+
+        auto result = offscreenUi->waitForMessageBoxResult(duplicateBookmarkMessage);
+        if (result != QMessageBox::Yes) {
+            return;
+        }
+        removeBookmarkFromMenu(menubar, bookmarkName);
+    }
+
+    addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
+    insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
+
+    enableMenuItems(true);
+}
+
+void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {
+    QAction* changeAction = _bookmarksMenu->newAction();
+    changeAction->setData(address);
+    connect(changeAction, SIGNAL(triggered()), this, SLOT(changeToBookmarkedAvatar()));
+
+    menubar->addActionToQMenuAndActionHash(_bookmarksMenu, changeAction,
+        name, 0, QAction::NoRole);
+}

interface/src/AvatarBookmarks.h

@@ -0,0 +1,38 @@
+//
+//  AvatarBookmarks.h
+//  interface/src
+//
+//  Created by Triplelexx on 23/03/17.
+//  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_AvatarBookmarks_h
+#define hifi_AvatarBookmarks_h
+
+#include "Bookmarks.h"
+
+class AvatarBookmarks: public Bookmarks {
+    Q_OBJECT
+
+public:
+    AvatarBookmarks();
+
+    virtual void setupMenus(Menu* menubar, MenuWrapper* menu) override;
+
+public slots:
+    virtual void addBookmark() override;
+
+protected:
+    virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
+
+private slots:
+void changeToBookmarkedAvatar();
+
+private:
+    const QString AvatarBookmarks_FILENAME = "avatarbookmarks.json";
+};
+
+#endif // hifi_AvatarBookmarks_h

interface/src/Bookmarks.cpp

@@ -11,14 +11,10 @@
 
 #include <QAction>
 #include <QDebug>
-#include <QJsonObject>
-#include <QFile>
 #include <QInputDialog>
-#include <QJsonDocument>
 #include <QMessageBox>
 #include <QStandardPaths>
 
-#include <AddressManager.h>
 #include <Application.h>
 #include <OffscreenUi.h>
 
@@ -27,15 +23,47 @@
 #include "InterfaceLogging.h"
 
 #include "Bookmarks.h"
-#include <QtQuick/QQuickWindow>
-
-
-const QString Bookmarks::HOME_BOOKMARK = "Home";
 
 
 Bookmarks::Bookmarks() {
-    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + BOOKMARKS_FILENAME;
-    readFromFile();
+}
+
+void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
+    // Enable/Disable menus as needed
+    enableMenuItems(_bookmarks.count() > 0);
+
+    // Load Bookmarks
+    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it) {
+        QString bookmarkName = it.key();
+        QString bookmarkAddress = it.value().toString();
+        addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
+    }
+}
+
+void Bookmarks::deleteBookmark() {
+    QStringList bookmarkList;
+    QList<QAction*> menuItems = _bookmarksMenu->actions();
+    for (int i = 0; i < menuItems.count(); i += 1) {
+        bookmarkList.append(menuItems[i]->text());
+    }
+
+    bool ok = false;
+    auto bookmarkName = OffscreenUi::getItem(OffscreenUi::ICON_PLACEMARK, "Delete Bookmark", "Select the bookmark to delete", bookmarkList, 0, false, &ok);
+    if (!ok) {
+        return;
+    }
+
+    bookmarkName = bookmarkName.trimmed();
+    if (bookmarkName.length() == 0) {
+        return;
+    }
+
+    removeBookmarkFromMenu(Menu::getInstance(), bookmarkName);
+    remove(bookmarkName);
+
+    if (_bookmarksMenu->actions().count() == 0) {
+        enableMenuItems(false);
+    }
 }
 
 void Bookmarks::insert(const QString& name, const QString& address) {
@@ -99,108 +127,6 @@ void Bookmarks::persistToFile() {
     saveFile.write(data);
 }
 
-void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
-    // Add menus/actions
-    auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation);
-    QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(bookmarkLocation()), Qt::QueuedConnection);
-    auto setHomeAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::SetHomeLocation);
-    QObject::connect(setHomeAction, SIGNAL(triggered()), this, SLOT(setHomeLocation()), Qt::QueuedConnection);
-    _bookmarksMenu = menu->addMenu(MenuOption::Bookmarks);
-    _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark);
-    QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
-    
-    // Enable/Disable menus as needed
-    enableMenuItems(_bookmarks.count() > 0);
-    
-    // Load bookmarks
-    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it ) {
-        QString bookmarkName = it.key();
-        QString bookmarkAddress = it.value().toString();
-        addLocationToMenu(menubar, bookmarkName, bookmarkAddress);
-    }
-}
-
-void Bookmarks::bookmarkLocation() {
-    bool ok = false;
-    auto bookmarkName = OffscreenUi::getText(OffscreenUi::ICON_PLACEMARK, "Bookmark Location", "Name", QString(), &ok);
-    if (!ok) {
-        return;
-    }
-    
-    bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
-    if (bookmarkName.length() == 0) {
-        return;
-    }
-    
-    auto addressManager = DependencyManager::get<AddressManager>();
-    QString bookmarkAddress = addressManager->currentAddress().toString();
-    
-    Menu* menubar = Menu::getInstance();
-    if (contains(bookmarkName)) {
-        auto offscreenUi = DependencyManager::get<OffscreenUi>();
-        auto duplicateBookmarkMessage = offscreenUi->createMessageBox(OffscreenUi::ICON_WARNING, "Duplicate Bookmark",
-            "The bookmark name you entered already exists in your list.",
-            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-        duplicateBookmarkMessage->setProperty("informativeText", "Would you like to overwrite it?");
-
-        auto result = offscreenUi->waitForMessageBoxResult(duplicateBookmarkMessage);
-        if (result != QMessageBox::Yes) {
-            return;
-        }
-        removeLocationFromMenu(menubar, bookmarkName);
-    }
-    
-    addLocationToMenu(menubar, bookmarkName, bookmarkAddress);
-    insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
-    
-    enableMenuItems(true);
-}
-
-void Bookmarks::setHomeLocation() {
-    Menu* menubar = Menu::getInstance();
-    QString bookmarkName = HOME_BOOKMARK;
-    auto addressManager = DependencyManager::get<AddressManager>();
-    QString bookmarkAddress = addressManager->currentAddress().toString();
-
-    addLocationToMenu(menubar, bookmarkName, bookmarkAddress);
-    insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
-
-    enableMenuItems(true);
-}
-
-void Bookmarks::teleportToBookmark() {
-    QAction* action = qobject_cast<QAction*>(sender());
-    QString address = action->data().toString();
-    DependencyManager::get<AddressManager>()->handleLookupString(address);
-}
-
-void Bookmarks::deleteBookmark() {
-    
-    QStringList bookmarkList;
-    QList<QAction*> menuItems = _bookmarksMenu->actions();
-    for (int i = 0; i < menuItems.count(); i += 1) {
-        bookmarkList.append(menuItems[i]->text());
-    }
-    
-    bool ok = false;
-    auto bookmarkName = OffscreenUi::getItem(OffscreenUi::ICON_PLACEMARK, "Delete Bookmark", "Select the bookmark to delete", bookmarkList, 0, false, &ok);
-    if (!ok) {
-        return;
-    }
-    
-    bookmarkName = bookmarkName.trimmed();
-    if (bookmarkName.length() == 0) {
-        return;
-    }
-    
-    removeLocationFromMenu(Menu::getInstance(), bookmarkName);
-    remove(bookmarkName);
-    
-    if (_bookmarksMenu->actions().count() == 0) {
-        enableMenuItems(false);
-    }
-}
-
 void Bookmarks::enableMenuItems(bool enabled) {
     if (_bookmarksMenu) {
         _bookmarksMenu->setEnabled(enabled);
@@ -210,17 +136,6 @@ void Bookmarks::enableMenuItems(bool enabled) {
     }
 }
 
-void Bookmarks::addLocationToMenu(Menu* menubar, QString& name, QString& address) {
-    QAction* teleportAction = _bookmarksMenu->newAction();
-    teleportAction->setData(address);
-    connect(teleportAction, SIGNAL(triggered()), this, SLOT(teleportToBookmark()));
-    
-    menubar->addActionToQMenuAndActionHash(_bookmarksMenu, teleportAction,
-                                           name, 0, QAction::NoRole);
-}
-
-void Bookmarks::removeLocationFromMenu(Menu* menubar, QString& name) {
+void Bookmarks::removeBookmarkFromMenu(Menu* menubar, const QString& name) {
     menubar->removeAction(_bookmarksMenu, name);
 }
-
-

interface/src/Bookmarks.h

@@ -27,25 +27,21 @@ class Bookmarks: public QObject {
 public:
     Bookmarks();
 
-    void setupMenus(Menu* menubar, MenuWrapper* menu);
-
+    virtual void setupMenus(Menu* menubar, MenuWrapper* menu);
     QString addressForBookmark(const QString& name) const;
 
-    static const QString HOME_BOOKMARK;
+public slots:
+    virtual void addBookmark() = 0;
 
-private slots:
-    void bookmarkLocation();
-    void setHomeLocation();
-    void teleportToBookmark();
+protected slots:
     void deleteBookmark();
     
-private:
-    QVariantMap _bookmarks;  // { name: address, ... }
+protected:
+    QVariantMap _bookmarks;  // { name: url, ... }
     
     QPointer<MenuWrapper> _bookmarksMenu;
     QPointer<QAction> _deleteBookmarksAction;
 
-    const QString BOOKMARKS_FILENAME = "bookmarks.json";
     QString _bookmarksFilename;
     
     void insert(const QString& name, const QString& address);  // Overwrites any existing entry with same name.
@@ -56,8 +52,8 @@ private:
     void persistToFile();
 
     void enableMenuItems(bool enabled);
-    void addLocationToMenu(Menu* menubar, QString& name, QString& address);
-    void removeLocationFromMenu(Menu* menubar, QString& name);
+    virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) = 0;
+    void removeBookmarkFromMenu(Menu* menubar, const QString& name);
 };
 
-#endif // hifi_Bookmarks_h
+#endif // hifi_Bookmarks_h

interface/src/LocationBookmarks.cpp

@@ -0,0 +1,108 @@
+//
+//  LocationBookmarks.cpp
+//  interface/src
+//
+//  Created by Triplelexx on 23/03/17.
+//  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 <AddressManager.h>
+#include <Application.h>
+#include <OffscreenUi.h>
+
+#include "MainWindow.h"
+#include "Menu.h"
+
+#include "LocationBookmarks.h"
+#include <QtQuick/QQuickWindow>
+
+const QString LocationBookmarks::HOME_BOOKMARK = "Home";
+
+LocationBookmarks::LocationBookmarks() {
+    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + LocationBookmarks_FILENAME;
+    readFromFile();
+}
+
+void LocationBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
+    // Add menus/actions
+    auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation);
+    QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(addBookmark()), Qt::QueuedConnection);
+    auto setHomeAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::SetHomeLocation);
+    QObject::connect(setHomeAction, SIGNAL(triggered()), this, SLOT(setHomeLocation()), Qt::QueuedConnection);
+    _bookmarksMenu = menu->addMenu(MenuOption::LocationBookmarks);
+    _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark);
+    QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
+    
+    Bookmarks::setupMenus(menubar, menu);
+}
+
+void LocationBookmarks::setHomeLocation() {
+    Menu* menubar = Menu::getInstance();
+    QString bookmarkName = HOME_BOOKMARK;
+    auto addressManager = DependencyManager::get<AddressManager>();
+    QString bookmarkAddress = addressManager->currentAddress().toString();
+
+    addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
+    insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
+
+    enableMenuItems(true);
+}
+
+void LocationBookmarks::teleportToBookmark() {
+    QAction* action = qobject_cast<QAction*>(sender());
+    QString address = action->data().toString();
+    DependencyManager::get<AddressManager>()->handleLookupString(address);
+}
+
+void LocationBookmarks::addBookmark() {
+    bool ok = false;
+    auto bookmarkName = OffscreenUi::getText(OffscreenUi::ICON_PLACEMARK, "Bookmark Location", "Name", QString(), &ok);
+    if (!ok) {
+        return;
+    }
+
+    bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
+    if (bookmarkName.length() == 0) {
+        return;
+    }
+
+    auto addressManager = DependencyManager::get<AddressManager>();
+    QString bookmarkAddress = addressManager->currentAddress().toString();
+
+    Menu* menubar = Menu::getInstance();
+    if (contains(bookmarkName)) {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        auto duplicateBookmarkMessage = offscreenUi->createMessageBox(OffscreenUi::ICON_WARNING, "Duplicate Bookmark",
+            "The bookmark name you entered already exists in your list.",
+            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+        duplicateBookmarkMessage->setProperty("informativeText", "Would you like to overwrite it?");
+
+        auto result = offscreenUi->waitForMessageBoxResult(duplicateBookmarkMessage);
+        if (result != QMessageBox::Yes) {
+            return;
+        }
+        removeBookmarkFromMenu(menubar, bookmarkName);
+    }
+
+    addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
+    insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
+
+    enableMenuItems(true);
+}
+
+void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {
+    QAction* teleportAction = _bookmarksMenu->newAction();
+    teleportAction->setData(address);
+    connect(teleportAction, SIGNAL(triggered()), this, SLOT(teleportToBookmark()));
+    
+    menubar->addActionToQMenuAndActionHash(_bookmarksMenu, teleportAction,
+                                           name, 0, QAction::NoRole);
+}

interface/src/LocationBookmarks.h

@@ -0,0 +1,40 @@
+//
+//  LocationBookmarks.h
+//  interface/src
+//
+//  Created by Triplelexx on 23/03/17.
+//  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_LocationBookmarks_h
+#define hifi_LocationBookmarks_h
+
+#include "Bookmarks.h"
+
+class LocationBookmarks: public Bookmarks {
+    Q_OBJECT
+
+public:
+    LocationBookmarks();
+
+    virtual void setupMenus(Menu* menubar, MenuWrapper* menu) override;
+    static const QString HOME_BOOKMARK;
+
+public slots:
+    virtual void addBookmark() override;
+
+protected:
+    virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
+
+private slots:
+    void setHomeLocation();
+    void teleportToBookmark();
+    
+private:
+    const QString LocationBookmarks_FILENAME = "bookmarks.json";
+};
+
+#endif // hifi_LocationBookmarks_h

interface/src/Menu.cpp

@@ -194,6 +194,8 @@ Menu::Menu() {
         0, // QML Qt::Key_Apostrophe,
         qApp, SLOT(resetSensors()));
 
+    // Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here.
+    qApp->getAvatarBookmarks()->setupMenus(this, avatarMenu);
 
     // Display menu ----------------------------------
     // FIXME - this is not yet matching Alan's spec because it doesn't have
@@ -256,8 +258,8 @@ Menu::Menu() {
     addActionToQMenuAndActionHash(navigateMenu, MenuOption::AddressBar, Qt::CTRL | Qt::Key_L,
         dialogsManager.data(), SLOT(toggleAddressBar()));
 
-    // Navigate > Bookmark related menus -- Note: the Bookmark class adds its own submenus here.
-    qApp->getBookmarks()->setupMenus(this, navigateMenu);
+    // Navigate > LocationBookmarks related menus -- Note: the LocationBookmarks class adds its own submenus here.
+    qApp->getLocationBookmarks()->setupMenus(this, navigateMenu);
 
     // Navigate > Copy Address [advanced]
     auto addressManager = DependencyManager::get<AddressManager>();

interface/src/Menu.h

@@ -47,10 +47,11 @@ namespace MenuOption {
     const QString AudioTools = "Show Level Meter";
     const QString AutoMuteAudio = "Auto Mute Microphone";
     const QString AvatarReceiveStats = "Show Receive Stats";
+    const QString AvatarBookmarks = "Avatar Bookmarks";
     const QString Back = "Back";
     const QString BinaryEyelidControl = "Binary Eyelid Control";
+    const QString BookmarkAvatar = "Bookmark Avatar";
     const QString BookmarkLocation = "Bookmark Location";
-    const QString Bookmarks = "Bookmarks";
     const QString CalibrateCamera = "Calibrate Camera";
     const QString CameraEntityMode = "Entity Mode";
     const QString CenterPlayerInView = "Center Player In View";
@@ -78,6 +79,7 @@ namespace MenuOption {
     const QString DeadlockInterface = "Deadlock Interface";
     const QString DecreaseAvatarSize = "Decrease Avatar Size";
     const QString DefaultSkybox = "Default Skybox";
+    const QString DeleteAvatarBookmark = "Delete Avatar Bookmark...";
     const QString DeleteBookmark = "Delete Bookmark...";
     const QString DisableActivityLogger = "Disable Activity Logger";
     const QString DisableEyelidAdjustment = "Disable Eyelid Adjustment";
@@ -89,6 +91,7 @@ namespace MenuOption {
     const QString DisplayModelElementChildProxies = "Display Model Element Children";
     const QString DisplayModelElementProxy = "Display Model Element Bounds";
     const QString DisplayDebugTimingDetails = "Display Timing Details";
+    const QString LocationBookmarks = "Bookmarks";
     const QString DontDoPrecisionPicking = "Don't Do Precision Picking";
     const QString DontRenderEntitiesAsScene = "Don't Render Entities as Scene";
     const QString EchoLocalAudio = "Echo Local Audio";

interface/src/ui/AddressBarDialog.cpp

@@ -52,7 +52,7 @@ void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions)
 
 void AddressBarDialog::loadHome() {
     qDebug() << "Called LoadHome";
-    QString homeLocation = qApp->getBookmarks()->addressForBookmark(Bookmarks::HOME_BOOKMARK);
+    QString homeLocation = qApp->getLocationBookmarks()->addressForBookmark(LocationBookmarks::HOME_BOOKMARK);
     const QString DEFAULT_HOME_LOCATION = "localhost";
     if (homeLocation == "") {
         homeLocation = DEFAULT_HOME_LOCATION;