History

Merge branch 'master' of https://github.com/worklist/hifi into metavoxels

Andrzej Kapolka committed 12 years ago

Commit 6888dc42 parents 0ca2320 4e618fc18 files · +215 −81Browse files

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

Unified · Split

interface/src/Application.cpp+11−1
@@ -49,6 +49,7 @@ · 48 unmodified lines
4949
5050 #include "Application.h"
5151 #include "DataServerClient.h"
52+#include "InterfaceVersion.h"
5253 #include "LogDisplay.h"
5354 #include "Menu.h"
5455 #include "Swatch.h"
@@ -144,6 +145,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 89 unmodified lines
144145 _applicationStartupTime = startup_time;
145146 _window->setWindowTitle("Interface");
146147
148+ qDebug( "[VERSION] Build sequence: %i", BUILD_VERSION);
149+
147150 qInstallMessageHandler(messageHandler);
148151
149152 unsigned int listenPort = 0; // bind to an ephemeral port by default
@@ -215,9 +218,11 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 65 unmodified lines
215218 connect(silentNodeTimer, SIGNAL(timeout()), nodeList, SLOT(removeSilentNodes()));
216219 silentNodeTimer->start(NODE_SILENCE_THRESHOLD_USECS / 1000);
217220
221+ QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
222+
218223 _networkAccessManager = new QNetworkAccessManager(this);
219224 QNetworkDiskCache* cache = new QNetworkDiskCache(_networkAccessManager);
220− cache->setCacheDirectory("interfaceCache");
225+ cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
221226 _networkAccessManager->setCache(cache);
222227
223228 _window->setCentralWidget(_glWidget);
@@ -240,6 +245,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 16 unmodified lines
240245 // probably not the right long term solution. But for now, we're going to do this to
241246 // allow you to move a particle around in your hand
242247 _particleEditSender.setPacketsPerSecond(3000); // super high!!
248+
249+ // Set the sixense filtering
250+ _sixenseManager.setFilter(Menu::getInstance()->isOptionChecked(MenuOption::FilterSixense));
243251 }
244252
245253 Application::~Application() {
@@ -4119,12 +4127,14 @@ void Application::attachNewHeadToNode(Node* newNode) { · 3873 unmodified lines
41194127
41204128 void Application::updateWindowTitle(){
41214129 QString title = "";
4130+ QString buildVersion = " (build " + QString::number(BUILD_VERSION) + ")";
41224131 QString username = _profile.getUsername();
41234132 if(!username.isEmpty()){
41244133 title += _profile.getUsername();
41254134 title += " @ ";
41264135 }
41274136 title += _profile.getLastDomain();
4137+ title += buildVersion;
41284138
41294139 qDebug("Application title set to: %s.\n", title.toStdString().c_str());
41304140 _window->setWindowTitle(title);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t