History

Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11

Atlante45 committed 11 years ago

Commit f77fab22 parents 38729c5 dd2421f60 files · +1336 −1240Browse files

Showing the changes to interface/src/Menu.cpp (1 of 60 files). Show all

Unified · Split

interface/src/Menu.cpp+27−89
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111
1212 #include <cstdlib>
1313
14−
1514 #include <QBoxLayout>
1615 #include <QColorDialog>
1716 #include <QDialogButtonBox>
@@ -44,20 +43,26 @@ · 26 unmodified lines
4443 #include "Audio.h"
4544 #include "audio/AudioIOStatsRenderer.h"
4645 #include "audio/AudioScope.h"
47−#include "devices/Faceshift.h"
48−#include "devices/OculusManager.h"
4946 #include "devices/Visage.h"
5047 #include "Menu.h"
5148 #include "scripting/LocationScriptingInterface.h"
5249 #include "scripting/MenuScriptingInterface.h"
5350 #include "Util.h"
51+#include "ui/AddressBarDialog.h"
5452 #include "ui/AnimationsDialog.h"
5553 #include "ui/AttachmentsDialog.h"
54+#include "ui/BandwidthDialog.h"
55+#include "ui/CachesSizeDialog.h"
56+#include "ui/DataWebDialog.h"
57+#include "ui/HMDToolsDialog.h"
58+#include "ui/LodToolsDialog.h"
59+#include "ui/LoginDialog.h"
60+#include "ui/OctreeStatsDialog.h"
61+#include "ui/PreferencesDialog.h"
5662 #include "ui/InfoView.h"
5763 #include "ui/MetavoxelEditor.h"
5864 #include "ui/MetavoxelNetworkSimulator.h"
5965 #include "ui/ModelsBrowser.h"
60−#include "ui/LoginDialog.h"
6166 #include "ui/NodeBounds.h"
6267
6368 Menu* Menu::_instance = NULL;
@@ -79,56 +84,9 @@ Menu* Menu::getInstance() { · 15 unmodified lines
7984 return _instance;
8085 }
8186
82−const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
83−const QString DEFAULT_FACESHIFT_HOSTNAME = "localhost";
84−const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f;
85−const int ONE_SECOND_OF_FRAMES = 60;
86−const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
87−
88−const QString CONSOLE_TITLE = "Scripting Console";
89−const float CONSOLE_WINDOW_OPACITY = 0.95f;
90−const int CONSOLE_WIDTH = 800;
91−const int CONSOLE_HEIGHT = 200;
92−
9387 Menu::Menu() :
94− _actionHash(),
95− _receivedAudioStreamSettings(),
96− _bandwidthDialog(NULL),
97− _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
98− _realWorldFieldOfView(DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES),
99− _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),
100− _faceshiftHostname(DEFAULT_FACESHIFT_HOSTNAME),
101− _jsConsole(NULL),
102− _octreeStatsDialog(NULL),
103− _lodToolsDialog(NULL),
104− _hmdToolsDialog(NULL),
105− _newLocationDialog(NULL),
106− _userLocationsDialog(NULL),
107−#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
108− _speechRecognizer(),
109−#endif
110− _octreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
111− _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE),
112− _sixenseReticleMoveSpeed(DEFAULT_SIXENSE_RETICLE_MOVE_SPEED),
113− _invertSixenseButtons(DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS),
114− _automaticAvatarLOD(true),
115− _avatarLODDecreaseFPS(DEFAULT_ADJUST_AVATAR_LOD_DOWN_FPS),
116− _avatarLODIncreaseFPS(ADJUST_LOD_UP_FPS),
117− _avatarLODDistanceMultiplier(DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER),
118− _boundaryLevelAdjust(0),
119− _maxOctreePacketsPerSecond(DEFAULT_MAX_OCTREE_PPS),
12088 _lastAdjust(usecTimestampNow()),
121− _lastAvatarDetailDrop(usecTimestampNow()),
122− _fpsAverage(FIVE_SECONDS_OF_FRAMES),
123− _fastFPSAverage(ONE_SECOND_OF_FRAMES),
124− _loginAction(NULL),
125− _preferencesDialog(NULL),
126− _loginDialog(NULL),
127− _hasLoginDialogDisplayed(false),
128− _snapshotsLocation(),
129− _scriptsLocation(),
130− _walletPrivateKey(),
131− _shouldRenderTableNeedsRebuilding(true)
89+ _lastAvatarDetailDrop(usecTimestampNow())
13290 {
13391 Application *appInstance = Application::getInstance();
13492
@@ -354,11 +312,8 @@ Menu::Menu() : · 219 unmodified lines
354312
355313 QMenu* nodeBordersMenu = viewMenu->addMenu("Server Borders");
356314 NodeBounds& nodeBounds = appInstance->getNodeBoundsDisplay();
357− addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersVoxelNodes,
358− Qt::CTRL | Qt::SHIFT | Qt::Key_1, false,
359− &nodeBounds, SLOT(setShowVoxelNodes(bool)));
360315 addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersEntityNodes,
361− Qt::CTRL | Qt::SHIFT | Qt::Key_2, false,
316+ Qt::CTRL | Qt::SHIFT | Qt::Key_1, false,
362317 &nodeBounds, SLOT(setShowEntityNodes(bool)));
363318
364319 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::OffAxisProjection, 0, false);
@@ -492,6 +447,7 @@ Menu::Menu() : · 127 unmodified lines
492447 false,
493448 &UserActivityLogger::getInstance(),
494449 SLOT(disable(bool)));
450+ addActionToQMenuAndActionHash(networkMenu, MenuOption::CachesSize, 0, this, SLOT(cachesSizeDialog()));
495451
496452 addActionToQMenuAndActionHash(developerMenu, MenuOption::WalletPrivateKey, 0, this, SLOT(changePrivateKey()));
497453
@@ -619,15 +575,6 @@ Menu::Menu() : · 121 unmodified lines
619575 #endif
620576 }
621577
622−Menu::~Menu() {
623− bandwidthDetailsClosed();
624− octreeStatsDetailsClosed();
625− if (_hmdToolsDialog) {
626− delete _hmdToolsDialog;
627− _hmdToolsDialog = NULL;
628− }
629−}
630−
631578 void Menu::loadSettings(QSettings* settings) {
632579 bool lockedSettings = false;
633580 if (!settings) {
@@ -1153,7 +1100,7 @@ void Menu::bandwidthDetails() { · 519 unmodified lines
11531100 if (! _bandwidthDialog) {
11541101 _bandwidthDialog = new BandwidthDialog(DependencyManager::get<GLCanvas>().data(),
11551102 Application::getInstance()->getBandwidthMeter());
1156− connect(_bandwidthDialog, SIGNAL(closed()), SLOT(bandwidthDetailsClosed()));
1103+ connect(_bandwidthDialog, SIGNAL(closed()), _bandwidthDialog, SLOT(deleteLater()));
11571104
11581105 _bandwidthDialog->show();
11591106
@@ -1253,18 +1200,11 @@ void Menu::audioMuteToggled() { · 93 unmodified lines
12531200 }
12541201 }
12551202
1256−void Menu::bandwidthDetailsClosed() {
1257− if (_bandwidthDialog) {
1258− delete _bandwidthDialog;
1259− _bandwidthDialog = NULL;
1260− }
1261−}
1262−
12631203 void Menu::octreeStatsDetails() {
12641204 if (!_octreeStatsDialog) {
12651205 _octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(),
12661206 Application::getInstance()->getOcteeSceneStats());
1267− connect(_octreeStatsDialog, SIGNAL(closed()), SLOT(octreeStatsDetailsClosed()));
1207+ connect(_octreeStatsDialog, SIGNAL(closed()), _octreeStatsDialog, SLOT(deleteLater()));
12681208 _octreeStatsDialog->show();
12691209 if (_hmdToolsDialog) {
12701210 _hmdToolsDialog->watchWindow(_octreeStatsDialog->windowHandle());
@@ -1273,13 +1213,6 @@ void Menu::octreeStatsDetails() { · 2 unmodified lines
12731213 _octreeStatsDialog->raise();
12741214 }
12751215
1276−void Menu::octreeStatsDetailsClosed() {
1277− if (_octreeStatsDialog) {
1278− delete _octreeStatsDialog;
1279− _octreeStatsDialog = NULL;
1280− }
1281−}
1282−
12831216 QString Menu::getLODFeedbackText() {
12841217 // determine granularity feedback
12851218 int boundaryLevelAdjust = getBoundaryLevelAdjust();
@@ -1443,11 +1376,23 @@ bool Menu::shouldRenderMesh(float largestDimension, float distanceToCamera) { · 157 unmodified lines
14431376 return (distanceToCamera <= visibleDistanceAtClosestScale);
14441377 }
14451378
1379+void Menu::cachesSizeDialog() {
1380+ qDebug() << "Caches size:" << _cachesSizeDialog.isNull();
1381+ if (!_cachesSizeDialog) {
1382+ _cachesSizeDialog = new CachesSizeDialog(DependencyManager::get<GLCanvas>().data());
1383+ connect(_cachesSizeDialog, SIGNAL(closed()), _cachesSizeDialog, SLOT(deleteLater()));
1384+ _cachesSizeDialog->show();
1385+ if (_hmdToolsDialog) {
1386+ _hmdToolsDialog->watchWindow(_cachesSizeDialog->windowHandle());
1387+ }
1388+ }
1389+ _cachesSizeDialog->raise();
1390+}
14461391
14471392 void Menu::lodTools() {
14481393 if (!_lodToolsDialog) {
14491394 _lodToolsDialog = new LodToolsDialog(DependencyManager::get<GLCanvas>().data());
1450− connect(_lodToolsDialog, SIGNAL(closed()), SLOT(lodToolsClosed()));
1395+ connect(_lodToolsDialog, SIGNAL(closed()), _lodToolsDialog, SLOT(deleteLater()));
14511396 _lodToolsDialog->show();
14521397 if (_hmdToolsDialog) {
14531398 _hmdToolsDialog->watchWindow(_lodToolsDialog->windowHandle());
@@ -1456,13 +1401,6 @@ void Menu::lodTools() { · 2 unmodified lines
14561401 _lodToolsDialog->raise();
14571402 }
14581403
1459−void Menu::lodToolsClosed() {
1460− if (_lodToolsDialog) {
1461− delete _lodToolsDialog;
1462− _lodToolsDialog = NULL;
1463− }
1464−}
1465−
14661404 void Menu::hmdTools(bool showTools) {
14671405 if (showTools) {
14681406 if (!_hmdToolsDialog) {