Merge pull request #2142

c151e5e wizardcreatedevice: cleanup layout (mmbyday)
This commit is contained in:
luigi1111 2019-05-03 12:56:57 -05:00
commit eb53c72ca4
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -46,6 +46,7 @@ Rectangle {
ListModel {
id: deviceNameModel
ListElement { column1: qsTr("Choose your hardware device"); column2: "";}
ListElement { column1: "Ledger"; column2: "Ledger";}
ListElement { column1: "Trezor"; column2: "Trezor";}
}
@ -81,7 +82,6 @@ Rectangle {
ColumnLayout {
spacing: 0
Layout.topMargin: 10
Layout.fillWidth: true
@ -112,9 +112,7 @@ Rectangle {
}
ColumnLayout {
Layout.topMargin: 10
Layout.fillWidth: true
spacing: 20
MoneroComponents.LineEdit {
@ -131,32 +129,29 @@ Rectangle {
text: "0"
}
MoneroComponents.LineEdit {
id: lookahead
Layout.fillWidth: true
labelText: qsTr("Subaddress lookahead (optional)") + translationManager.emptyString
labelFontSize: 14
placeholderText: "<major>:<minor>"
placeholderFontSize: 16
validator: RegExpValidator { regExp: /(\d+):(\d+)?$/ }
}
}
ColumnLayout {
spacing: 0
Layout.topMargin: 10
Layout.fillWidth: true
z: 3
ColumnLayout{
MoneroComponents.StandardDropdown {
id: deviceNameDropdown
dataModel: deviceNameModel
Layout.fillWidth: true
Layout.topMargin: 6
z: 3
}
CheckBox2 {
id: showAdvancedCheckbox
checked: false
text: qsTr("Advanced options") + translationManager.emptyString
}
MoneroComponents.LineEdit {
id: lookahead
Layout.fillWidth: true
visible: showAdvancedCheckbox.checked
labelText: qsTr("Subaddress lookahead (optional)") + translationManager.emptyString
labelFontSize: 14
placeholderText: "<major>:<minor>"
placeholderFontSize: 16
validator: RegExpValidator { regExp: /(\d+):(\d+)?$/ }
}
}
@ -184,7 +179,7 @@ Rectangle {
WizardNav {
progressSteps: 4
progress: 1
btnNext.enabled: walletInput.verify();
btnNext.enabled: walletInput.verify() && wizardCreateDevice1.deviceName;
btnPrev.text: qsTr("Back to menu") + translationManager.emptyString
btnNext.text: qsTr("Create wallet") + translationManager.emptyString
onPrevClicked: {