mirror of
https://github.com/lubosz/overte.git
synced 2025-04-27 13:35:28 +02:00
Fix domain vs metaverse logins slightly.
This commit is contained in:
parent
0e8f019b8a
commit
352a3f4ab1
4 changed files with 8 additions and 1 deletions
|
@ -7123,13 +7123,14 @@ void Application::updateWindowTitle() const {
|
|||
|
||||
QString domainDetails;
|
||||
if (isDomainLoggedIn) {
|
||||
// ###### TODO
|
||||
// domainDetails = "Domain: Logged in as " + domainUsername;
|
||||
domainDetails = "Domain: Logged In";
|
||||
} else {
|
||||
domainDetails = "Domain: Not Logged In";
|
||||
}
|
||||
|
||||
QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + " - " + domainDetails + ")"
|
||||
QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + ") (" + domainDetails + ")"
|
||||
+ buildVersion;
|
||||
|
||||
#ifndef WIN32
|
||||
|
|
|
@ -110,6 +110,9 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
|
|||
}
|
||||
}
|
||||
|
||||
void DialogsManager::requestMetaverseLogin() {
|
||||
DialogsManager::setDomainLogin(false);
|
||||
}
|
||||
|
||||
void DialogsManager::setDomainLogin(bool isDomainLogin, const QString& domain) {
|
||||
_isDomainLogin = isDomainLogin;
|
||||
|
|
|
@ -41,6 +41,7 @@ public:
|
|||
QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; }
|
||||
void emitAddressBarShown(bool visible) { emit addressBarShown(visible); }
|
||||
void setAddressBarVisible(bool addressBarVisible);
|
||||
void requestMetaverseLogin();
|
||||
bool getIsDomainLogin() { return _isDomainLogin; }
|
||||
QString getDomainLoginDomain() { return _domainLoginDomain; }
|
||||
|
||||
|
|
|
@ -107,6 +107,8 @@ void LoginDialog::toggleAction() {
|
|||
connection = connect(loginAction, &QAction::triggered, [] {
|
||||
// if not in login state, show.
|
||||
if (!qApp->getLoginDialogPoppedUp()) {
|
||||
auto dialogsManager = DependencyManager::get<DialogsManager>();
|
||||
dialogsManager->requestMetaverseLogin();
|
||||
LoginDialog::showWithSelection();
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue