Merge pull request #2871

7db5de0 WizardAskPassword: drop custom password fields, use LineEdit (xiphon)
This commit is contained in:
luigi1111 2020-05-06 00:39:26 -05:00
commit a91a4f51ab
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -137,119 +137,28 @@ ColumnLayout {
}
}
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Label {
text: qsTr("Password") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 14
font.family: MoneroComponents.Style.fontLight.name
color: MoneroComponents.Style.defaultFontColor
}
MoneroComponents.Input {
MoneroComponents.LineEdit {
id: passwordInput
Layout.topMargin: 6
Layout.fillWidth: true
bottomPadding: 10
leftPadding: 10
topPadding: 10
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
echoMode: TextInput.Password
KeyNavigation.tab: passwordInputConfirm
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 15
color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor
labelFontSize: 14
password: true
labelText: qsTr("Password") + translationManager.emptyString
text: walletOptionsPassword
background: Rectangle {
radius: 4
border.color: MoneroComponents.Style.inputBorderColorActive
border.width: 1
color: "transparent"
MoneroComponents.Label {
fontSize: 18
text: FontAwesome.lock
opacity: 0.5
fontFamily: FontAwesome.fontFamilySolid
styleName: "Solid"
anchors.right: parent.right
anchors.rightMargin: 10
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
}
}
}
}
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Label {
text: qsTr("Password (confirm)") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 14
font.family: MoneroComponents.Style.fontLight.name
color: MoneroComponents.Style.defaultFontColor
}
MoneroComponents.Input {
MoneroComponents.LineEdit {
id: passwordInputConfirm
Layout.topMargin: 6
Layout.fillWidth: true
bottomPadding: 10
leftPadding: 10
topPadding: 10
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
echoMode: TextInput.Password
Layout.topMargin: 8
KeyNavigation.tab: passwordInputConfirm
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 15
color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor
labelFontSize: 14
passwordLinked: passwordInput
labelText: qsTr("Password (confirm)") + translationManager.emptyString
text: walletOptionsPassword
background: Rectangle {
radius: 4
border.color: MoneroComponents.Style.inputBorderColorActive
border.width: 1
color: "transparent"
MoneroComponents.Label {
fontSize: 18
text: FontAwesome.lock
opacity: 0.5
fontFamily: FontAwesome.fontFamilySolid
styleName: "Solid"
anchors.right: parent.right
anchors.rightMargin: 10
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
}
}
}
}
}