SignIn screen tweaks

- Put the server field after user & pass, it makes more sense to have
  the default focused field at the start

- Hide the currently unimplemented login method selection

- Rename Recovery tab to Reset (shorter)
This commit is contained in:
miruka 2019-12-08 03:49:17 -04:00
parent f5fde35482
commit b267ef6562
2 changed files with 21 additions and 20 deletions

View File

@ -5,7 +5,7 @@ import "../../Base"
HPage { HPage {
HTabbedBoxes { HTabbedBoxes {
tabModel: [ tabModel: [
qsTr("Sign in"), qsTr("Register"), qsTr("Recovery"), qsTr("Sign in"), qsTr("Register"), qsTr("Reset"),
] ]
SignIn { Component.onCompleted: forceActiveFocus() } SignIn { Component.onCompleted: forceActiveFocus() }

View File

@ -103,6 +103,7 @@ HBox {
} }
HRowLayout { HRowLayout {
visible: false // TODO
spacing: theme.spacing * 1.25 spacing: theme.spacing * 1.25
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
@ -123,6 +124,25 @@ HBox {
} }
} }
HTextField {
id: idField
placeholderText: qsTr(
signInWith === "email" ? "Email" :
signInWith === "phone" ? "Phone" :
"Username"
)
Layout.fillWidth: true
}
HTextField {
id: passwordField
placeholderText: qsTr("Password")
echoMode: HTextField.Password
Layout.fillWidth: true
}
HTextField { HTextField {
id: serverField id: serverField
placeholderText: qsTr("Homeserver URL") placeholderText: qsTr("Homeserver URL")
@ -156,25 +176,6 @@ HBox {
knownServers.includes(cleanText) knownServers.includes(cleanText)
} }
HTextField {
id: idField
placeholderText: qsTr(
signInWith === "email" ? "Email" :
signInWith === "phone" ? "Phone" :
"Username"
)
Layout.fillWidth: true
}
HTextField {
id: passwordField
placeholderText: qsTr("Password")
echoMode: HTextField.Password
Layout.fillWidth: true
}
HCheckBox { HCheckBox {
id: rememberAccount id: rememberAccount
text: qsTr("Remember my account") text: qsTr("Remember my account")