fix[Onboarding] Password screen is not correct
- hide the "Current password" label when creating a new password - fix margins inside the keycard popup - some minor UI fixups according to Figma Fixes: #14214 Fixes: #14177
This commit is contained in:
parent
839f2c6b21
commit
5af2f28aa2
|
@ -165,7 +165,6 @@ StatusDialog {
|
||||||
StatusFlatButton {
|
StatusFlatButton {
|
||||||
text: qsTr("Cancel")
|
text: qsTr("Cancel")
|
||||||
visible: !d.dbEncryptionInProgress && !d.passwordChanged
|
visible: !d.dbEncryptionInProgress && !d.passwordChanged
|
||||||
textColor: Style.current.darkGrey
|
|
||||||
onClicked: { root.close(); }
|
onClicked: { root.close(); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -173,7 +172,7 @@ StatusDialog {
|
||||||
StatusButton {
|
StatusButton {
|
||||||
id: submitBtn
|
id: submitBtn
|
||||||
objectName: "changePasswordModalSubmitButton"
|
objectName: "changePasswordModalSubmitButton"
|
||||||
text: !d.dbEncryptionInProgress && !d.passwordChanged ? qsTr("Re-encrypt data using new password") : qsTr("Restart status")
|
text: !d.dbEncryptionInProgress && !d.passwordChanged ? qsTr("Re-encrypt data using new password") : qsTr("Restart Status")
|
||||||
enabled: !d.dbEncryptionInProgress
|
enabled: !d.dbEncryptionInProgress
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (d.passwordChanged) {
|
if (d.passwordChanged) {
|
||||||
|
|
|
@ -17,12 +17,13 @@ Item {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.topMargin: Style.current.xlPadding
|
anchors.topMargin: Style.current.xlPadding
|
||||||
anchors.bottomMargin: Style.current.halfPadding
|
anchors.bottomMargin: Style.current.halfPadding
|
||||||
anchors.leftMargin: 2*(Style.current.xlPadding + Style.current.bigPadding)
|
anchors.leftMargin: Style.current.xlPadding
|
||||||
anchors.rightMargin: 2*(Style.current.xlPadding + Style.current.bigPadding)
|
anchors.rightMargin: Style.current.xlPadding
|
||||||
spacing: Style.current.padding
|
spacing: Style.current.padding
|
||||||
|
|
||||||
PasswordView {
|
PasswordView {
|
||||||
Layout.minimumWidth: 460
|
Layout.minimumWidth: 460
|
||||||
|
Layout.alignment: Qt.AlignHCenter
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
passwordStrengthScoreFunction: RootStore.getPasswordStrengthScore
|
passwordStrengthScoreFunction: RootStore.getPasswordStrengthScore
|
||||||
|
|
|
@ -193,6 +193,8 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
visible: !root.createNewPsw
|
||||||
|
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
text: qsTr("Current password")
|
text: qsTr("Current password")
|
||||||
}
|
}
|
||||||
|
@ -204,7 +206,6 @@ ColumnLayout {
|
||||||
property bool showPassword
|
property bool showPassword
|
||||||
|
|
||||||
z: root.zFront
|
z: root.zFront
|
||||||
visible: !root.createNewPsw
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.alignment: root.contentAlignment
|
Layout.alignment: root.contentAlignment
|
||||||
placeholderText: qsTr("Enter current password")
|
placeholderText: qsTr("Enter current password")
|
||||||
|
@ -229,12 +230,12 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusModalDivider {
|
StatusModalDivider {
|
||||||
|
visible: !root.createNewPsw
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.alignment: root.contentAlignment
|
Layout.alignment: root.contentAlignment
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
spacing: 4
|
|
||||||
z: root.zFront
|
z: root.zFront
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.alignment: root.contentAlignment
|
Layout.alignment: root.contentAlignment
|
||||||
|
@ -370,7 +371,6 @@ ColumnLayout {
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
text: qsTr("Confirm new password")
|
text: qsTr("Confirm new password")
|
||||||
color: Theme.palette.baseColor1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusPasswordInput {
|
StatusPasswordInput {
|
||||||
|
|
Loading…
Reference in New Issue