Mercurial Repositories > eric / file comparison
comparison: src/eric7/WebBrowser/Network/NetworkManager.py
src/eric7/WebBrowser/Network/NetworkManager.py
- branch
- eric7
- changeset 11100
- c6318dd53df1
- parent 11090
- f5f5f5803935
- child 11148
- 15e30f0c76a8
equal
deleted
inserted
replaced
| 11099:fa77857e5c80 | 11100:c6318dd53df1 |
|---|---|
| 61 @param parent reference to the parent object | 61 @param parent reference to the parent object |
| 62 @type QObject | 62 @type QObject |
| 63 """ | 63 """ |
| 64 super().__init__(parent) | 64 super().__init__(parent) |
| 65 | 65 |
| 66 self.__proxyFactory = EricNetworkProxyFactory() | |
| 67 if EricPreferences.getNetworkProxy("UseSystemProxy"): | 66 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 68 QNetworkProxyFactory.setUseSystemConfiguration(True) | 67 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 69 else: | 68 else: |
| 69 self.__proxyFactory = EricNetworkProxyFactory() | |
| 70 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 70 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 71 QNetworkProxyFactory.setUseSystemConfiguration(False) | 71 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 72 | 72 |
| 73 self.languagesChanged() | 73 self.languagesChanged() |
| 74 | 74 |
| 423 self.__interceptor.preferencesChanged() | 423 self.__interceptor.preferencesChanged() |
| 424 | 424 |
| 425 if EricPreferences.getNetworkProxy("UseSystemProxy"): | 425 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 426 QNetworkProxyFactory.setUseSystemConfiguration(True) | 426 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 427 else: | 427 else: |
| 428 self.__proxyFactory = EricNetworkProxyFactory() | |
| 428 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 429 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 429 QNetworkProxyFactory.setUseSystemConfiguration(False) | 430 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 430 | 431 |
| 431 def createRequest(self, op, request, data): | 432 def createRequest(self, op, request, data): |
| 432 """ | 433 """ |
