monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2142

Browse source 
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
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
wizard/WizardCreateDevice1.qml
View file

@ -46,8 +46,9 @@ Rectangle {
ListModel {
id: deviceNameModel
ListElement { column1: "Ledger"; column2: "Ledger"; }
ListElement { column1: "Trezor"; column2: "Trezor"; }
ListElement { column1: qsTr("Choose your hardware device"); column2: "";}
ListElement { column1: "Ledger"; column2: "Ledger";}
ListElement { column1: "Trezor"; column2: "Trezor";}
}
function update(){
@ -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,10 +129,24 @@ Rectangle {
text: "0"
}
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>"
@ -143,23 +155,6 @@ Rectangle {
}
}
ColumnLayout {
spacing: 0
Layout.topMargin: 10
Layout.fillWidth: true
z: 3
ColumnLayout{
MoneroComponents.StandardDropdown {
id: deviceNameDropdown
dataModel: deviceNameModel
Layout.fillWidth: true
Layout.topMargin: 6
}
}
}
TextArea {
id: errorMsg
text: qsTr("Error writing wallet from hardware device. Check application logs.") + translationManager.emptyString;
@ -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: {