AaronFiore/electrum
1
0
Fork 0
Code Activity

network.NetworkParameters: merge host+port+protocol into "server" field

Browse Source
This commit is contained in:
SomberNight
2020-04-16 20:30:53 +02:00
parent adc3784bc2
commit b2cfaddff2
7 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/gui/qt/network_dialog.py
View File

@@ -364,11 +364,11 @@ class NetworkChoiceLayout(object):
def update(self):
net_params = self.network.get_parameters()
host, port, protocol = net_params.host, net_params.port, net_params.protocol
server = net_params.server
proxy_config, auto_connect = net_params.proxy, net_params.auto_connect
if not self.server_host.hasFocus() and not self.server_port.hasFocus():
self.server_host.setText(host)
self.server_port.setText(str(port))
self.server_host.setText(server.host)
self.server_port.setText(str(server.port))
self.autoconnect_cb.setChecked(auto_connect)
interface = self.network.interface
@@ -448,8 +448,13 @@ class NetworkChoiceLayout(object):
def set_server(self):
net_params = self.network.get_parameters()
net_params = net_params._replace(host=str(self.server_host.text()),
port=str(self.server_port.text()),
try:
server = ServerAddr(host=str(self.server_host.text()),
port=str(self.server_port.text()),
protocol=net_params.server.protocol)
except Exception:
return
net_params = net_params._replace(server=server,
auto_connect=self.autoconnect_cb.isChecked())
self.network.run_from_another_thread(self.network.set_parameters(net_params))