electrum

commit a00203d374c58a4b89b9c3d585ec9af584adb7fe
parent f6cc37d1d2654f8960a14b0e336223362b9276c4
Author: ThomasV <thomasv@electrum.org>
Date:   Thu, 26 Oct 2017 16:16:50 +0200

Merge pull request #3128 from SomberNight/netw_dial_refresh_proxy_settings

(QT network dialog) don't keep resetting proxy settings
Diffstat:
M
gui/qt/network_dialog.py
 | 
33
++++++++++++++++++++-------------

1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
@@ -316,6 +316,8 @@ class NetworkChoiceLayout(object):
         self.td = td = TorDetector()
         td.found_proxy.connect(self.suggest_proxy)
         td.start()
+
+        self.fill_in_proxy_settings()
         self.update()
 
     def check_disable_proxy(self, b):
@@ -337,8 +339,6 @@ class NetworkChoiceLayout(object):
 
     def update(self):
         host, port, protocol, proxy_config, auto_connect = self.network.get_parameters()
-        if not proxy_config:
-            proxy_config = { "mode":"none", "host":"localhost", "port":"9050"}
         self.server_host.setText(host)
         self.server_port.setText(port)
         self.ssl_cb.setChecked(protocol=='s')
@@ -352,17 +352,6 @@ class NetworkChoiceLayout(object):
         self.servers_list.update(self.servers, self.protocol, self.tor_cb.isChecked())
         self.enable_set_server()
 
-        # proxy tab
-        b = proxy_config.get('mode') != "none"
-        self.check_disable_proxy(b)
-        if b:
-            self.proxy_cb.setChecked(True)
-            self.proxy_mode.setCurrentIndex(self.proxy_mode.findText(str(proxy_config.get("mode").upper())))
-        self.proxy_host.setText(proxy_config.get("host"))
-        self.proxy_port.setText(proxy_config.get("port"))
-        self.proxy_user.setText(proxy_config.get("user", ""))
-        self.proxy_password.setText(proxy_config.get("password", ""))
-
         height_str = "%d "%(self.network.get_local_height()) + _('blocks')
         self.height_label.setText(height_str)
         n = len(self.network.get_interfaces())
@@ -381,6 +370,23 @@ class NetworkChoiceLayout(object):
         self.split_label.setText(msg)
         self.nodes_list_widget.update(self.network)
 
+    def fill_in_proxy_settings(self):
+        host, port, protocol, proxy_config, auto_connect = self.network.get_parameters()
+        if not proxy_config:
+            proxy_config = {"mode": "none", "host": "localhost", "port": "9050"}
+
+        b = proxy_config.get('mode') != "none"
+        self.check_disable_proxy(b)
+        if b:
+            self.proxy_cb.setChecked(True)
+            self.proxy_mode.setCurrentIndex(
+                self.proxy_mode.findText(str(proxy_config.get("mode").upper())))
+
+        self.proxy_host.setText(proxy_config.get("host"))
+        self.proxy_port.setText(proxy_config.get("port"))
+        self.proxy_user.setText(proxy_config.get("user", ""))
+        self.proxy_password.setText(proxy_config.get("password", ""))
+
     def layout(self):
         return self.layout_
 
@@ -482,6 +488,7 @@ class NetworkChoiceLayout(object):
             self.proxy_password.setText("")
             self.tor_cb.setChecked(True)
             self.proxy_cb.setChecked(True)
+        self.check_disable_proxy(use_it)
         self.set_proxy()
 
     def proxy_settings_changed(self):