From 06d14436bd986b77a04594f2cb6f56fa81690885 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Mon, 16 Dec 2013 13:29:17 -0600 Subject: [PATCH 1/3] Printing build version on title --- interface/src/Application.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index bf7fef57a5..291086a478 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4106,12 +4106,14 @@ void Application::attachNewHeadToNode(Node* newNode) { void Application::updateWindowTitle(){ QString title = ""; + QString buildVersion = " (build " + QString::number(BUILD_VERSION) + ")"; QString username = _profile.getUsername(); if(!username.isEmpty()){ - title += _profile.getUsername(); + title += _profile.getUsername();s title += " @ "; } title += _profile.getLastDomain(); + title += buildVersion; qDebug("Application title set to: %s.\n", title.toStdString().c_str()); _window->setWindowTitle(title); From 5ac125fdd88f64dab4c848602d6c221c0ca2375b Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Mon, 16 Dec 2013 13:32:12 -0600 Subject: [PATCH 2/3] Typo fix --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 291086a478..942cf998d9 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4109,7 +4109,7 @@ void Application::updateWindowTitle(){ QString buildVersion = " (build " + QString::number(BUILD_VERSION) + ")"; QString username = _profile.getUsername(); if(!username.isEmpty()){ - title += _profile.getUsername();s + title += _profile.getUsername(); title += " @ "; } title += _profile.getLastDomain(); From 4f1ff5b56683a7da6da97446eb73ebbc78ab0217 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Mon, 16 Dec 2013 13:55:04 -0600 Subject: [PATCH 3/3] Using QStandardPaths for cache directory --- interface/src/Application.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 942cf998d9..267786edb9 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -218,9 +218,11 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : connect(silentNodeTimer, SIGNAL(timeout()), nodeList, SLOT(removeSilentNodes())); silentNodeTimer->start(NODE_SILENCE_THRESHOLD_USECS / 1000); + QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + _networkAccessManager = new QNetworkAccessManager(this); QNetworkDiskCache* cache = new QNetworkDiskCache(_networkAccessManager); - cache->setCacheDirectory("interfaceCache"); + cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache"); _networkAccessManager->setCache(cache); _window->setCentralWidget(_glWidget);