Mercurial Repositories > eric / file comparison
comparison: WebBrowser/Network/NetworkManager.py
WebBrowser/Network/NetworkManager.py
- branch
- maintenance
- changeset 5730
- 6422afc7adc4
- parent 5391
- 5e79ebb03b10
- parent 5720
- fc72c0c81a0f
- child 6050
- 25a4ddb25ca4
equal
deleted
inserted
replaced
| 5695:9a71bd9e2e37 | 5730:6422afc7adc4 |
|---|---|
| 12 import json | 12 import json |
| 13 | 13 |
| 14 from PyQt5.QtCore import pyqtSignal, QByteArray | 14 from PyQt5.QtCore import pyqtSignal, QByteArray |
| 15 from PyQt5.QtWidgets import qApp, QStyle, QDialog | 15 from PyQt5.QtWidgets import qApp, QStyle, QDialog |
| 16 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkProxy, \ | 16 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkProxy, \ |
| 17 QNetworkRequest | 17 QNetworkProxyFactory, QNetworkRequest |
| 18 from PyQt5.QtWebEngineWidgets import QWebEnginePage | 18 from PyQt5.QtWebEngineWidgets import QWebEnginePage |
| 19 | 19 |
| 20 from E5Gui import E5MessageBox | 20 from E5Gui import E5MessageBox |
| 21 | 21 |
| 22 from E5Network.E5NetworkProxyFactory import proxyAuthenticationRequired | 22 from E5Network.E5NetworkProxyFactory import proxyAuthenticationRequired |
| 50 @param parent reference to the parent object (QObject) | 50 @param parent reference to the parent object (QObject) |
| 51 """ | 51 """ |
| 52 super(NetworkManager, self).__init__(parent) | 52 super(NetworkManager, self).__init__(parent) |
| 53 | 53 |
| 54 if not WebBrowserWindow._fromEric: | 54 if not WebBrowserWindow._fromEric: |
| 55 from PyQt5.QtNetwork import QNetworkProxyFactory | |
| 56 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory | 55 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory |
| 57 | 56 |
| 58 self.__proxyFactory = E5NetworkProxyFactory() | 57 self.__proxyFactory = E5NetworkProxyFactory() |
| 59 QNetworkProxyFactory.setApplicationProxyFactory( | 58 QNetworkProxyFactory.setApplicationProxyFactory( |
| 60 self.__proxyFactory) | 59 self.__proxyFactory) |
| 60 | |
| 61 QNetworkProxyFactory.setUseSystemConfiguration( | |
| 62 Preferences.getUI("UseSystemProxy")) | |
| 61 | 63 |
| 62 self.languagesChanged() | 64 self.languagesChanged() |
| 63 | 65 |
| 64 if SSL_AVAILABLE: | 66 if SSL_AVAILABLE: |
| 65 self.__sslErrorHandler = E5SslErrorHandler(self) | 67 self.__sslErrorHandler = E5SslErrorHandler(self) |
| 332 def preferencesChanged(self): | 334 def preferencesChanged(self): |
| 333 """ | 335 """ |
| 334 Public slot to handle a change of preferences. | 336 Public slot to handle a change of preferences. |
| 335 """ | 337 """ |
| 336 self.__interceptor.preferencesChanged() | 338 self.__interceptor.preferencesChanged() |
| 339 | |
| 340 if not WebBrowserWindow._fromEric: | |
| 341 QNetworkProxyFactory.setUseSystemConfiguration( | |
| 342 Preferences.getUI("UseSystemProxy")) | |
| 337 | 343 |
| 338 def createRequest(self, op, request, data): | 344 def createRequest(self, op, request, data): |
| 339 """ | 345 """ |
| 340 Public method to launch a network action. | 346 Public method to launch a network action. |
| 341 | 347 |
