AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #1316 from kyuupichan/tx_dialog3

Browse Source 
Distinguish receiving and change addrs in TxDialog
This commit is contained in:
ThomasV
2015-06-26 10:48:52 +02:00
parent a636aa07b3 820f435a9a
commit 0a8e8ec906
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gui/qt/transaction_dialog.py
View File

@@ -215,9 +215,17 @@ class TxDialog(QWidget):
vbox.addWidget(QLabel(_("Inputs"))) vbox.addWidget(QLabel(_("Inputs")))
ext = QTextCharFormat() ext = QTextCharFormat()
own = QTextCharFormat() rec = QTextCharFormat()
own.setBackground(QBrush(QColor("lightgreen"))) rec.setBackground(QBrush(QColor("lightgreen")))
own.setToolTip(_("Own address")) 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 = QTextEdit()
i_text.setFont(QFont(MONOSPACE_FONT)) i_text.setFont(QFont(MONOSPACE_FONT))
@@ -239,7 +247,7 @@ class TxDialog(QWidget):
addr = _addr addr = _addr
if addr is None: if addr is None:
addr = _('unknown') addr = _('unknown')
cursor.insertText(addr, own if self.wallet.is_mine(addr) else ext) cursor.insertText(addr, text_format(addr))
cursor.insertBlock() cursor.insertBlock()
vbox.addWidget(i_text) vbox.addWidget(i_text)
@@ -250,10 +258,10 @@ class TxDialog(QWidget):
o_text.setMaximumHeight(100) o_text.setMaximumHeight(100)
cursor = o_text.textCursor() cursor = o_text.textCursor()
for addr, v in self.tx.get_outputs(): 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: if v is not None:
cursor.insertText('\t', ext) cursor.insertText('\t', ext)
cursor.insertText(self.parent.format_amount(v), ext) cursor.insertText(self.parent.format_amount(v, whitespaces = True), ext)
cursor.insertBlock() cursor.insertBlock()
vbox.addWidget(o_text) vbox.addWidget(o_text)