Browse Source

qml: show QR when finalized and saved

master
Sander van Grieken 3 years ago
parent
commit
b7106fd746
  1. 4
      electrum/gui/qml/components/NetworkOverview.qml
  2. 5
      electrum/gui/qml/components/TxDetails.qml
  3. 7
      electrum/gui/qml/components/WalletMainView.qml
  4. 5
      electrum/gui/qml/qetxfinalizer.py

4
electrum/gui/qml/components/NetworkOverview.qml

@ -69,8 +69,8 @@ Pane {
RowLayout { RowLayout {
Image { Image {
visible: Network.isProxyTor visible: Network.isProxyTor
Layout.preferredWidth: constants.iconSizeSmall Layout.preferredWidth: constants.iconSizeMedium
Layout.preferredHeight: constants.iconSizeSmall Layout.preferredHeight: constants.iconSizeMedium
source: '../../icons/tor_logo.png' source: '../../icons/tor_logo.png'
} }
Label { Label {

5
electrum/gui/qml/components/TxDetails.qml

@ -24,6 +24,11 @@ Pane {
app.stack.pop() app.stack.pop()
} }
function showExport() {
var dialog = exportTxDialog.createObject(root, { txdetails: txdetails })
dialog.open()
}
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0

7
electrum/gui/qml/components/WalletMainView.qml

@ -313,7 +313,12 @@ Item {
finalizer: TxFinalizer { finalizer: TxFinalizer {
wallet: Daemon.currentWallet wallet: Daemon.currentWallet
canRbf: true canRbf: true
onFinished: _confirmPaymentDialog.destroy() onFinishedSave: {
// tx was (partially) signed and saved. Show QR for co-signers or online wallet
var page = app.stack.push(Qt.resolvedUrl('TxDetails.qml'), { txid: txid })
page.showExport()
_confirmPaymentDialog.destroy()
}
} }
} }
} }

5
electrum/gui/qml/qetxfinalizer.py

@ -220,7 +220,7 @@ class TxFeeSlider(FeeSlider):
class QETxFinalizer(TxFeeSlider): class QETxFinalizer(TxFeeSlider):
_logger = get_logger(__name__) _logger = get_logger(__name__)
finished = pyqtSignal() finishedSave = pyqtSignal([str], arguments=['txid'])
def __init__(self, parent=None, *, make_tx=None, accept=None): def __init__(self, parent=None, *, make_tx=None, accept=None):
super().__init__(parent) super().__init__(parent)
@ -352,7 +352,6 @@ class QETxFinalizer(TxFeeSlider):
return return
self._wallet.sign(self._tx, broadcast=True) self._wallet.sign(self._tx, broadcast=True)
self.finished.emit()
@pyqtSlot() @pyqtSlot()
def signAndSave(self): def signAndSave(self):
@ -383,7 +382,7 @@ class QETxFinalizer(TxFeeSlider):
if not self._wallet.wallet.adb.add_transaction(self._tx): if not self._wallet.wallet.adb.add_transaction(self._tx):
self._logger.error('Could not save tx') self._logger.error('Could not save tx')
self.finished.emit() self.finishedSave.emit(self._tx.txid())
@pyqtSlot(result=str) @pyqtSlot(result=str)
@pyqtSlot(bool, result=str) @pyqtSlot(bool, result=str)

Loading…
Cancel
Save