do the banner request in interface, not in wallet
This commit is contained in:
parent
268d7ba3b5
commit
8a720b1629
|
@ -324,7 +324,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
self.connect(self, QtCore.SIGNAL('update_wallet'), self.update_wallet)
|
self.connect(self, QtCore.SIGNAL('update_wallet'), self.update_wallet)
|
||||||
self.connect(self, QtCore.SIGNAL('update_status'), self.update_status)
|
self.connect(self, QtCore.SIGNAL('update_status'), self.update_status)
|
||||||
self.connect(self, QtCore.SIGNAL('banner_signal'), lambda: self.console.showMessage(self.wallet.banner) )
|
self.connect(self, QtCore.SIGNAL('banner_signal'), lambda: self.console.showMessage(self.wallet.interface.banner) )
|
||||||
self.history_list.setFocus(True)
|
self.history_list.setFocus(True)
|
||||||
|
|
||||||
self.exchanger = exchange_rate.Exchanger(self)
|
self.exchanger = exchange_rate.Exchanger(self)
|
||||||
|
@ -337,7 +337,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
tabs.setCurrentIndex (0)
|
tabs.setCurrentIndex (0)
|
||||||
|
|
||||||
# set initial message
|
# set initial message
|
||||||
self.console.showMessage(self.wallet.banner)
|
self.console.showMessage(self.wallet.interface.banner)
|
||||||
|
|
||||||
# plugins that need to change the GUI do it here
|
# plugins that need to change the GUI do it here
|
||||||
self.run_hook('init_gui')
|
self.run_hook('init_gui')
|
||||||
|
|
|
@ -1129,7 +1129,7 @@ class ElectrumWindow:
|
||||||
self.update_history_tab()
|
self.update_history_tab()
|
||||||
self.update_receiving_tab()
|
self.update_receiving_tab()
|
||||||
# addressbook too...
|
# addressbook too...
|
||||||
self.info.set_text( self.wallet.banner )
|
self.info.set_text( self.wallet.interface.banner )
|
||||||
self.wallet_updated = False
|
self.wallet_updated = False
|
||||||
|
|
||||||
def update_receiving_tab(self):
|
def update_receiving_tab(self):
|
||||||
|
|
|
@ -124,7 +124,7 @@ class ElectrumGui:
|
||||||
self.stdscr.addstr( 12, 25, _("[Clear]"), curses.A_REVERSE if self.pos%6==5 else curses.color_pair(2))
|
self.stdscr.addstr( 12, 25, _("[Clear]"), curses.A_REVERSE if self.pos%6==5 else curses.color_pair(2))
|
||||||
|
|
||||||
def print_banner(self):
|
def print_banner(self):
|
||||||
self.stdscr.addstr( 1, 1, self.wallet.banner )
|
self.stdscr.addstr( 1, 1, self.wallet.interface.banner )
|
||||||
|
|
||||||
def print_list(self, list, firstline):
|
def print_list(self, list, firstline):
|
||||||
self.maxpos = len(list)
|
self.maxpos = len(list)
|
||||||
|
|
|
@ -77,7 +77,8 @@ class Interface(threading.Thread):
|
||||||
#json
|
#json
|
||||||
self.message_id = 0
|
self.message_id = 0
|
||||||
self.unanswered_requests = {}
|
self.unanswered_requests = {}
|
||||||
|
#banner
|
||||||
|
self.banner = ''
|
||||||
|
|
||||||
|
|
||||||
def queue_json_response(self, c):
|
def queue_json_response(self, c):
|
||||||
|
@ -106,6 +107,10 @@ class Interface(threading.Thread):
|
||||||
if method == 'server.version':
|
if method == 'server.version':
|
||||||
self.server_version = result
|
self.server_version = result
|
||||||
|
|
||||||
|
elif method == 'server.banner':
|
||||||
|
self.banner = result
|
||||||
|
self.trigger_callback('banner')
|
||||||
|
|
||||||
elif method == 'server.peers.subscribe':
|
elif method == 'server.peers.subscribe':
|
||||||
servers = {}
|
servers = {}
|
||||||
for item in result:
|
for item in result:
|
||||||
|
@ -429,6 +434,7 @@ class Interface(threading.Thread):
|
||||||
self.connect_event.set()
|
self.connect_event.set()
|
||||||
if self.is_connected:
|
if self.is_connected:
|
||||||
self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
|
self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
|
||||||
|
self.send([('server.banner',[])])
|
||||||
self.trigger_callback('connected')
|
self.trigger_callback('connected')
|
||||||
else:
|
else:
|
||||||
self.trigger_callback('notconnected')
|
self.trigger_callback('notconnected')
|
||||||
|
|
|
@ -104,7 +104,6 @@ class Wallet:
|
||||||
self.prevout_values = {} # my own transaction outputs
|
self.prevout_values = {} # my own transaction outputs
|
||||||
self.spent_outputs = []
|
self.spent_outputs = []
|
||||||
self.receipt = None # next receipt
|
self.receipt = None # next receipt
|
||||||
self.banner = ''
|
|
||||||
|
|
||||||
# spv
|
# spv
|
||||||
self.verifier = None
|
self.verifier = None
|
||||||
|
@ -951,7 +950,6 @@ class WalletSynchronizer(threading.Thread):
|
||||||
self.interface = self.wallet.interface
|
self.interface = self.wallet.interface
|
||||||
self.interface.register_channel('synchronizer')
|
self.interface.register_channel('synchronizer')
|
||||||
self.wallet.interface.register_callback('connected', lambda: self.wallet.set_up_to_date(False))
|
self.wallet.interface.register_callback('connected', lambda: self.wallet.set_up_to_date(False))
|
||||||
self.wallet.interface.register_callback('connected', lambda: self.interface.send([('server.banner',[])],'synchronizer') )
|
|
||||||
self.was_updated = True
|
self.was_updated = True
|
||||||
self.running = False
|
self.running = False
|
||||||
self.lock = threading.Lock()
|
self.lock = threading.Lock()
|
||||||
|
@ -1091,9 +1089,6 @@ class WalletSynchronizer(threading.Thread):
|
||||||
self.wallet.tx_result = result
|
self.wallet.tx_result = result
|
||||||
self.wallet.tx_event.set()
|
self.wallet.tx_event.set()
|
||||||
|
|
||||||
elif method == 'server.banner':
|
|
||||||
self.wallet.banner = result
|
|
||||||
self.interface.trigger_callback('banner')
|
|
||||||
else:
|
else:
|
||||||
print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
|
print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue