Mercurial Repositories > eric / changeset

--- a/UI/UserInterface.py	Thu Apr 27 18:32:57 2017 +0200
+++ b/UI/UserInterface.py	Thu Apr 27 18:33:57 2017 +0200
@@ -210,6 +210,8 @@
         
         self.__proxyFactory = E5NetworkProxyFactory()
         QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
+        QNetworkProxyFactory.setUseSystemConfiguration(
+            Preferences.getUI("UseSystemProxy"))
         
         self.capProject = ""
         self.capEditor = ""
@@ -5526,6 +5528,9 @@
             self.bottomSidebar.setDelay(delay)
             self.rightSidebar.setDelay(delay)
         
+        QNetworkProxyFactory.setUseSystemConfiguration(
+            Preferences.getUI("UseSystemProxy"))
+        
         from HexEdit.HexEditMainWindow import HexEditMainWindow
         for hexEditor in HexEditMainWindow.windows:
             hexEditor.preferencesChanged()

--- a/WebBrowser/Network/NetworkManager.py	Thu Apr 27 18:32:57 2017 +0200
+++ b/WebBrowser/Network/NetworkManager.py	Thu Apr 27 18:33:57 2017 +0200
@@ -14,7 +14,7 @@
 from PyQt5.QtCore import pyqtSignal, QByteArray
 from PyQt5.QtWidgets import qApp, QStyle, QDialog
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkProxy, \
-    QNetworkRequest
+    QNetworkProxyFactory, QNetworkRequest
 from PyQt5.QtWebEngineWidgets import QWebEnginePage
 
 from E5Gui import E5MessageBox
@@ -52,12 +52,14 @@
         super(NetworkManager, self).__init__(parent)
         
         if not WebBrowserWindow._fromEric:
-            from PyQt5.QtNetwork import QNetworkProxyFactory
             from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
             
             self.__proxyFactory = E5NetworkProxyFactory()
             QNetworkProxyFactory.setApplicationProxyFactory(
                 self.__proxyFactory)
+            
+            QNetworkProxyFactory.setUseSystemConfiguration(
+                Preferences.getUI("UseSystemProxy"))
         
         self.languagesChanged()
         
@@ -334,6 +336,10 @@
         Public slot to handle a change of preferences.
         """
         self.__interceptor.preferencesChanged()
+            
+        if not WebBrowserWindow._fromEric:
+            QNetworkProxyFactory.setUseSystemConfiguration(
+                Preferences.getUI("UseSystemProxy"))
     
     def createRequest(self, op, request, data):
         """