Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Sat Oct 06 14:48:45 2018 +0200
+++ b/UI/UserInterface.py	Thu Nov 01 11:47:39 2018 +0100
@@ -222,9 +222,12 @@
         self.__startup = True
         
         self.__proxyFactory = E5NetworkProxyFactory()
-        QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
-        QNetworkProxyFactory.setUseSystemConfiguration(
-            Preferences.getUI("UseSystemProxy"))
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         self.capProject = ""
         self.capEditor = ""
@@ -3178,8 +3181,9 @@
             self.sbLine, self.sbPos, self.sbWritable, self.sbEncoding,
             self.sbLanguage, self.sbEol, self.sbZoom)
 
-        from VCS.StatusMonitorLed import StatusMonitorLed
-        self.sbVcsMonitorLed = StatusMonitorLed(self.project, self.__statusBar)
+        from VCS.StatusMonitorLed import StatusMonitorLedWidget
+        self.sbVcsMonitorLed = StatusMonitorLedWidget(
+            self.project, self.__statusBar)
         self.__statusBar.addPermanentWidget(self.sbVcsMonitorLed)
         
         self.networkIcon = E5NetworkIcon(self.__statusBar)
@@ -5819,8 +5823,12 @@
             self.bottomSidebar.setDelay(delay)
             self.rightSidebar.setDelay(delay)
         
-        QNetworkProxyFactory.setUseSystemConfiguration(
-            Preferences.getUI("UseSystemProxy"))
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         from HexEdit.HexEditMainWindow import HexEditMainWindow
         for hexEditor in HexEditMainWindow.windows: