Mercurial Repositories > eric / file comparison
comparison: WebBrowser/Network/NetworkManager.py
WebBrowser/Network/NetworkManager.py
- branch
- maintenance
- changeset 6569
- b4aeb61b3e3c
- parent 6166
- bace7fb85a01
- parent 6555
- 923cf7e19ec3
- child 6646
- 51eefa621de4
equal
deleted
inserted
replaced
| 6542:dac410f3aff4 | 6569:b4aeb61b3e3c |
|---|---|
| 52 | 52 |
| 53 if not WebBrowserWindow._fromEric: | 53 if not WebBrowserWindow._fromEric: |
| 54 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory | 54 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory |
| 55 | 55 |
| 56 self.__proxyFactory = E5NetworkProxyFactory() | 56 self.__proxyFactory = E5NetworkProxyFactory() |
| 57 QNetworkProxyFactory.setApplicationProxyFactory( | 57 if Preferences.getUI("UseSystemProxy"): |
| 58 self.__proxyFactory) | 58 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 59 | 59 else: |
| 60 QNetworkProxyFactory.setUseSystemConfiguration( | 60 QNetworkProxyFactory.setApplicationProxyFactory( |
| 61 Preferences.getUI("UseSystemProxy")) | 61 self.__proxyFactory) |
| 62 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 62 | 63 |
| 63 self.languagesChanged() | 64 self.languagesChanged() |
| 64 | 65 |
| 65 if SSL_AVAILABLE: | 66 if SSL_AVAILABLE: |
| 66 self.__sslErrorHandler = E5SslErrorHandler(self) | 67 self.__sslErrorHandler = E5SslErrorHandler(self) |
| 338 Public slot to handle a change of preferences. | 339 Public slot to handle a change of preferences. |
| 339 """ | 340 """ |
| 340 self.__interceptor.preferencesChanged() | 341 self.__interceptor.preferencesChanged() |
| 341 | 342 |
| 342 if not WebBrowserWindow._fromEric: | 343 if not WebBrowserWindow._fromEric: |
| 343 QNetworkProxyFactory.setUseSystemConfiguration( | 344 if Preferences.getUI("UseSystemProxy"): |
| 344 Preferences.getUI("UseSystemProxy")) | 345 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 346 else: | |
| 347 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 348 self.__proxyFactory) | |
| 349 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 345 | 350 |
| 346 def createRequest(self, op, request, data): | 351 def createRequest(self, op, request, data): |
| 347 """ | 352 """ |
| 348 Public method to launch a network action. | 353 Public method to launch a network action. |
| 349 | 354 |
