Mercurial Repositories > eric / file comparison
comparison: WebBrowser/Network/NetworkManager.py
WebBrowser/Network/NetworkManager.py
- changeset 6554
- 5f1f2fcd9dee
- parent 6120
- 4c60a21ce6dd
- child 6555
- 923cf7e19ec3
equal
deleted
inserted
replaced
| 6553:5006766492a5 | 6554:5f1f2fcd9dee |
|---|---|
| 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.setApplicationProxyFactory( |
| 59 | 59 QNetworkProxyFactory()) |
| 60 QNetworkProxyFactory.setUseSystemConfiguration( | 60 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 61 Preferences.getUI("UseSystemProxy")) | 61 else: |
| 62 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 63 self.__proxyFactory) | |
| 64 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 62 | 65 |
| 63 self.languagesChanged() | 66 self.languagesChanged() |
| 64 | 67 |
| 65 if SSL_AVAILABLE: | 68 if SSL_AVAILABLE: |
| 66 self.__sslErrorHandler = E5SslErrorHandler(self) | 69 self.__sslErrorHandler = E5SslErrorHandler(self) |
| 338 Public slot to handle a change of preferences. | 341 Public slot to handle a change of preferences. |
| 339 """ | 342 """ |
| 340 self.__interceptor.preferencesChanged() | 343 self.__interceptor.preferencesChanged() |
| 341 | 344 |
| 342 if not WebBrowserWindow._fromEric: | 345 if not WebBrowserWindow._fromEric: |
| 343 QNetworkProxyFactory.setUseSystemConfiguration( | 346 if Preferences.getUI("UseSystemProxy"): |
| 344 Preferences.getUI("UseSystemProxy")) | 347 QNetworkProxyFactory.setApplicationProxyFactory( |
| 348 QNetworkProxyFactory()) | |
| 349 QNetworkProxyFactory.setUseSystemConfiguration(True) | |
| 350 else: | |
| 351 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 352 self.__proxyFactory) | |
| 353 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 345 | 354 |
| 346 def createRequest(self, op, request, data): | 355 def createRequest(self, op, request, data): |
| 347 """ | 356 """ |
| 348 Public method to launch a network action. | 357 Public method to launch a network action. |
| 349 | 358 |
