Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 21:22:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update menu to toggle User Locations Menu

Browse source
This commit is contained in:
Ryan Huffman 2014-06-30 22:24:27 -07:00
parent 50e77be406
commit 51e42221be
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Menu.cpp
View file

@ -45,7 +45,6 @@
#include "ui/ModelsBrowser.h"
#include "ui/LoginDialog.h"
#include "ui/NodeBounds.h"
#include "ui/UserLocationsWindow.h"
#include "devices/OculusManager.h"
@ -92,6 +91,7 @@ Menu::Menu() :
_jsConsole(NULL),
_octreeStatsDialog(NULL),
_lodToolsDialog(NULL),
_userLocationsWindow(NULL),
_maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),
_voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
_oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE),
@ -168,9 +168,9 @@ Menu::Menu() :
SLOT(nameLocation()));
addActionToQMenuAndActionHash(fileMenu,
MenuOption::MyLocations,
Qt::CTRL | Qt::Key_L,
Qt::CTRL | Qt::Key_K,
this,
SLOT(showLocationList()));
SLOT(toggleLocationList()));
addActionToQMenuAndActionHash(fileMenu,
MenuOption::GoTo,
Qt::Key_At,
@ -1185,9 +1185,15 @@ void Menu::namedLocationCreated(LocationManager::NamedLocationCreateResponse res
msgBox.exec();
}
void Menu::showLocationList() {
UserLocationsWindow* window = new UserLocationsWindow();
window->show();
void Menu::toggleLocationList() {
if (!_userLocationsWindow) {
_userLocationsWindow = new UserLocationsWindow();
}
if (_userLocationsWindow->isVisible()) {
_userLocationsWindow->hide();
} else {
_userLocationsWindow->show();
}
}
void Menu::nameLocation() {

4
interface/src/Menu.h
View file

@ -29,6 +29,7 @@
#include "ui/JSConsole.h"
#include "ui/LoginDialog.h"
#include "ui/ScriptEditorWindow.h"
#include "ui/UserLocationsWindow.h"
const float ADJUST_LOD_DOWN_FPS = 40.0;
const float ADJUST_LOD_UP_FPS = 55.0;
@ -193,7 +194,7 @@ private slots:
void goToDomainDialog();
void goToLocation();
void nameLocation();
void showLocationList();
void toggleLocationList();
void bandwidthDetailsClosed();
void octreeStatsDetailsClosed();
void lodToolsClosed();
@ -260,6 +261,7 @@ private:
QDialog* _jsConsole;
OctreeStatsDialog* _octreeStatsDialog;
LodToolsDialog* _lodToolsDialog;
UserLocationsWindow* _userLocationsWindow;
int _maxVoxels;
float _voxelSizeScale;
float _oculusUIAngularSize;