Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:36:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add user locations to menu

Browse source
This commit is contained in:
Ryan Huffman 2014-06-26 16:06:49 -07:00
parent cde36dc70d
commit 33e11be3e0
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Menu.cpp
View file

@ -45,6 +45,7 @@
#include "ui/ModelsBrowser.h" #include "ui/ModelsBrowser.h"
#include "ui/LoginDialog.h" #include "ui/LoginDialog.h"
#include "ui/NodeBounds.h" #include "ui/NodeBounds.h"
#include "ui/UserLocationsWindow.h"
#include "devices/OculusManager.h" #include "devices/OculusManager.h"
@ -165,6 +166,11 @@ Menu::Menu() :
Qt::CTRL | Qt::Key_N, Qt::CTRL | Qt::Key_N,
this, this,
SLOT(nameLocation())); SLOT(nameLocation()));
addActionToQMenuAndActionHash(fileMenu,
MenuOption::MyLocations,
Qt::CTRL | Qt::Key_L,
this,
SLOT(showLocationList()));
addActionToQMenuAndActionHash(fileMenu, addActionToQMenuAndActionHash(fileMenu,
MenuOption::GoTo, MenuOption::GoTo,
Qt::Key_At, Qt::Key_At,
@ -1179,6 +1185,11 @@ void Menu::namedLocationCreated(LocationManager::NamedLocationCreateResponse res
msgBox.exec(); msgBox.exec();
} }
void Menu::showLocationList() {
UserLocationsWindow* window = new UserLocationsWindow();
window->show();
}
void Menu::nameLocation() { void Menu::nameLocation() {
// check if user is logged in or show login dialog if not // check if user is logged in or show login dialog if not

2
interface/src/Menu.h
View file

@ -193,6 +193,7 @@ private slots:
void goToDomainDialog(); void goToDomainDialog();
void goToLocation(); void goToLocation();
void nameLocation(); void nameLocation();
void showLocationList();
void bandwidthDetailsClosed(); void bandwidthDetailsClosed();
void octreeStatsDetailsClosed(); void octreeStatsDetailsClosed();
void lodToolsClosed(); void lodToolsClosed();
@ -387,6 +388,7 @@ namespace MenuOption {
const QString MoveWithLean = "Move with Lean"; const QString MoveWithLean = "Move with Lean";
const QString MuteAudio = "Mute Microphone"; const QString MuteAudio = "Mute Microphone";
const QString MuteEnvironment = "Mute Environment"; const QString MuteEnvironment = "Mute Environment";
const QString MyLocations = "My Locations...";
const QString NameLocation = "Name this location"; const QString NameLocation = "Name this location";
const QString NewVoxelCullingMode = "New Voxel Culling Mode"; const QString NewVoxelCullingMode = "New Voxel Culling Mode";
const QString OctreeStats = "Voxel and Particle Statistics"; const QString OctreeStats = "Voxel and Particle Statistics";