Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/E5Network/E5NetworkProxyFactory.py	Sun Oct 21 14:22:31 2018 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Sun Oct 21 18:42:53 2018 +0200
@@ -186,10 +186,8 @@
                         if value and name[-6:] == '_proxy' and \
                            name[:-6] == query.protocolTag().lower():
                             url = QUrl(value)
-                            if url.scheme() == "http":
+                            if url.scheme() in ["http", "https"]:
                                 proxyType = QNetworkProxy.HttpProxy
-                            elif url.scheme() == "https":
-                                proxyType = QNetworkProxy.HttpCachingProxy
                             elif url.scheme() == "ftp":
                                 proxyType = QNetworkProxy.FtpCachingProxy
                             else:
@@ -234,8 +232,6 @@
                     if protocolKey in ["Http", "Https", "Ftp"]:
                         if query.protocolTag() == "ftp":
                             proxyType = QNetworkProxy.FtpCachingProxy
-                        elif query.protocolTag() == "https":
-                            proxyType = QNetworkProxy.HttpCachingProxy
                         else:
                             proxyType = QNetworkProxy.HttpProxy
                         proxy = QNetworkProxy(

--- a/UI/UserInterface.py	Sun Oct 21 14:22:31 2018 +0200
+++ b/UI/UserInterface.py	Sun Oct 21 18:42:53 2018 +0200
@@ -222,9 +222,14 @@
         self.__startup = True
         
         self.__proxyFactory = E5NetworkProxyFactory()
-        QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
-        QNetworkProxyFactory.setUseSystemConfiguration(
-            Preferences.getUI("UseSystemProxy"))
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                QNetworkProxyFactory())
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         self.capProject = ""
         self.capEditor = ""
@@ -5821,8 +5826,14 @@
             self.bottomSidebar.setDelay(delay)
             self.rightSidebar.setDelay(delay)
         
-        QNetworkProxyFactory.setUseSystemConfiguration(
-            Preferences.getUI("UseSystemProxy"))
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                QNetworkProxyFactory())
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         from HexEdit.HexEditMainWindow import HexEditMainWindow
         for hexEditor in HexEditMainWindow.windows:

--- a/WebBrowser/Network/NetworkManager.py	Sun Oct 21 14:22:31 2018 +0200
+++ b/WebBrowser/Network/NetworkManager.py	Sun Oct 21 18:42:53 2018 +0200
@@ -54,11 +54,14 @@
             from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
             
             self.__proxyFactory = E5NetworkProxyFactory()
-            QNetworkProxyFactory.setApplicationProxyFactory(
-                self.__proxyFactory)
-            
-            QNetworkProxyFactory.setUseSystemConfiguration(
-                Preferences.getUI("UseSystemProxy"))
+            if Preferences.getUI("UseSystemProxy"):
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    QNetworkProxyFactory())
+                QNetworkProxyFactory.setUseSystemConfiguration(True)
+            else:
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    self.__proxyFactory)
+                QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         self.languagesChanged()
         
@@ -340,8 +343,14 @@
         self.__interceptor.preferencesChanged()
             
         if not WebBrowserWindow._fromEric:
-            QNetworkProxyFactory.setUseSystemConfiguration(
-                Preferences.getUI("UseSystemProxy"))
+            if Preferences.getUI("UseSystemProxy"):
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    QNetworkProxyFactory())
+                QNetworkProxyFactory.setUseSystemConfiguration(True)
+            else:
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    self.__proxyFactory)
+                QNetworkProxyFactory.setUseSystemConfiguration(False)
     
     def createRequest(self, op, request, data):
         """