tMerge branch 'used' of github.com:wozz/electrum into wozz-used - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 3c10a52ea1426b38cee53f7b693f653b68377d16
DIR parent 361611611869dfe0206e87585c9802c08646a4fe
HTML Author: thomasv <thomasv@gitorious>
Date: Fri, 22 Nov 2013 13:36:02 +0100
Merge branch 'used' of github.com:wozz/electrum into wozz-used
Diffstat:
M gui/qt/main_window.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -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
t@@ -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():