Browse Source

qml: move final wizard submit() to WizardComponent.finish handler

master
Sander van Grieken 2 years ago
parent
commit
0a6b2d521b
No known key found for this signature in database
GPG Key ID: 9BCF8209EA402EBA
  1. 14
      electrum/gui/qml/components/wizard/Wizard.qml
  2. 1
      electrum/gui/qml/components/wizard/WizardComponent.qml

14
electrum/gui/qml/components/wizard/Wizard.qml

@ -84,6 +84,14 @@ ElDialog {
console.log('END') console.log('END')
} }
}) })
page.finish.connect(function() {
// run wizard.submit() a final time, so that the navmap[view]['accept'] handler can run (if any)
var newview = wiz.submit(page.wizard_data)
_setWizardData(newview.wizard_data)
console.log('wizard finished')
// finish wizard
wizard.doAccept()
})
page.prev.connect(function() { page.prev.connect(function() {
var wdata = wiz.prev() var wdata = wiz.prev()
}) })
@ -134,11 +142,7 @@ ElDialog {
function finish() { function finish() {
currentItem.accept() currentItem.accept()
_setWizardData(pages.contentChildren[currentIndex].wizard_data) _setWizardData(pages.contentChildren[currentIndex].wizard_data)
// run wizard.resolve_next() a final time, so that the navmap[view]['accept'] handler can run (if any) currentItem.finish()
var newview = wiz.submit(wizard_data)
_setWizardData(newview.wizard_data)
// finish wizard
wizard.doAccept()
} }
property bool pagevalid: false property bool pagevalid: false

1
electrum/gui/qml/components/wizard/WizardComponent.qml

@ -5,6 +5,7 @@ import QtQuick.Controls.Material
Pane { Pane {
id: root id: root
signal next signal next
signal finish
signal prev signal prev
signal accept signal accept
property var wizard_data : ({}) property var wizard_data : ({})

Loading…
Cancel
Save