Browse Source

use apply() function on every wizard page, making sure wizard_data is always available

to wizard navigation evaluation
patch-4
Sander van Grieken 3 years ago
parent
commit
2adf034771
  1. 3
      electrum/gui/qml/components/wizard/WCBIP39Refine.qml
  2. 2
      electrum/gui/qml/components/wizard/WCCreateSeed.qml
  3. 2
      electrum/gui/qml/components/wizard/WCHaveMasterKey.qml
  4. 2
      electrum/gui/qml/components/wizard/WCImport.qml
  5. 2
      electrum/gui/qml/components/wizard/WCKeystoreType.qml
  6. 2
      electrum/gui/qml/components/wizard/WCProxyConfig.qml
  7. 2
      electrum/gui/qml/components/wizard/WCServerConfig.qml
  8. 2
      electrum/gui/qml/components/wizard/WCWalletName.qml
  9. 2
      electrum/gui/qml/components/wizard/WCWalletPassword.qml
  10. 2
      electrum/gui/qml/components/wizard/WCWalletType.qml

3
electrum/gui/qml/components/wizard/WCBIP39Refine.qml

@ -10,10 +10,11 @@ import "../controls"
WizardComponent { WizardComponent {
valid: false valid: false
onAccept: { function apply() {
wizard_data['script_type'] = scripttypegroup.checkedButton.scripttype wizard_data['script_type'] = scripttypegroup.checkedButton.scripttype
wizard_data['derivation_path'] = derivationpathtext.text wizard_data['derivation_path'] = derivationpathtext.text
} }
function getScriptTypePurposeDict() { function getScriptTypePurposeDict() {
return { return {
'p2pkh': 44, 'p2pkh': 44,

2
electrum/gui/qml/components/wizard/WCCreateSeed.qml

@ -10,7 +10,7 @@ import "../controls"
WizardComponent { WizardComponent {
valid: seedtext.text != '' valid: seedtext.text != ''
onAccept: { function apply() {
wizard_data['seed'] = seedtext.text wizard_data['seed'] = seedtext.text
wizard_data['seed_extend'] = extendcb.checked wizard_data['seed_extend'] = extendcb.checked
wizard_data['seed_extra_words'] = extendcb.checked ? customwordstext.text : '' wizard_data['seed_extra_words'] = extendcb.checked ? customwordstext.text : ''

2
electrum/gui/qml/components/wizard/WCHaveMasterKey.qml

@ -11,7 +11,7 @@ WizardComponent {
valid: false valid: false
onAccept: { function apply() {
wizard_data['master_key'] = masterkey_ta.text wizard_data['master_key'] = masterkey_ta.text
} }

2
electrum/gui/qml/components/wizard/WCImport.qml

@ -11,7 +11,7 @@ WizardComponent {
valid: false valid: false
onAccept: { function apply() {
if (bitcoin.isAddressList(import_ta.text)) { if (bitcoin.isAddressList(import_ta.text)) {
wizard_data['address_list'] = import_ta.text wizard_data['address_list'] = import_ta.text
} else if (bitcoin.isPrivateKeyList(import_ta.text)) { } else if (bitcoin.isPrivateKeyList(import_ta.text)) {

2
electrum/gui/qml/components/wizard/WCKeystoreType.qml

@ -4,7 +4,7 @@ import QtQuick.Controls 2.1
WizardComponent { WizardComponent {
valid: keystoregroup.checkedButton !== null valid: keystoregroup.checkedButton !== null
onAccept: { function apply() {
wizard_data['keystore_type'] = keystoregroup.checkedButton.keystoretype wizard_data['keystore_type'] = keystoregroup.checkedButton.keystoretype
} }

2
electrum/gui/qml/components/wizard/WCProxyConfig.qml

@ -3,7 +3,7 @@ import "../controls"
WizardComponent { WizardComponent {
valid: true valid: true
onAccept: { function apply() {
wizard_data['proxy'] = pc.toProxyDict() wizard_data['proxy'] = pc.toProxyDict()
} }

2
electrum/gui/qml/components/wizard/WCServerConfig.qml

@ -4,7 +4,7 @@ WizardComponent {
valid: true valid: true
last: true last: true
onAccept: { function apply() {
wizard_data['oneserver'] = !sc.auto_server wizard_data['oneserver'] = !sc.auto_server
wizard_data['server'] = sc.address wizard_data['server'] = sc.address
} }

2
electrum/gui/qml/components/wizard/WCWalletName.qml

@ -7,7 +7,7 @@ import org.electrum 1.0
WizardComponent { WizardComponent {
valid: wallet_name.text.length > 0 valid: wallet_name.text.length > 0
onAccept: { function apply() {
wizard_data['wallet_name'] = wallet_name.text wizard_data['wallet_name'] = wallet_name.text
} }

2
electrum/gui/qml/components/wizard/WCWalletPassword.qml

@ -7,7 +7,7 @@ import "../controls"
WizardComponent { WizardComponent {
valid: password1.text === password2.text && password1.text.length > 4 valid: password1.text === password2.text && password1.text.length > 4
onAccept: { function apply() {
wizard_data['password'] = password1.text wizard_data['password'] = password1.text
wizard_data['encrypt'] = password1.text != '' wizard_data['encrypt'] = password1.text != ''
} }

2
electrum/gui/qml/components/wizard/WCWalletType.qml

@ -4,7 +4,7 @@ import QtQuick.Controls 2.1
WizardComponent { WizardComponent {
valid: wallettypegroup.checkedButton !== null valid: wallettypegroup.checkedButton !== null
onAccept: { function apply() {
wizard_data['wallet_type'] = wallettypegroup.checkedButton.wallettype wizard_data['wallet_type'] = wallettypegroup.checkedButton.wallettype
if (wizard_data['wallet_type'] == 'standard') if (wizard_data['wallet_type'] == 'standard')
wizard_data['seed_type'] = 'segwit' wizard_data['seed_type'] = 'segwit'

Loading…
Cancel
Save