Browse Source

qml: don't auto-pop Scan

TODO: handle cancel by signal too
patch-4
Sander van Grieken 2 years ago
parent
commit
d52cd2f2e6
  1. 1
      electrum/gui/qml/components/OpenChannel.qml
  2. 1
      electrum/gui/qml/components/Scan.qml
  3. 3
      electrum/gui/qml/components/Send.qml

1
electrum/gui/qml/components/OpenChannel.qml

@ -64,6 +64,7 @@ Pane {
channelopener.nodeid = page.scanData channelopener.nodeid = page.scanData
node.text = channelopener.nodeid node.text = channelopener.nodeid
} }
app.stack.pop()
}) })
} }
} }

1
electrum/gui/qml/components/Scan.qml

@ -24,7 +24,6 @@ Item {
onFound: { onFound: {
scanPage.scanData = scanData scanPage.scanData = scanData
scanPage.found() scanPage.found()
app.stack.pop()
} }
} }

3
electrum/gui/qml/components/Send.qml

@ -84,10 +84,11 @@ Pane {
page.onFound.connect(function() { page.onFound.connect(function() {
var text = page.scanData var text = page.scanData
if (bitcoin.verify_raw_tx(text)) { if (bitcoin.verify_raw_tx(text)) {
app.stack.push(Qt.resolvedUrl('TxDetails.qml'), app.stack.replace(Qt.resolvedUrl('TxDetails.qml'),
{ rawtx: text } { rawtx: text }
) )
} else { } else {
app.stack.pop()
invoice.recipient = text invoice.recipient = text
} }
}) })

Loading…
Cancel
Save