AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: since qeswaphelper is tied to SwapDialog anyway, let's make it a direct child

Browse Source
This commit is contained in:
Sander van Grieken
2023-04-12 16:19:17 +02:00
parent d5ce9c0994
commit 7a8e980712
1 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
electrum/gui/qml/components/main.qml
View File

@@ -365,9 +365,29 @@ ApplicationWindow
Component {
id: swapDialog
SwapDialog {
onClosed: {
swaphelper.destroy()
destroy()
onClosed: destroy()
swaphelper: SwapHelper {
id: _swaphelper
wallet: Daemon.currentWallet
onConfirm: {
var dialog = app.messageDialog.createObject(app, {text: message, yesno: true})
dialog.accepted.connect(function() {
_swaphelper.executeSwap(true)
})
dialog.open()
}
onAuthRequired: {
app.handleAuthRequired(_swaphelper, method)
}
onError: {
var dialog = app.messageDialog.createObject(app, { text: message })
dialog.open()
}
onSwapStarted: {
// swapdialog.close()
var progressdialog = swapProgressDialog.createObject(app, { swaphelper: swaphelper })
progressdialog.open()
}
}
}
}
@@ -392,29 +412,6 @@ ApplicationWindow
}
}
property alias swaphelper: _swaphelper
Component {
id: _swaphelper
SwapHelper {
id: __swaphelper
wallet: Daemon.currentWallet
onConfirm: {
var dialog = app.messageDialog.createObject(app, {text: message, yesno: true})
dialog.accepted.connect(function() {
__swaphelper.executeSwap(true)
})
dialog.open()
}
onAuthRequired: {
app.handleAuthRequired(__swaphelper, method)
}
onError: {
var dialog = app.messageDialog.createObject(app, { text: message })
dialog.open()
}
}
}
Component.onCompleted: {
coverTimer.start()
@@ -591,13 +588,7 @@ ApplicationWindow
}
function startSwap() {
var swaphelper = app.swaphelper.createObject(app)
var swapdialog = swapDialog.createObject(app, { swaphelper: swaphelper })
swaphelper.swapStarted.connect(function() {
swapdialog.close()
var progressdialog = swapProgressDialog.createObject(app, { swaphelper: swaphelper })
progressdialog.open()
})
var swapdialog = swapDialog.createObject(app)
swapdialog.open()
}