diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-05-08 12:25:15 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-05-08 12:25:15 -0500 |
| commit | aa5000f55620bebcfa48c5c7f3e49ef708a56bff (patch) | |
| tree | fb1c9026f8ac48344a4a15ccd6ceb6818e11a53b /wizard | |
| parent | 8b6978b2a5e1788a32360239f0257ce5327eb88c (diff) | |
| parent | 4354a76df94c26f2298380eb657712dc3e06b470 (diff) | |
| download | monzero-gui-aa5000f55620bebcfa48c5c7f3e49ef708a56bff.tar.gz monzero-gui-aa5000f55620bebcfa48c5c7f3e49ef708a56bff.tar.xz monzero-gui-aa5000f55620bebcfa48c5c7f3e49ef708a56bff.zip | |
Merge pull request #2876
4354a76 StandardDropdown: drop Qt 5.8 workaround (xiphon)
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardCreateDevice1.qml | 7 | ||||
| -rw-r--r-- | wizard/WizardHome.qml | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index 4cc6640a..97623283 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -53,11 +53,6 @@ Rectangle { ListElement { column1: "Trezor Model T"; column2: "Trezor";} } - function update(){ - // update device dropdown - deviceNameDropdown.update(); - } - ColumnLayout { id: pageRoot Layout.alignment: Qt.AlignHCenter; @@ -208,8 +203,6 @@ Rectangle { Component.onCompleted: { errorMsg.text = ""; - wizardCreateDevice1.update(); - console.log() } function onPageCompleted(previousView){ diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml index 4d042a2a..589ec6c0 100644 --- a/wizard/WizardHome.qml +++ b/wizard/WizardHome.qml @@ -191,6 +191,7 @@ Rectangle { MoneroComponents.StandardDropdown { id: networkTypeDropdown + currentIndex: persistentSettings.nettype dataModel: networkTypeModel Layout.fillWidth: true Layout.maximumWidth: 180 @@ -244,11 +245,6 @@ Rectangle { } } - Component.onCompleted: { - networkTypeDropdown.currentIndex = persistentSettings.nettype; - networkTypeDropdown.update(); - } - function onPageCompleted(){ wizardController.walletOptionsIsRecoveringFromDevice = false; } |