tMerge pull request #422 from thgh/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8b5f5fc89b1aac3c6e035a435996dbeb862e7d80
DIR parent cff8515e3c88951f6c205299967a3a41ebc0b737
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Fri, 15 Nov 2013 01:19:36 -0800
Merge pull request #422 from thgh/master
Old addresses on receive tab grayed out
Diffstat:
M gui/qt/main_window.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1173,7 +1173,7 @@ class ElectrumWindow(QMainWindow):
menu.exec_(self.contacts_list.viewport().mapToGlobal(position))
- def update_receive_item(self, item):
+ def update_receive_item(self, item, num_tx = 0):
item.setFont(0, QFont(MONOSPACE_FONT))
address = str(item.data(0,0).toString())
label = self.wallet.labels.get(address,'')
t@@ -1188,11 +1188,16 @@ class ElectrumWindow(QMainWindow):
balance = self.format_amount(c + u)
item.setData(2,0,balance)
- if address in self.wallet.frozen_addresses:
+ if (num_tx > 1) and (c == -u):
+ item.setForeground(0,QColor('lightgray'))
+ item.setForeground(1,QColor('gray'))
+ item.setForeground(2,QColor('gray'))
+ item.setForeground(3,QColor('gray'))
+ elif address in self.wallet.frozen_addresses:
item.setBackgroundColor(0, QColor('lightblue'))
elif address in self.wallet.prioritized_addresses:
item.setBackgroundColor(0, QColor('lightgreen'))
-
+
def update_receive_tab(self):
l = self.receive_list
t@@ -1243,7 +1248,7 @@ class ElectrumWindow(QMainWindow):
num_tx = '*' if h == ['*'] else "%d"%len(h)
item = QTreeWidgetItem( [ address, '', '', num_tx] )
- self.update_receive_item(item)
+ self.update_receive_item(item, len(h))
if is_red:
item.setBackgroundColor(1, QColor('red'))
seq_item.addChild(item)