diff -r ce599998be7d -r 46651e194fbe src/eric7/UI/UserInterface.py
--- a/src/eric7/UI/UserInterface.py Thu Sep 26 09:48:49 2024 +0200
+++ b/src/eric7/UI/UserInterface.py Thu Sep 26 15:49:36 2024 +0200
@@ -68,7 +68,7 @@
from eric7.CondaInterface.Conda import Conda
from eric7.Debugger.DebugServer import DebugServer
from eric7.Debugger.DebugUI import DebugUI
-from eric7.EricCore import EricFileSystemWatcher
+from eric7.EricCore import EricFileSystemWatcher, EricPreferences
from eric7.EricCore.EricStdRedirector import EricStdRedirector
from eric7.EricGui import EricPixmapCache
from eric7.EricGui.EricAction import EricAction, createActionGroup
@@ -239,7 +239,7 @@
self.restoreGeometry(g)
self.__startup = True
- if Preferences.getUI("UseSystemProxy"):
+ if EricPreferences.getNetworkProxy("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
self.__proxyFactory = EricNetworkProxyFactory()
@@ -745,7 +745,9 @@
proxyAuthenticationRequired
)
if SSL_AVAILABLE:
- self.__sslErrorHandler = EricSslErrorHandler(self)
+ self.__sslErrorHandler = EricSslErrorHandler(
+ Preferences.getSettings(), self
+ )
self.__networkManager.sslErrors.connect(self.__sslErrors)
self.__replies = []
@@ -7438,7 +7440,7 @@
Preferences.getEditor("SpellCheckingDefaultLanguage"), pwl, pel
)
- if Preferences.getUI("UseSystemProxy"):
+ if EricPreferences.getNetworkProxy("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
self.__proxyFactory = EricNetworkProxyFactory()
@@ -7484,7 +7486,7 @@
pwManager = PasswordManager()
pwManager.mainPasswordChanged(oldPassword, newPassword)
- Utilities.crypto.changeRememberedMain(newPassword)
+ EricUtilities.crypto.changeRememberedMain(newPassword)
def __reloadAPIs(self):
"""
@@ -7603,7 +7605,7 @@
EricSslCertificatesDialog,
)
- dlg = EricSslCertificatesDialog(self)
+ dlg = EricSslCertificatesDialog(settings=Preferences.getSettings(), parent=self)
dlg.exec()
def __clearPrivateData(self):
