ttransaction_dialog: don't override base class - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit d9a13a5dd1daf13d26447c9018c6fb6b61bf9668
DIR parent 3574ade4849022d3ce09b393a4482cd5e15f13d9
HTML Author: Neil Booth <kyuupichan@gmail.com>
Date: Sun, 17 Jan 2016 13:36:40 +0900
ttransaction_dialog: don't override base class
Rename parent to main_window. Make the main window our parent.
Diffstat:
M gui/qt/transaction_dialog.py | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
---
DIR diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
t@@ -44,16 +44,16 @@ class TxDialog(QDialog, MessageBoxMixin):
'''Transactions in the wallet will show their description.
Pass desc to give a description for txs not yet in the wallet.
'''
+ QDialog.__init__(self, parent)
self.tx = tx
self.tx.deserialize()
- self.parent = parent
+ self.main_window = parent
self.wallet = parent.wallet
self.prompt_if_unsaved = prompt_if_unsaved
self.saved = False
self.broadcast = False
self.desc = desc
- QDialog.__init__(self)
self.setMinimumWidth(660)
self.setWindowTitle(_("Transaction"))
t@@ -62,7 +62,7 @@ class TxDialog(QDialog, MessageBoxMixin):
vbox.addWidget(QLabel(_("Transaction ID:")))
self.tx_hash_e = ButtonsLineEdit()
- qr_show = lambda: self.parent.show_qrcode(str(self.tx_hash_e.text()), 'Transaction ID', parent=self)
+ qr_show = lambda: parent.show_qrcode(str(self.tx_hash_e.text()), 'Transaction ID', parent=self)
self.tx_hash_e.addButton(":icons/qrcode.png", qr_show, _("Show as QR code"))
self.tx_hash_e.setReadOnly(True)
vbox.addWidget(self.tx_hash_e)
t@@ -99,7 +99,7 @@ class TxDialog(QDialog, MessageBoxMixin):
b.setIcon(QIcon(":icons/qrcode.png"))
b.clicked.connect(self.show_qr)
- self.copy_button = CopyButton(lambda: str(self.tx), self.parent.app)
+ self.copy_button = CopyButton(lambda: str(self.tx), parent.app)
# Action buttons
self.buttons = [self.sign_button, self.broadcast_button, self.cancel_button]
t@@ -116,7 +116,7 @@ class TxDialog(QDialog, MessageBoxMixin):
self.update()
def do_broadcast(self):
- self.parent.broadcast_transaction(self.tx, self.desc, self)
+ self.main_window.broadcast_transaction(self.tx, self.desc, self)
self.broadcast = True
self.update()
t@@ -132,7 +132,7 @@ class TxDialog(QDialog, MessageBoxMixin):
text = self.tx.raw.decode('hex')
text = base_encode(text, base=43)
try:
- self.parent.show_qrcode(text, 'Transaction', parent=self)
+ self.main_window.show_qrcode(text, 'Transaction', parent=self)
except Exception as e:
self.show_message(str(e))
t@@ -148,11 +148,11 @@ class TxDialog(QDialog, MessageBoxMixin):
self.sign_button.setDisabled(True)
# Note sign_tx is wrapped and parent= is actually passed
# to the password input dialog box
- self.parent.sign_tx(self.tx, sign_done, parent=self)
+ self.main_window.sign_tx(self.tx, sign_done, parent=self)
def save(self):
name = 'signed_%s.txn' % (self.tx.hash()[0:8]) if self.tx.is_complete() else 'unsigned.txn'
- fileName = self.parent.getSaveFileName(_("Select where to save your signed transaction"), name, "*.txn")
+ fileName = self.main_window.getSaveFileName(_("Select where to save your signed transaction"), name, "*.txn")
if fileName:
with open(fileName, "w+") as f:
f.write(json.dumps(self.tx.as_dict(), indent=4) + '\n')
t@@ -181,7 +181,7 @@ class TxDialog(QDialog, MessageBoxMixin):
else:
self.broadcast_button.show()
# cannot broadcast when offline
- if self.parent.network is None:
+ if self.main_window.network is None:
self.broadcast_button.setEnabled(False)
else:
s, r = self.tx.signature_count()
t@@ -211,16 +211,19 @@ class TxDialog(QDialog, MessageBoxMixin):
if not self.wallet.up_to_date:
return
+ base_unit = self.main_window.base_unit()
+ format_amount = self.main_window.format_amount
+
if is_relevant:
if is_mine:
if fee is not None:
- self.amount_label.setText(_("Amount sent:")+' %s'% self.parent.format_amount(-v+fee) + ' ' + self.parent.base_unit())
- self.fee_label.setText(_("Transaction fee")+': %s'% self.parent.format_amount(-fee) + ' ' + self.parent.base_unit())
+ self.amount_label.setText(_("Amount sent:")+' %s'% format_amount(-v+fee) + ' ' + base_unit)
+ self.fee_label.setText(_("Transaction fee")+': %s'% format_amount(-fee) + ' ' + base_unit)
else:
- self.amount_label.setText(_("Amount sent:")+' %s'% self.parent.format_amount(-v) + ' ' + self.parent.base_unit())
+ self.amount_label.setText(_("Amount sent:")+' %s'% format_amount(-v) + ' ' + base_unit)
self.fee_label.setText(_("Transaction fee")+': '+ _("unknown"))
else:
- self.amount_label.setText(_("Amount received:")+' %s'% self.parent.format_amount(v) + ' ' + self.parent.base_unit())
+ self.amount_label.setText(_("Amount received:")+' %s'% format_amount(v) + ' ' + base_unit)
else:
self.amount_label.setText(_("Transaction unrelated to your wallet"))
t@@ -248,7 +251,7 @@ class TxDialog(QDialog, MessageBoxMixin):
return ext
def format_amount(amt):
- return self.parent.format_amount(amt, whitespaces = True)
+ return self.main_window.format_amount(amt, whitespaces = True)
i_text = QTextEdit()
i_text.setFont(QFont(MONOSPACE_FONT))