BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'used' of github.com:wozz/electrum into wozz-used

This commit is contained in:
thomasv 2013-11-22 13:36:02 +01:00
parent 3616116118 acca8d502b
commit 3c10a52ea1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui/qt/main_window.py
View File

@ -1276,6 +1276,8 @@ class ElectrumWindow(QMainWindow):
name = _("Receiving") if not is_change else _("Change")
seq_item = QTreeWidgetItem( [ name, '', '', '', ''] )
account_item.addChild(seq_item)
used_item = QTreeWidgetItem( [ _("Used"), '', '', '', ''] )
used_flag = False
if not is_change: seq_item.setExpanded(True)
is_red = False
@ -1291,12 +1293,19 @@ class ElectrumWindow(QMainWindow):
else:
gap = 0
c, u = self.wallet.get_addr_balance(address)
num_tx = '*' if h == ['*'] else "%d"%len(h)
item = QTreeWidgetItem( [ address, '', '', num_tx] )
self.update_receive_item(item, len(h))
if is_red:
item.setBackgroundColor(1, QColor('red'))
seq_item.addChild(item)
if len(h) > 0 and c == -u:
if not used_flag:
seq_item.addChild(used_item)
used_flag = True
used_item.addChild(item)
else:
seq_item.addChild(item)
for k, addr in self.wallet.get_pending_accounts():