History

Merge pull request #8753 from ctrlaltdavid/21068

Improve indication of user not being logged in

Andrew Meadows committed 10 years ago

Commit abb05bc2 parents 48c168f 52fbb652 files · +26 −15Browse files

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

Unified · Split

interface/src/Application.cpp+8−4
@@ -4625,11 +4625,15 @@ void Application::resetSensors(bool andReload) { · 4624 unmodified lines
46254625
46264626 void Application::updateWindowTitle() const {
46274627
4628− QString buildVersion = " (build " + applicationVersion() + ")";
46294628 auto nodeList = DependencyManager::get<NodeList>();
4629+ auto accountManager = DependencyManager::get<AccountManager>();
4630+
4631+ QString buildVersion = " (build " + applicationVersion() + ")";
4632+
4633+ QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)";
46304634
4631− QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED) ";
4632− QString username = DependencyManager::get<AccountManager>()->getAccountInfo().getUsername();
4635+ QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
4636+ QString username = accountManager->getAccountInfo().getUsername();
46334637 QString currentPlaceName = DependencyManager::get<AddressManager>()->getHost();
46344638
46354639 if (currentPlaceName.isEmpty()) {
@@ -4637,7 +4641,7 @@ void Application::updateWindowTitle() const { · 1 unmodified line
46374641 }
46384642
46394643 QString title = QString() + (!username.isEmpty() ? username + " @ " : QString())
4640− + currentPlaceName + connectionStatus + buildVersion;
4644+ + currentPlaceName + connectionStatus + loginStatus + buildVersion;
46414645
46424646 #ifndef WIN32
46434647 // crashes with vs2013/win32