Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix saving metaverse login

Browse source
This commit is contained in:
David Rowe 2020-07-25 20:53:23 +12:00
parent 0618427d0f
commit 361ab97d83
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -112,8 +112,13 @@ Item {
var savedDisplayName = Settings.getValue("Avatar/displayName", ""); var savedDisplayName = Settings.getValue("Avatar/displayName", "");
displayNameField.text = savedDisplayName; displayNameField.text = savedDisplayName;
emailField.placeholderText = "Username or Email"; emailField.placeholderText = "Username or Email";
var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", ""); if (!isLoggingInToDomain) {
emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : ""; var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", "");
emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : "";
} else {
// ####### TODO
}
if (linkAccountBody.linkSteam || linkAccountBody.linkOculus) { if (linkAccountBody.linkSteam || linkAccountBody.linkOculus) {
loginButton.width = (passwordField.width - hifi.dimensions.contentSpacing.x) / 2; loginButton.width = (passwordField.width - hifi.dimensions.contentSpacing.x) / 2;
loginButton.anchors.right = displayNameField.right; loginButton.anchors.right = displayNameField.right;
@ -201,7 +206,11 @@ Item {
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
if (keepMeLoggedInCheckbox.checked) { if (keepMeLoggedInCheckbox.checked) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
} }
linkAccountBody.login(); linkAccountBody.login();
break; break;
@ -240,7 +249,11 @@ Item {
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
if (keepMeLoggedInCheckbox.checked) { if (keepMeLoggedInCheckbox.checked) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
} }
linkAccountBody.login(); linkAccountBody.login();
break; break;
@ -320,7 +333,11 @@ Item {
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
if (keepMeLoggedInCheckbox.checked) { if (keepMeLoggedInCheckbox.checked) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
} }
linkAccountBody.login(); linkAccountBody.login();
break; break;
@ -329,7 +346,7 @@ Item {
} }
HifiControlsUit.CheckBox { HifiControlsUit.CheckBox {
id: keepMeLoggedInCheckbox id: keepMeLoggedInCheckbox
checked: Settings.getValue("keepMeLoggedIn", false); checked: !isLoggingInToDomain ? Settings.getValue("keepMeLoggedIn", false) : false; // ####### TODO
text: qsTr("Keep Me Logged In"); text: qsTr("Keep Me Logged In");
boxSize: 18; boxSize: 18;
labelFontFamily: linkAccountBody.fontFamily labelFontFamily: linkAccountBody.fontFamily
@ -342,14 +359,22 @@ Item {
} }
onCheckedChanged: { onCheckedChanged: {
Settings.setValue("keepMeLoggedIn", checked); Settings.setValue("keepMeLoggedIn", checked);
if (keepMeLoggedInCheckbox.checked) { if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); if (keepMeLoggedInCheckbox.checked) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
Settings.setValue("keepMeLoggedIn/savedUsername", "");
}
} else { } else {
Settings.setValue("keepMeLoggedIn/savedUsername", ""); // ####### TODO
} }
} }
Component.onCompleted: { Component.onCompleted: {
keepMeLoggedInCheckbox.checked = !Account.loggedIn; if (!isLoggingInToDomain) {
keepMeLoggedInCheckbox.checked = !Account.loggedIn;
} else {
// ####### TODO
}
} }
} }
HifiControlsUit.Button { HifiControlsUit.Button {