text gui: proxy

This commit is contained in:
thomasv 2012-11-08 11:12:03 +01:00
parent 96a3fdbbc4
commit ea5478f2ab
1 changed files with 19 additions and 6 deletions

View File

@ -314,10 +314,20 @@ class ElectrumGui:
def network_dialog(self): def network_dialog(self):
out = self.run_dialog('Network', [ out = self.run_dialog('Network', [
{'label':'server', 'type':'str', 'value':self.wallet.interface.server}, {'label':'server', 'type':'str', 'value':self.wallet.interface.server},
{'label':'proxy', 'type':'str', 'value':self.config.get('proxy')}, {'label':'proxy', 'type':'str', 'value':self.config.get('proxy', '')},
], buttons = 1) ], buttons = 1)
if out: if out:
if out.get('server'): self.wallet.interface.set_server(out.get('server')) if out.get('server'):
server = out.get('server')
if out.get('proxy'):
proxy = self.parse_proxy_options(out.get('proxy'))
else:
proxy = None
self.wallet.config.set_key("proxy", proxy, True)
self.wallet.config.set_key("server", server, True)
self.wallet.interface.set_server(server, proxy)
def settings_dialog(self): def settings_dialog(self):
@ -361,15 +371,18 @@ class ElectrumGui:
if item.get('type') == 'list': if item.get('type') == 'list':
value = item.get('value','') value = item.get('value','')
elif item.get('type') == 'satoshis': elif item.get('type') == 'satoshis':
value = item.get('value') value = item.get('value','')
elif item.get('type') == 'str': elif item.get('type') == 'str':
value = item.get('value','') value = item.get('value','')
elif item.get('type') == 'password': elif item.get('type') == 'password':
value = '*'*len(item.get('value','')) value = '*'*len(item.get('value',''))
if not value: value = ' '
else: else:
value = None value = ''
if value:
if len(value)<20:
value += ' '*(20-len(value))
if item.has_key('value'):
w.addstr( 2+interval*i, 2, label) w.addstr( 2+interval*i, 2, label)
w.addstr( 2+interval*i, 15, value, curses.A_REVERSE if self.popup_pos%num==i else curses.color_pair(1) ) w.addstr( 2+interval*i, 15, value, curses.A_REVERSE if self.popup_pos%num==i else curses.color_pair(1) )
else: else: