Mercurial Repositories > eric / file comparison
comparison: src/eric7/WebBrowser/Network/NetworkManager.py
src/eric7/WebBrowser/Network/NetworkManager.py
- branch
- eric7
- changeset 10928
- 46651e194fbe
- parent 10925
- 22c3928a1ab5
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10927:ce599998be7d | 10928:46651e194fbe |
|---|---|
| 18 QNetworkRequest, | 18 QNetworkRequest, |
| 19 ) | 19 ) |
| 20 from PyQt6.QtWidgets import QDialog, QStyle | 20 from PyQt6.QtWidgets import QDialog, QStyle |
| 21 | 21 |
| 22 from eric7 import EricUtilities, Preferences | 22 from eric7 import EricUtilities, Preferences |
| 23 from eric7.EricCore import EricPreferences | |
| 23 from eric7.EricNetwork.EricNetworkProxyFactory import ( | 24 from eric7.EricNetwork.EricNetworkProxyFactory import ( |
| 24 EricNetworkProxyFactory, | 25 EricNetworkProxyFactory, |
| 25 proxyAuthenticationRequired, | 26 proxyAuthenticationRequired, |
| 26 ) | 27 ) |
| 27 from eric7.EricWidgets import EricMessageBox | 28 from eric7.EricWidgets import EricMessageBox |
| 61 @type QObject | 62 @type QObject |
| 62 """ | 63 """ |
| 63 super().__init__(parent) | 64 super().__init__(parent) |
| 64 | 65 |
| 65 self.__proxyFactory = EricNetworkProxyFactory() | 66 self.__proxyFactory = EricNetworkProxyFactory() |
| 66 if Preferences.getUI("UseSystemProxy"): | 67 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 67 QNetworkProxyFactory.setUseSystemConfiguration(True) | 68 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 68 else: | 69 else: |
| 69 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 70 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 70 QNetworkProxyFactory.setUseSystemConfiguration(False) | 71 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 71 | 72 |
| 72 self.languagesChanged() | 73 self.languagesChanged() |
| 73 | 74 |
| 74 if SSL_AVAILABLE: | 75 if SSL_AVAILABLE: |
| 75 self.__sslErrorHandler = EricSslErrorHandler(self) | 76 self.__sslErrorHandler = EricSslErrorHandler( |
| 77 Preferences.getSettings(), self | |
| 78 ) | |
| 76 self.sslErrors.connect(self.__sslErrorHandlingSlot) | 79 self.sslErrors.connect(self.__sslErrorHandlingSlot) |
| 77 | 80 |
| 78 self.__temporarilyIgnoredSslErrors = {} | 81 self.__temporarilyIgnoredSslErrors = {} |
| 79 self.__permanentlyIgnoredSslErrors = {} | 82 self.__permanentlyIgnoredSslErrors = {} |
| 80 # dictionaries of permanently and temporarily ignored SSL errors | 83 # dictionaries of permanently and temporarily ignored SSL errors |
| 417 """ | 420 """ |
| 418 Public slot to handle a change of preferences. | 421 Public slot to handle a change of preferences. |
| 419 """ | 422 """ |
| 420 self.__interceptor.preferencesChanged() | 423 self.__interceptor.preferencesChanged() |
| 421 | 424 |
| 422 if Preferences.getUI("UseSystemProxy"): | 425 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 423 QNetworkProxyFactory.setUseSystemConfiguration(True) | 426 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 424 else: | 427 else: |
| 425 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 428 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 426 QNetworkProxyFactory.setUseSystemConfiguration(False) | 429 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 427 | 430 |
