tslightly better notifications. at least, it fixes #652 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 80a988e3375c6b2c1e6d307275de3ac8038236f3
DIR parent 696766c370e0ec5ce94ec930cc64979f63d0f410
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 17 Apr 2014 17:38:21 +0200
slightly better notifications. at least, it fixes #652
Diffstat:
M gui/qt/main_window.py | 12 ++++++------
M lib/daemon.py | 1 +
M lib/interface.py | 1 -
M lib/network.py | 1 +
M lib/wallet.py | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -409,12 +409,12 @@ class ElectrumWindow(QMainWindow):
return
print_error("Notifying GUI")
- if len(self.network.interface.pending_transactions_for_notifications) > 0:
+ if len(self.network.pending_transactions_for_notifications) > 0:
# Combine the transactions if there are more then three
- tx_amount = len(self.network.interface.pending_transactions_for_notifications)
+ tx_amount = len(self.network.pending_transactions_for_notifications)
if(tx_amount >= 3):
total_amount = 0
- for tx in self.network.interface.pending_transactions_for_notifications:
+ for tx in self.network.pending_transactions_for_notifications:
is_relevant, is_mine, v, fee = self.wallet.get_tx_value(tx)
if(v > 0):
total_amount += v
t@@ -422,11 +422,11 @@ class ElectrumWindow(QMainWindow):
self.notify(_("%(txs)s new transactions received. Total amount received in the new transactions %(amount)s %(unit)s") \
% { 'txs' : tx_amount, 'amount' : self.format_amount(total_amount), 'unit' : self.base_unit()})
- self.network.interface.pending_transactions_for_notifications = []
+ self.network.pending_transactions_for_notifications = []
else:
- for tx in self.network.interface.pending_transactions_for_notifications:
+ for tx in self.network.pending_transactions_for_notifications:
if tx:
- self.network.interface.pending_transactions_for_notifications.remove(tx)
+ self.network.pending_transactions_for_notifications.remove(tx)
is_relevant, is_mine, v, fee = self.wallet.get_tx_value(tx)
if(v > 0):
self.notify(_("New transaction received. %(amount)s %(unit)s") % { 'amount' : self.format_amount(v), 'unit' : self.base_unit()})
DIR diff --git a/lib/daemon.py b/lib/daemon.py
t@@ -45,6 +45,7 @@ class NetworkProxy(threading.Thread):
self.subscriptions = {}
self.debug = False
self.lock = threading.Lock()
+ self.pending_transactions_for_notifications = []
def start(self, start_daemon=False):
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -105,7 +105,6 @@ class Interface(threading.Thread):
#json
self.message_id = 0
self.unanswered_requests = {}
- self.pending_transactions_for_notifications= []
# parse server
self.server = server
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -111,6 +111,7 @@ class Network(threading.Thread):
self.subscriptions = {}
self.subscriptions[self.on_banner] = [('server.banner',[])]
self.subscriptions[self.on_peers] = [('server.peers.subscribe',[])]
+ self.pending_transactions_for_notifications = []
def is_connected(self):
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1103,7 +1103,7 @@ class NewWallet:
print_error("received transaction that is no longer referenced in history", tx_hash)
return
self.transactions[tx_hash] = tx
- self.network.interface.pending_transactions_for_notifications.append(tx)
+ self.network.pending_transactions_for_notifications.append(tx)
self.save_transactions()
if self.verifier and tx_height>0:
self.verifier.add(tx_hash, tx_height)