Mercurial Repositories > eric / file comparison
comparison: WebBrowser/Network/NetworkManager.py
WebBrowser/Network/NetworkManager.py
- changeset 6625
- a67fee7bc09c
- parent 6555
- 923cf7e19ec3
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6624:9718755def80 | 6625:a67fee7bc09c |
|---|---|
| 48 @param engine reference to the help engine (QHelpEngine) | 48 @param engine reference to the help engine (QHelpEngine) |
| 49 @param parent reference to the parent object (QObject) | 49 @param parent reference to the parent object (QObject) |
| 50 """ | 50 """ |
| 51 super(NetworkManager, self).__init__(parent) | 51 super(NetworkManager, self).__init__(parent) |
| 52 | 52 |
| 53 if not WebBrowserWindow._fromEric: | 53 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory |
| 54 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory | 54 |
| 55 | 55 self.__proxyFactory = E5NetworkProxyFactory() |
| 56 self.__proxyFactory = E5NetworkProxyFactory() | 56 if Preferences.getUI("UseSystemProxy"): |
| 57 if Preferences.getUI("UseSystemProxy"): | 57 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 58 QNetworkProxyFactory.setUseSystemConfiguration(True) | 58 else: |
| 59 else: | 59 QNetworkProxyFactory.setApplicationProxyFactory( |
| 60 QNetworkProxyFactory.setApplicationProxyFactory( | 60 self.__proxyFactory) |
| 61 self.__proxyFactory) | 61 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 62 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 63 | 62 |
| 64 self.languagesChanged() | 63 self.languagesChanged() |
| 65 | 64 |
| 66 if SSL_AVAILABLE: | 65 if SSL_AVAILABLE: |
| 67 self.__sslErrorHandler = E5SslErrorHandler(self) | 66 self.__sslErrorHandler = E5SslErrorHandler(self) |
| 338 """ | 337 """ |
| 339 Public slot to handle a change of preferences. | 338 Public slot to handle a change of preferences. |
| 340 """ | 339 """ |
| 341 self.__interceptor.preferencesChanged() | 340 self.__interceptor.preferencesChanged() |
| 342 | 341 |
| 343 if not WebBrowserWindow._fromEric: | 342 if Preferences.getUI("UseSystemProxy"): |
| 344 if Preferences.getUI("UseSystemProxy"): | 343 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 345 QNetworkProxyFactory.setUseSystemConfiguration(True) | 344 else: |
| 346 else: | 345 QNetworkProxyFactory.setApplicationProxyFactory( |
| 347 QNetworkProxyFactory.setApplicationProxyFactory( | 346 self.__proxyFactory) |
| 348 self.__proxyFactory) | 347 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 349 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 350 | 348 |
| 351 def createRequest(self, op, request, data): | 349 def createRequest(self, op, request, data): |
| 352 """ | 350 """ |
| 353 Public method to launch a network action. | 351 Public method to launch a network action. |
| 354 | 352 |
