tgui fixes - electrum - Electrum Bitcoin wallet
(HTM) git clone https://git.parazyd.org/electrum
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
---
(DIR) commit 0a7b69fc5b3c2527e5b5c427de80a20579294f01
(DIR) parent 13c9991be8baadab9410f46f77d92ee49b023df6
(HTM) Author: ThomasV <thomasv@gitorious>
Date: Sun, 4 Nov 2012 11:57:12 +0100
gui fixes
Diffstat:
M lib/gui.py | 14 +++++++-------
M lib/gui_qt.py | 6 ++++--
2 files changed, 11 insertions(+), 9 deletions(-)
---
(DIR) diff --git a/lib/gui.py b/lib/gui.py
t@@ -1199,10 +1199,8 @@ class ElectrumWindow:
for address in self.wallet.all_addresses():
if self.wallet.is_change(address):continue
label = self.wallet.labels.get(address)
- n = 0
h = self.wallet.history.get(address,[])
- for item in h:
- if not item['is_input'] : n=n+1
+ n = len(h)
tx = "None" if n==0 else "%d"%n
self.recv_list.append((address, label, tx ))
t@@ -1217,7 +1215,7 @@ class ElectrumWindow:
for address in self.wallet.addressbook:
label = self.wallet.labels.get(address)
n = 0
- for item in self.wallet.tx_history.values():
+ for item in self.wallet.transactions.values():
if address in item['outputs'] : n=n+1
tx = "None" if n==0 else "%d"%n
self.addressbook_list.append((address, label, tx))
t@@ -1236,20 +1234,22 @@ class ElectrumWindow:
conf = 0
time_str = 'pending'
conf_icon = gtk.STOCK_EXECUTE
- v = tx['value']
+ v = self.wallet.get_tx_value(tx_hash)
balance += v
label = self.wallet.labels.get(tx_hash)
is_default_label = (label == '') or (label is None)
if is_default_label: label = tx['default_label']
tooltip = tx_hash + "\n%d confirmations"%conf
+ inputs = map(lambda x: x.get('address'), tx['inputs'])
+ outputs = map(lambda x: x.get('address'), tx['outputs'])
# tx = self.wallet.tx_history.get(tx_hash)
details = "Transaction Details:\n\n" \
+ "Transaction ID:\n" + tx_hash + "\n\n" \
+ "Status: %d confirmations\n\n"%conf \
+ "Date: %s\n\n"%time_str \
- + "Inputs:\n-"+ '\n-'.join(tx['inputs']) + "\n\n" \
- + "Outputs:\n-"+ '\n-'.join(tx['outputs'])
+ + "Inputs:\n-"+ '\n-'.join(inputs) + "\n\n" \
+ + "Outputs:\n-"+ '\n-'.join(outputs)
r = self.wallet.receipts.get(tx_hash)
if r:
details += "\n_______________________________________" \
(DIR) diff --git a/lib/gui_qt.py b/lib/gui_qt.py
t@@ -339,12 +339,14 @@ class ElectrumWindow(QMainWindow):
conf = 0
time_str = 'pending'
+ inputs = map(lambda x: x.get('address'), tx['inputs'])
+ outputs = map(lambda x: x.get('address'), tx['outputs'])
tx_details = _("Transaction Details") +"\n\n" \
+ "Transaction ID:\n" + tx_hash + "\n\n" \
+ "Status: %d confirmations\n\n"%conf \
+ "Date: %s\n\n"%time_str \
- + "Inputs:\n-"+ '\n-'.join(tx['inputs']) + "\n\n" \
- + "Outputs:\n-"+ '\n-'.join(tx['outputs'])
+ + "Inputs:\n-"+ '\n-'.join(inputs) + "\n\n" \
+ + "Outputs:\n-"+ '\n-'.join(outputs)
r = self.wallet.receipts.get(tx_hash)
if r: