Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -1352,10 +1352,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1351 unmodified lines | ||
| 1352 | 1352 | connect(accountManager.data(), &AccountManager::usernameChanged, this, &Application::updateWindowTitle); |
| 1353 | 1353 | |
| 1354 | 1354 | auto domainAccountManager = DependencyManager::get<DomainAccountManager>(); |
| 1355 | − connect(domainAccountManager.data(), &DomainAccountManager::authRequired, dialogsManager.data(), | |
| 1356 | − &DialogsManager::showDomainLoginDialog); | |
| 1357 | − connect(domainAccountManager.data(), &DomainAccountManager::loginComplete, this, | |
| 1358 | − &Application::updateWindowTitle); | |
| 1355 | + connect(domainAccountManager.data(), &DomainAccountManager::authRequired, | |
| 1356 | + dialogsManager.data(), &DialogsManager::showDomainLoginDialog); | |
| 1357 | + connect(domainAccountManager.data(), &DomainAccountManager::authRequired, this, &Application::updateWindowTitle); | |
| 1358 | + connect(domainAccountManager.data(), &DomainAccountManager::loginComplete, this, &Application::updateWindowTitle); | |
| 1359 | 1359 | // ####### TODO: Connect any other signals from domainAccountManager. |
| 1360 | 1360 | |
| 1361 | 1361 | // use our MyAvatar position and quat for address manager path |
| @@ -7084,6 +7084,7 @@ void Application::updateWindowTitle() const { · 5722 unmodified lines | ||
| 7084 | 7084 | auto domainAccountManager = DependencyManager::get<DomainAccountManager>(); |
| 7085 | 7085 | auto isInErrorState = nodeList->getDomainHandler().isInErrorState(); |
| 7086 | 7086 | bool isMetaverseLoggedIn = accountManager->isLoggedIn(); |
| 7087 | + bool hasDomainLogIn = domainAccountManager->hasLogIn(); | |
| 7087 | 7088 | bool isDomainLoggedIn = domainAccountManager->isLoggedIn(); |
| 7088 | 7089 | QString authedDomain = domainAccountManager->getAuthedDomain(); |
| 7089 | 7090 | |
| @@ -7115,20 +7116,23 @@ void Application::updateWindowTitle() const { · 25 unmodified lines | ||
| 7115 | 7116 | |
| 7116 | 7117 | QString metaverseDetails; |
| 7117 | 7118 | if (isMetaverseLoggedIn) { |
| 7118 | − metaverseDetails = "Metaverse: Logged in as " + metaverseUsername; | |
| 7119 | + metaverseDetails = " (Metaverse: Logged in as " + metaverseUsername + ")"; | |
| 7119 | 7120 | } else { |
| 7120 | − metaverseDetails = "Metaverse: Not Logged In"; | |
| 7121 | + metaverseDetails = " (Metaverse: Not Logged In)"; | |
| 7121 | 7122 | } |
| 7122 | 7123 | |
| 7123 | 7124 | QString domainDetails; |
| 7124 | − if (currentPlaceName == authedDomain && isDomainLoggedIn) { | |
| 7125 | − domainDetails = "Domain: Logged in as " + domainUsername; | |
| 7125 | + if (hasDomainLogIn) { | |
| 7126 | + if (currentPlaceName == authedDomain && isDomainLoggedIn) { | |
| 7127 | + domainDetails = " (Domain: Logged in as " + domainUsername + ")"; | |
| 7128 | + } else { | |
| 7129 | + domainDetails = " (Domain: Not Logged In)"; | |
| 7130 | + } | |
| 7126 | 7131 | } else { |
| 7127 | − domainDetails = "Domain: Not Logged In"; | |
| 7132 | + domainDetails = ""; | |
| 7128 | 7133 | } |
| 7129 | 7134 | |
| 7130 | − QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + ") (" + domainDetails + ")" | |
| 7131 | − + buildVersion; | |
| 7135 | + QString title = currentPlaceName + connectionStatus + metaverseDetails + domainDetails + buildVersion; | |
| 7132 | 7136 | |
| 7133 | 7137 | #ifndef WIN32 |
| 7134 | 7138 | // crashes with vs2013/win32 |