trename menu: create tx - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 41878dc5e0c3e126854c9869410f2a48338cc496
DIR parent f957837e218770531502d995556bc34925a6b733
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 15 Sep 2013 09:03:45 +0200
rename menu: create tx
Diffstat:
M gui/gui_classic/main_window.py | 6 +++---
M lib/blockchain.py | 5 ++---
M lib/network.py | 6 +++++-
3 files changed, 10 insertions(+), 7 deletions(-)
---
DIR diff --git a/gui/gui_classic/main_window.py b/gui/gui_classic/main_window.py
t@@ -362,12 +362,12 @@ class ElectrumWindow(QMainWindow):
raw_transaction_text = raw_transaction_menu.addAction(_("&From text"))
raw_transaction_text.triggered.connect(self.do_process_from_text)
- csv_transaction_menu = wallet_menu.addMenu(_("&Load CSV transaction"))
+ csv_transaction_menu = wallet_menu.addMenu(_("&Create transaction"))
- csv_transaction_file = csv_transaction_menu.addAction(_("&From file"))
+ csv_transaction_file = csv_transaction_menu.addAction(_("&From CSV file"))
csv_transaction_file.triggered.connect(self.do_process_from_csv_file)
- csv_transaction_text = csv_transaction_menu.addAction(_("&From text"))
+ csv_transaction_text = csv_transaction_menu.addAction(_("&From CSV text"))
csv_transaction_text.triggered.connect(self.do_process_from_csv_text)
wallet_menu.addSeparator()
DIR diff --git a/lib/blockchain.py b/lib/blockchain.py
t@@ -64,10 +64,9 @@ class Blockchain(threading.Thread):
if not result: continue
- i, result = result
- if not result: continue
+ i, header = result
+ if not header: continue
- header = result.get('result')
height = header.get('block_height')
self.servers_height[i.server] = height
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -50,6 +50,7 @@ class Network(threading.Thread):
self.servers = []
self.banner = ''
self.interface = None
+ self.heights = {}
def register_callback(self, event, callback):
t@@ -156,7 +157,10 @@ class Network(threading.Thread):
else:
self.trigger_callback('disconnected')
- def on_header(self, i, result):
+ def on_header(self, i, r):
+ result = r.get('result')
+ if not result: return
+ self.heights[i.server] = result.get('block_height')
self.blockchain.queue.put((i,result))
def on_peers(self, i, r):