Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 10:52:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add metaverse server field on the login screen

Browse source
This commit is contained in:
Frost 2021-04-11 23:10:19 +00:00
parent 44520dacd6
commit 5a09064f50
1 changed files with 54 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,19 @@ Item {
}
function login() {
// make sure the metaverse server is set so we don't send your password to the wrong place!
if (!isLoggingInToDomain) {
Settings.setValue("private/selectedMetaverseURL", metaverseServerField.text);
}
if (keepMeLoggedInCheckbox.checked) {
if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
}
if (!isLoggingInToDomain) {
loginDialog.login(emailField.text, passwordField.text);
} else {
@ -242,13 +255,6 @@ Item {
case Qt.Key_Enter:
case Qt.Key_Return:
event.accepted = true;
if (keepMeLoggedInCheckbox.checked) {
if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
}
linkAccountBody.login();
break;
}
@ -285,13 +291,7 @@ Item {
case Qt.Key_Enter:
case Qt.Key_Return:
event.accepted = true;
if (keepMeLoggedInCheckbox.checked) {
if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
}
linkAccountBody.login();
break;
}
@ -369,17 +369,50 @@ Item {
case Qt.Key_Enter:
case Qt.Key_Return:
event.accepted = true;
if (keepMeLoggedInCheckbox.checked) {
if (!isLoggingInToDomain) {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
} else {
// ####### TODO
}
linkAccountBody.login();
break;
}
}
}
HifiControlsUit.TextField {
id: metaverseServerField
width: root.bannerWidth
height: linkAccountBody.textFieldHeight
font.pixelSize: linkAccountBody.textFieldFontSize
styleRenderType: Text.QtRendering
anchors {
top: loginDialogTextContainer.bottom
topMargin: 1.5 * hifi.dimensions.contentSpacing.y
}
placeholderText: "Metaverse Server (optional)"
activeFocusOnPress: true
visible: !isLoggingInToDomain
Keys.onPressed: {
switch (event.key) {
case Qt.Key_Tab:
event.accepted = true;
emailField.focus = true;
break;
case Qt.Key_Backtab:
event.accepted = true;
passwordField.focus = true;
break;
case Qt.Key_Enter:
case Qt.Key_Return:
event.accepted = true;
if (!isLoggingInToDomain) {
Settings.setValue("private/selectedMetaverseURL", metaverseServerField.text);
}
linkAccountBody.login();
break;
}
}
onFocusChanged: {
root.text = "";
if (focus) {
root.isPassword = false;
}
}
}
HifiControlsUit.CheckBox {
id: keepMeLoggedInCheckbox
@ -714,4 +747,4 @@ Item {
break;
}
}
}
metaverseServerField