Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/UserInterface.py
src/eric7/UI/UserInterface.py
- branch
- eric7
- changeset 10928
- 46651e194fbe
- parent 10926
- 9ef616cd220d
- child 10933
- 95a15b70f7bb
equal
deleted
inserted
replaced
| 10927:ce599998be7d | 10928:46651e194fbe |
|---|---|
| 66 from eric7 import EricUtilities, Globals, Preferences, Testing, Utilities | 66 from eric7 import EricUtilities, Globals, Preferences, Testing, Utilities |
| 67 from eric7.__version__ import Version, VersionOnly | 67 from eric7.__version__ import Version, VersionOnly |
| 68 from eric7.CondaInterface.Conda import Conda | 68 from eric7.CondaInterface.Conda import Conda |
| 69 from eric7.Debugger.DebugServer import DebugServer | 69 from eric7.Debugger.DebugServer import DebugServer |
| 70 from eric7.Debugger.DebugUI import DebugUI | 70 from eric7.Debugger.DebugUI import DebugUI |
| 71 from eric7.EricCore import EricFileSystemWatcher | 71 from eric7.EricCore import EricFileSystemWatcher, EricPreferences |
| 72 from eric7.EricCore.EricStdRedirector import EricStdRedirector | 72 from eric7.EricCore.EricStdRedirector import EricStdRedirector |
| 73 from eric7.EricGui import EricPixmapCache | 73 from eric7.EricGui import EricPixmapCache |
| 74 from eric7.EricGui.EricAction import EricAction, createActionGroup | 74 from eric7.EricGui.EricAction import EricAction, createActionGroup |
| 75 from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon | 75 from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon |
| 76 from eric7.EricNetwork.EricNetworkProxyFactory import ( | 76 from eric7.EricNetwork.EricNetworkProxyFactory import ( |
| 237 self.resize(s) | 237 self.resize(s) |
| 238 else: | 238 else: |
| 239 self.restoreGeometry(g) | 239 self.restoreGeometry(g) |
| 240 self.__startup = True | 240 self.__startup = True |
| 241 | 241 |
| 242 if Preferences.getUI("UseSystemProxy"): | 242 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 243 QNetworkProxyFactory.setUseSystemConfiguration(True) | 243 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 244 else: | 244 else: |
| 245 self.__proxyFactory = EricNetworkProxyFactory() | 245 self.__proxyFactory = EricNetworkProxyFactory() |
| 246 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 246 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 247 QNetworkProxyFactory.setUseSystemConfiguration(False) | 247 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 743 self.__networkManager = QNetworkAccessManager(self) | 743 self.__networkManager = QNetworkAccessManager(self) |
| 744 self.__networkManager.proxyAuthenticationRequired.connect( | 744 self.__networkManager.proxyAuthenticationRequired.connect( |
| 745 proxyAuthenticationRequired | 745 proxyAuthenticationRequired |
| 746 ) | 746 ) |
| 747 if SSL_AVAILABLE: | 747 if SSL_AVAILABLE: |
| 748 self.__sslErrorHandler = EricSslErrorHandler(self) | 748 self.__sslErrorHandler = EricSslErrorHandler( |
| 749 Preferences.getSettings(), self | |
| 750 ) | |
| 749 self.__networkManager.sslErrors.connect(self.__sslErrors) | 751 self.__networkManager.sslErrors.connect(self.__sslErrors) |
| 750 self.__replies = [] | 752 self.__replies = [] |
| 751 | 753 |
| 752 # attributes for the last shown configuration page and the | 754 # attributes for the last shown configuration page and the |
| 753 # extended configuration entries | 755 # extended configuration entries |
| 7436 pel = SpellChecker.getUserDictionaryPath(isException=True) | 7438 pel = SpellChecker.getUserDictionaryPath(isException=True) |
| 7437 SpellCheckMixin.setDefaultLanguage( | 7439 SpellCheckMixin.setDefaultLanguage( |
| 7438 Preferences.getEditor("SpellCheckingDefaultLanguage"), pwl, pel | 7440 Preferences.getEditor("SpellCheckingDefaultLanguage"), pwl, pel |
| 7439 ) | 7441 ) |
| 7440 | 7442 |
| 7441 if Preferences.getUI("UseSystemProxy"): | 7443 if EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 7442 QNetworkProxyFactory.setUseSystemConfiguration(True) | 7444 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 7443 else: | 7445 else: |
| 7444 self.__proxyFactory = EricNetworkProxyFactory() | 7446 self.__proxyFactory = EricNetworkProxyFactory() |
| 7445 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 7447 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) |
| 7446 QNetworkProxyFactory.setUseSystemConfiguration(False) | 7448 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 7482 PasswordManager, | 7484 PasswordManager, |
| 7483 ) | 7485 ) |
| 7484 | 7486 |
| 7485 pwManager = PasswordManager() | 7487 pwManager = PasswordManager() |
| 7486 pwManager.mainPasswordChanged(oldPassword, newPassword) | 7488 pwManager.mainPasswordChanged(oldPassword, newPassword) |
| 7487 Utilities.crypto.changeRememberedMain(newPassword) | 7489 EricUtilities.crypto.changeRememberedMain(newPassword) |
| 7488 | 7490 |
| 7489 def __reloadAPIs(self): | 7491 def __reloadAPIs(self): |
| 7490 """ | 7492 """ |
| 7491 Private slot to reload the api information. | 7493 Private slot to reload the api information. |
| 7492 """ | 7494 """ |
| 7601 """ | 7603 """ |
| 7602 from eric7.EricNetwork.EricSslCertificatesDialog import ( | 7604 from eric7.EricNetwork.EricSslCertificatesDialog import ( |
| 7603 EricSslCertificatesDialog, | 7605 EricSslCertificatesDialog, |
| 7604 ) | 7606 ) |
| 7605 | 7607 |
| 7606 dlg = EricSslCertificatesDialog(self) | 7608 dlg = EricSslCertificatesDialog(settings=Preferences.getSettings(), parent=self) |
| 7607 dlg.exec() | 7609 dlg.exec() |
| 7608 | 7610 |
| 7609 def __clearPrivateData(self): | 7611 def __clearPrivateData(self): |
| 7610 """ | 7612 """ |
| 7611 Private slot to clear the private data lists. | 7613 Private slot to clear the private data lists. |
