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

First pass at making login dialog more clear.

Browse source
This commit is contained in:
Kasen IO 2020-08-04 01:28:19 -04:00
parent 856e1f1ca3
commit 482922d986
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ Item {
property bool lostFocus: false property bool lostFocus: false
readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp() readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp()
// If not logging into domain, then we must be logging into the metaverse...
readonly property bool isLoggingInToDomain: loginDialog.getDomainLoginRequested() readonly property bool isLoggingInToDomain: loginDialog.getDomainLoginRequested()
readonly property string domainAuthProvider: loginDialog.getDomainLoginAuthProvider() readonly property string domainAuthProvider: loginDialog.getDomainLoginAuthProvider()
@ -105,8 +106,9 @@ Item {
loginErrorMessage.wrapMode = Text.WordWrap; loginErrorMessage.wrapMode = Text.WordWrap;
errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height; errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height;
} }
loginDialogText.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : "Log In to Domain";
loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account"; loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account";
loginButton.text = (!isLoggingInToDomain) ? "Log In" : "Log In to Domain"; loginButton.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : "Log In to Domain";
loginButton.color = hifi.buttons.blue; loginButton.color = hifi.buttons.blue;
displayNameField.placeholderText = "Display Name (optional)"; displayNameField.placeholderText = "Display Name (optional)";
var savedDisplayName = Settings.getValue("Avatar/displayName", ""); var savedDisplayName = Settings.getValue("Avatar/displayName", "");
@ -140,6 +142,21 @@ Item {
visible: false; visible: false;
anchors.fill: parent; anchors.fill: parent;
} }
Text {
id: loginDialogText
text: qsTr("Log In")
anchors {
left: parent.left
}
lineHeight: 1
color: "white"
font.family: linkAccountBody.fontFamily
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
Item { Item {
id: loginContainer id: loginContainer
@ -626,6 +643,24 @@ Item {
root.tryDestroy(); root.tryDestroy();
} }
} }
Text {
id: loginSkipTipText
text: qsTr("Not all domains require you to have a metaverse account. \n Some domains have their own login dialogs.")
visible: !linkAccountBody.isLoggingInToDomain
anchors {
top: dismissButton.bottom
topMargin: hifi.dimensions.contentSpacing.y
left: parent.left
}
lineHeight: 1
color: "white"
font.family: linkAccountBody.fontFamily
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
} }
} }