tMerge pull request #1316 from kyuupichan/tx_dialog3 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 0a8e8ec906f1fcf573be4a3e3243c5eb5943efb7
DIR parent a636aa07b3f8956572e44693ead3a7ed744e3083
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Fri, 26 Jun 2015 10:48:52 +0200
Merge pull request #1316 from kyuupichan/tx_dialog3
Distinguish receiving and change addrs in TxDialog
Diffstat:
M gui/qt/transaction_dialog.py | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
---
DIR diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
t@@ -215,9 +215,17 @@ class TxDialog(QWidget):
vbox.addWidget(QLabel(_("Inputs")))
ext = QTextCharFormat()
- own = QTextCharFormat()
- own.setBackground(QBrush(QColor("lightgreen")))
- own.setToolTip(_("Own address"))
+ rec = QTextCharFormat()
+ rec.setBackground(QBrush(QColor("lightgreen")))
+ rec.setToolTip(_("Wallet receive address"))
+ chg = QTextCharFormat()
+ chg.setBackground(QBrush(QColor("yellow")))
+ chg.setToolTip(_("Wallet change address"))
+
+ def text_format(addr):
+ if self.wallet.is_mine(addr):
+ return chg if self.wallet.is_change(addr) else rec
+ return ext
i_text = QTextEdit()
i_text.setFont(QFont(MONOSPACE_FONT))
t@@ -239,7 +247,7 @@ class TxDialog(QWidget):
addr = _addr
if addr is None:
addr = _('unknown')
- cursor.insertText(addr, own if self.wallet.is_mine(addr) else ext)
+ cursor.insertText(addr, text_format(addr))
cursor.insertBlock()
vbox.addWidget(i_text)
t@@ -250,10 +258,10 @@ class TxDialog(QWidget):
o_text.setMaximumHeight(100)
cursor = o_text.textCursor()
for addr, v in self.tx.get_outputs():
- cursor.insertText(addr, own if self.wallet.is_mine(addr) else ext)
+ cursor.insertText(addr, text_format(addr))
if v is not None:
cursor.insertText('\t', ext)
- cursor.insertText(self.parent.format_amount(v), ext)
+ cursor.insertText(self.parent.format_amount(v, whitespaces = True), ext)
cursor.insertBlock()
vbox.addWidget(o_text)