diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-05-03 12:56:57 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-05-03 12:56:57 -0500 |
| commit | eb53c72ca4e60a83705fc45de7170aaf541f39bb (patch) | |
| tree | 9ac913397af2fcd8c93eda8b06a476efd94871da /wizard | |
| parent | d0a40b4ca8bba632869d4e97e0ed3f45b3d9c7c3 (diff) | |
| parent | c151e5e7a1104e0230f265a3c367dea5f772296c (diff) | |
| download | monzero-gui-eb53c72ca4e60a83705fc45de7170aaf541f39bb.tar.gz monzero-gui-eb53c72ca4e60a83705fc45de7170aaf541f39bb.tar.xz monzero-gui-eb53c72ca4e60a83705fc45de7170aaf541f39bb.zip | |
Merge pull request #2142
c151e5e wizardcreatedevice: cleanup layout (mmbyday)
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardCreateDevice1.qml | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index b73a4fcc..9a2191bc 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -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: { |