Mercurial Repositories > eric / file comparison
comparison: WebBrowser/Network/NetworkManager.py
WebBrowser/Network/NetworkManager.py
- changeset 6555
- 923cf7e19ec3
- parent 6554
- 5f1f2fcd9dee
- child 6569
- b4aeb61b3e3c
- child 6625
- a67fee7bc09c
equal
deleted
inserted
replaced
| 6554:5f1f2fcd9dee | 6555:923cf7e19ec3 |
|---|---|
| 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 if Preferences.getUI("UseSystemProxy"): | 57 if Preferences.getUI("UseSystemProxy"): |
| 58 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 59 QNetworkProxyFactory()) | |
| 60 QNetworkProxyFactory.setUseSystemConfiguration(True) | 58 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 61 else: | 59 else: |
| 62 QNetworkProxyFactory.setApplicationProxyFactory( | 60 QNetworkProxyFactory.setApplicationProxyFactory( |
| 63 self.__proxyFactory) | 61 self.__proxyFactory) |
| 64 QNetworkProxyFactory.setUseSystemConfiguration(False) | 62 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 342 """ | 340 """ |
| 343 self.__interceptor.preferencesChanged() | 341 self.__interceptor.preferencesChanged() |
| 344 | 342 |
| 345 if not WebBrowserWindow._fromEric: | 343 if not WebBrowserWindow._fromEric: |
| 346 if Preferences.getUI("UseSystemProxy"): | 344 if Preferences.getUI("UseSystemProxy"): |
| 347 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 348 QNetworkProxyFactory()) | |
| 349 QNetworkProxyFactory.setUseSystemConfiguration(True) | 345 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 350 else: | 346 else: |
| 351 QNetworkProxyFactory.setApplicationProxyFactory( | 347 QNetworkProxyFactory.setApplicationProxyFactory( |
| 352 self.__proxyFactory) | 348 self.__proxyFactory) |
| 353 QNetworkProxyFactory.setUseSystemConfiguration(False) | 349 QNetworkProxyFactory.setUseSystemConfiguration(False) |
