Mercurial Repositories > eric / file comparison
comparison: eric7/UI/UserInterface.py
eric7/UI/UserInterface.py
- branch
- eric7
- changeset 8354
- 12ebd3934fef
- parent 8351
- 7d13e08ddb3f
- child 8356
- 68ec9c3d4de5
equal
deleted
inserted
replaced
| 8353:799196d0b05d | 8354:12ebd3934fef |
|---|---|
| 54 | 54 |
| 55 from Sessions.SessionFile import SessionFile | 55 from Sessions.SessionFile import SessionFile |
| 56 | 56 |
| 57 from Tasks.TasksFile import TasksFile | 57 from Tasks.TasksFile import TasksFile |
| 58 | 58 |
| 59 from E5Network.E5NetworkProxyFactory import ( | 59 from EricNetwork.EricNetworkProxyFactory import ( |
| 60 E5NetworkProxyFactory, proxyAuthenticationRequired | 60 EricNetworkProxyFactory, proxyAuthenticationRequired |
| 61 ) | 61 ) |
| 62 try: | 62 try: |
| 63 from E5Network.E5SslErrorHandler import E5SslErrorHandler, E5SslErrorState | 63 from EricNetwork.EricSslErrorHandler import EricSslErrorHandler, EricSslErrorState |
| 64 SSL_AVAILABLE = True | 64 SSL_AVAILABLE = True |
| 65 except ImportError: | 65 except ImportError: |
| 66 SSL_AVAILABLE = False | 66 SSL_AVAILABLE = False |
| 67 | 67 |
| 68 from eric7config import getConfig | 68 from eric7config import getConfig |
| 221 self.__startup = True | 221 self.__startup = True |
| 222 | 222 |
| 223 if Preferences.getUI("UseSystemProxy"): | 223 if Preferences.getUI("UseSystemProxy"): |
| 224 QNetworkProxyFactory.setUseSystemConfiguration(True) | 224 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 225 else: | 225 else: |
| 226 self.__proxyFactory = E5NetworkProxyFactory() | 226 self.__proxyFactory = EricNetworkProxyFactory() |
| 227 QNetworkProxyFactory.setApplicationProxyFactory( | 227 QNetworkProxyFactory.setApplicationProxyFactory( |
| 228 self.__proxyFactory) | 228 self.__proxyFactory) |
| 229 QNetworkProxyFactory.setUseSystemConfiguration(False) | 229 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 230 | 230 |
| 231 self.capProject = "" | 231 self.capProject = "" |
| 725 # attributes for the network objects | 725 # attributes for the network objects |
| 726 self.__networkManager = QNetworkAccessManager(self) | 726 self.__networkManager = QNetworkAccessManager(self) |
| 727 self.__networkManager.proxyAuthenticationRequired.connect( | 727 self.__networkManager.proxyAuthenticationRequired.connect( |
| 728 proxyAuthenticationRequired) | 728 proxyAuthenticationRequired) |
| 729 if SSL_AVAILABLE: | 729 if SSL_AVAILABLE: |
| 730 self.__sslErrorHandler = E5SslErrorHandler(self) | 730 self.__sslErrorHandler = EricSslErrorHandler(self) |
| 731 self.__networkManager.sslErrors.connect(self.__sslErrors) | 731 self.__networkManager.sslErrors.connect(self.__sslErrors) |
| 732 self.__replies = [] | 732 self.__replies = [] |
| 733 | 733 |
| 734 # set spellchecker defaults | 734 # set spellchecker defaults |
| 735 from QScintilla.SpellChecker import SpellChecker | 735 from QScintilla.SpellChecker import SpellChecker |
| 6200 self.rightSidebar.setDelay(delay) | 6200 self.rightSidebar.setDelay(delay) |
| 6201 | 6201 |
| 6202 if Preferences.getUI("UseSystemProxy"): | 6202 if Preferences.getUI("UseSystemProxy"): |
| 6203 QNetworkProxyFactory.setUseSystemConfiguration(True) | 6203 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 6204 else: | 6204 else: |
| 6205 self.__proxyFactory = E5NetworkProxyFactory() | 6205 self.__proxyFactory = EricNetworkProxyFactory() |
| 6206 QNetworkProxyFactory.setApplicationProxyFactory( | 6206 QNetworkProxyFactory.setApplicationProxyFactory( |
| 6207 self.__proxyFactory) | 6207 self.__proxyFactory) |
| 6208 QNetworkProxyFactory.setUseSystemConfiguration(False) | 6208 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 6209 | 6209 |
| 6210 from HexEdit.HexEditMainWindow import HexEditMainWindow | 6210 from HexEdit.HexEditMainWindow import HexEditMainWindow |
| 6351 | 6351 |
| 6352 def __showCertificatesDialog(self): | 6352 def __showCertificatesDialog(self): |
| 6353 """ | 6353 """ |
| 6354 Private slot to show the certificates management dialog. | 6354 Private slot to show the certificates management dialog. |
| 6355 """ | 6355 """ |
| 6356 from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog | 6356 from EricNetwork.EricSslCertificatesDialog import EricSslCertificatesDialog |
| 6357 | 6357 |
| 6358 dlg = E5SslCertificatesDialog(self) | 6358 dlg = EricSslCertificatesDialog(self) |
| 6359 dlg.exec() | 6359 dlg.exec() |
| 6360 | 6360 |
| 6361 def __clearPrivateData(self): | 6361 def __clearPrivateData(self): |
| 6362 """ | 6362 """ |
| 6363 Private slot to clear the private data lists. | 6363 Private slot to clear the private data lists. |
| 7292 | 7292 |
| 7293 @param reply reference to the reply object (QNetworkReply) | 7293 @param reply reference to the reply object (QNetworkReply) |
| 7294 @param errors list of SSL errors (list of QSslError) | 7294 @param errors list of SSL errors (list of QSslError) |
| 7295 """ | 7295 """ |
| 7296 ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0] | 7296 ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0] |
| 7297 if ignored == E5SslErrorState.NOT_IGNORED: | 7297 if ignored == EricSslErrorState.NOT_IGNORED: |
| 7298 self.__downloadCancelled = True | 7298 self.__downloadCancelled = True |
| 7299 | 7299 |
| 7300 ####################################### | 7300 ####################################### |
| 7301 ## Below are methods for various checks | 7301 ## Below are methods for various checks |
| 7302 ####################################### | 7302 ####################################### |
