Mercurial Repositories > eric / file comparison
comparison: src/eric7/MicroPython/MicroPythonWindow.py
src/eric7/MicroPython/MicroPythonWindow.py
- branch
- eric7
- changeset 10928
- 46651e194fbe
- parent 10690
- fab36645aa7d
- child 10960
- 8b23bcae1f81
equal
deleted
inserted
replaced
| 10927:ce599998be7d | 10928:46651e194fbe |
|---|---|
| 13 from PyQt6.QtGui import QDesktopServices | 13 from PyQt6.QtGui import QDesktopServices |
| 14 from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkProxyFactory | 14 from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkProxyFactory |
| 15 from PyQt6.QtWidgets import QDialog, QSplitter, QWidget | 15 from PyQt6.QtWidgets import QDialog, QSplitter, QWidget |
| 16 | 16 |
| 17 from eric7 import Preferences | 17 from eric7 import Preferences |
| 18 from eric7.EricCore import EricPreferences | |
| 18 from eric7.EricNetwork.EricNetworkProxyFactory import ( | 19 from eric7.EricNetwork.EricNetworkProxyFactory import ( |
| 19 EricNetworkProxyFactory, | 20 EricNetworkProxyFactory, |
| 20 proxyAuthenticationRequired, | 21 proxyAuthenticationRequired, |
| 21 ) | 22 ) |
| 22 from eric7.EricWidgets import EricMessageBox | 23 from eric7.EricWidgets import EricMessageBox |
| 100 self.__activeEditor = None | 101 self.__activeEditor = None |
| 101 | 102 |
| 102 ericApp().focusChanged.connect(self.__appFocusChanged) | 103 ericApp().focusChanged.connect(self.__appFocusChanged) |
| 103 | 104 |
| 104 # network related setup | 105 # network related setup |
| 105 if Preferences.getUI("UseSystemProxy"): | 106 if EricPreferences.getUI("UseSystemProxy"): |
| 106 QNetworkProxyFactory.setUseSystemConfiguration(True) | 107 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 107 else: | 108 else: |
| 108 self.__proxyFactory = EricNetworkProxyFactory() | 109 self.__proxyFactory = EricNetworkProxyFactory() |
| 109 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 110 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 110 QNetworkProxyFactory.setUseSystemConfiguration(False) | 111 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 112 self.__networkManager = QNetworkAccessManager(self) | 113 self.__networkManager = QNetworkAccessManager(self) |
| 113 self.__networkManager.proxyAuthenticationRequired.connect( | 114 self.__networkManager.proxyAuthenticationRequired.connect( |
| 114 proxyAuthenticationRequired | 115 proxyAuthenticationRequired |
| 115 ) | 116 ) |
| 116 if SSL_AVAILABLE: | 117 if SSL_AVAILABLE: |
| 117 self.__sslErrorHandler = EricSslErrorHandler(self) | 118 self.__sslErrorHandler = EricSslErrorHandler( |
| 119 Preferences.getSettings(), self | |
| 120 ) | |
| 118 self.__networkManager.sslErrors.connect(self.__sslErrors) | 121 self.__networkManager.sslErrors.connect(self.__sslErrors) |
| 119 self.__replies = [] | 122 self.__replies = [] |
| 120 | 123 |
| 121 self.__bottomSidebar.setVisible(False) | 124 self.__bottomSidebar.setVisible(False) |
| 122 | 125 |
| 266 Private slot to handle a change of the preferences. | 269 Private slot to handle a change of the preferences. |
| 267 """ | 270 """ |
| 268 self.__bottomSidebar.setIconBarColor(Preferences.getUI("IconBarColor")) | 271 self.__bottomSidebar.setIconBarColor(Preferences.getUI("IconBarColor")) |
| 269 self.__bottomSidebar.setIconBarSize(Preferences.getUI("IconBarSize")) | 272 self.__bottomSidebar.setIconBarSize(Preferences.getUI("IconBarSize")) |
| 270 | 273 |
| 271 if Preferences.getUI("UseSystemProxy"): | 274 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 272 QNetworkProxyFactory.setUseSystemConfiguration(True) | 275 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 273 else: | 276 else: |
| 274 self.__proxyFactory = EricNetworkProxyFactory() | 277 self.__proxyFactory = EricNetworkProxyFactory() |
| 275 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 278 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 276 QNetworkProxyFactory.setUseSystemConfiguration(False) | 279 QNetworkProxyFactory.setUseSystemConfiguration(False) |
