Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 18:33:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix domain vs metaverse logins slightly.

Browse source
This commit is contained in:
Kasen IO 2020-08-04 21:17:57 -04:00
parent 0e8f019b8a
commit 352a3f4ab1
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -7123,13 +7123,14 @@ void Application::updateWindowTitle() const {
QString domainDetails; QString domainDetails;
if (isDomainLoggedIn) { if (isDomainLoggedIn) {
// ###### TODO
// domainDetails = "Domain: Logged in as " + domainUsername; // domainDetails = "Domain: Logged in as " + domainUsername;
domainDetails = "Domain: Logged In"; domainDetails = "Domain: Logged In";
} else { } else {
domainDetails = "Domain: Not Logged In"; domainDetails = "Domain: Not Logged In";
} }
QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + " - " + domainDetails + ")" QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + ") (" + domainDetails + ")"
+ buildVersion; + buildVersion;
#ifndef WIN32 #ifndef WIN32

3
interface/src/ui/DialogsManager.cpp
View file

@ -110,6 +110,9 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
} }
} }
void DialogsManager::requestMetaverseLogin() {
DialogsManager::setDomainLogin(false);
}
void DialogsManager::setDomainLogin(bool isDomainLogin, const QString& domain) { void DialogsManager::setDomainLogin(bool isDomainLogin, const QString& domain) {
_isDomainLogin = isDomainLogin; _isDomainLogin = isDomainLogin;

1
interface/src/ui/DialogsManager.h
View file

@ -41,6 +41,7 @@ public:
QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; } QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; }
void emitAddressBarShown(bool visible) { emit addressBarShown(visible); } void emitAddressBarShown(bool visible) { emit addressBarShown(visible); }
void setAddressBarVisible(bool addressBarVisible); void setAddressBarVisible(bool addressBarVisible);
void requestMetaverseLogin();
bool getIsDomainLogin() { return _isDomainLogin; } bool getIsDomainLogin() { return _isDomainLogin; }
QString getDomainLoginDomain() { return _domainLoginDomain; } QString getDomainLoginDomain() { return _domainLoginDomain; }

2
interface/src/ui/LoginDialog.cpp
View file

@ -107,6 +107,8 @@ void LoginDialog::toggleAction() {
connection = connect(loginAction, &QAction::triggered, [] { connection = connect(loginAction, &QAction::triggered, [] {
// if not in login state, show. // if not in login state, show.
if (!qApp->getLoginDialogPoppedUp()) { if (!qApp->getLoginDialogPoppedUp()) {
auto dialogsManager = DependencyManager::get<DialogsManager>();
dialogsManager->requestMetaverseLogin();
LoginDialog::showWithSelection(); LoginDialog::showWithSelection();
} }
}); });