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

 void Application::updateWindowTitle() const {
-    QString buildVersion = " (build " + applicationVersion() + ")";
     auto nodeList = DependencyManager::get<NodeList>();
+    auto accountManager = DependencyManager::get<AccountManager>();
+    QString buildVersion = " (build " + applicationVersion() + ")";
+    QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)";
-    QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED) ";
+    QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
-    QString username = DependencyManager::get<AccountManager>()->getAccountInfo().getUsername();
+    QString username = accountManager->getAccountInfo().getUsername();
     QString currentPlaceName = DependencyManager::get<AddressManager>()->getHost();
     if (currentPlaceName.isEmpty()) {
     }
     QString title = QString() + (!username.isEmpty() ? username + " @ " : QString())
-        + currentPlaceName + connectionStatus + buildVersion;
+        + currentPlaceName + connectionStatus + loginStatus + buildVersion;
 #ifndef WIN32
     // crashes with vs2013/win32