diff -r ea32acb9764c -r 07cad049002c src/eric7/UI/UserInterface.py
--- a/src/eric7/UI/UserInterface.py Sat Aug 31 10:54:50 2024 +0200
+++ b/src/eric7/UI/UserInterface.py Tue Oct 01 11:27:52 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
@@ -210,7 +210,11 @@
self.__restartArgs = restartArguments[:]
- self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
+ self.setStyle(
+ styleName=Preferences.getUI("Style"),
+ styleSheetFile=Preferences.getUI("StyleSheet"),
+ itemClickBehavior=Preferences.getUI("ActivateItemOnSingleClick"),
+ )
self.maxEditorPathLen = Preferences.getUI("CaptionFilenameLength")
self.locale = locale
@@ -239,7 +243,7 @@
self.restoreGeometry(g)
self.__startup = True
- if Preferences.getUI("UseSystemProxy"):
+ if EricPreferences.getNetworkProxy("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
self.__proxyFactory = EricNetworkProxyFactory()
@@ -579,9 +583,10 @@
)
# create the toolbar manager object
- self.toolbarManager = EricToolBarManager(self, self)
+ self.toolbarManager = EricToolBarManager(
+ ui=self, iconSize=Preferences.getIcons("IconSize"), parent=self
+ )
self.toolbarManager.setMainWindow(self)
- self.preferencesChanged.connect(self.toolbarManager.preferencesChanged)
# Initialize the tool groups and list of started tools
splash.showMessage(self.tr("Initializing Tools..."))
@@ -745,7 +750,9 @@
proxyAuthenticationRequired
)
if SSL_AVAILABLE:
- self.__sslErrorHandler = EricSslErrorHandler(self)
+ self.__sslErrorHandler = EricSslErrorHandler(
+ Preferences.getSettings(), self
+ )
self.__networkManager.sslErrors.connect(self.__sslErrors)
self.__replies = []
@@ -4435,7 +4442,10 @@
self.sbVcsMonitorLed = StatusMonitorLedWidget(self.project, self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbVcsMonitorLed)
- self.networkIcon = EricNetworkIcon(self.__statusBar)
+ self.networkIcon = EricNetworkIcon(
+ dynamicOnlineCheck=Preferences.getUI("DynamicOnlineCheck"),
+ parent=self.__statusBar,
+ )
self.__statusBar.addPermanentWidget(self.networkIcon)
self.networkIcon.onlineStateChanged.connect(self.onlineStateChanged)
self.networkIcon.onlineStateChanged.connect(self.__onlineStateChanged)
@@ -4776,7 +4786,7 @@
from .ErrorLogDialog import ErrorLogDialog
if Preferences.getUI("CheckErrorLog"):
- logFile = os.path.join(Globals.getConfigDir(), self.ErrorLogFileName)
+ logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
if os.path.exists(logFile):
dlg = ErrorLogDialog(logFile, False, self)
dlg.exec()
@@ -4788,7 +4798,7 @@
@return flag indicating the existence of an error log file
@rtype bool
"""
- logFile = os.path.join(Globals.getConfigDir(), self.ErrorLogFileName)
+ logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
return os.path.exists(logFile)
def __showErrorLog(self):
@@ -4797,7 +4807,7 @@
"""
from .ErrorLogDialog import ErrorLogDialog
- logFile = os.path.join(Globals.getConfigDir(), self.ErrorLogFileName)
+ logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
if os.path.exists(logFile):
dlg = ErrorLogDialog(logFile, True, self)
dlg.show()
@@ -7202,7 +7212,7 @@
self.__webBrowserProcess = process
else:
- clientArgs.append("--newtab={0}".format(home))
+ clientArgs.append("--new-tab={0}".format(home))
if clientArgs and self.__webBrowserClient:
args = WebBrowserArgumentsCreator.createArgparseNamespace(clientArgs)
@@ -7384,7 +7394,11 @@
"""
from eric7.HexEdit.HexEditMainWindow import HexEditMainWindow
- self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
+ self.setStyle(
+ styleName=Preferences.getUI("Style"),
+ styleSheetFile=Preferences.getUI("StyleSheet"),
+ itemClickBehavior=Preferences.getUI("ActivateItemOnSingleClick"),
+ )
if Preferences.getUI("SingleApplicationMode"):
if self.SAServer is None:
@@ -7406,6 +7420,8 @@
self.rightSidebar.setIconBarColor(Preferences.getUI("IconBarColor"))
self.rightSidebar.setIconBarSize(Preferences.getUI("IconBarSize"))
+ self.toolbarManager.setIconSize(Preferences.getIcons("IconSize"))
+
self.maxEditorPathLen = Preferences.getUI("CaptionFilenameLength")
self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename")
if not self.captionShowsFilename:
@@ -7435,7 +7451,7 @@
Preferences.getEditor("SpellCheckingDefaultLanguage"), pwl, pel
)
- if Preferences.getUI("UseSystemProxy"):
+ if EricPreferences.getNetworkProxy("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
self.__proxyFactory = EricNetworkProxyFactory()
@@ -7481,7 +7497,7 @@
pwManager = PasswordManager()
pwManager.mainPasswordChanged(oldPassword, newPassword)
- Utilities.crypto.changeRememberedMain(newPassword)
+ EricUtilities.crypto.changeRememberedMain(newPassword)
def __reloadAPIs(self):
"""
@@ -7600,7 +7616,7 @@
EricSslCertificatesDialog,
)
- dlg = EricSslCertificatesDialog(self)
+ dlg = EricSslCertificatesDialog(settings=Preferences.getSettings(), parent=self)
dlg.exec()
def __clearPrivateData(self):
@@ -7747,14 +7763,14 @@
"""
Private slot to write the tasks data to a JSON file (.etj).
"""
- fn = os.path.join(Globals.getConfigDir(), "eric7tasks.etj")
+ fn = os.path.join(EricUtilities.getConfigDir(), "eric7tasks.etj")
self.__tasksFile.writeFile(fn)
def __readTasks(self):
"""
Private slot to read in the tasks file (.etj).
"""
- fn = os.path.join(Globals.getConfigDir(), "eric7tasks.etj")
+ fn = os.path.join(EricUtilities.getConfigDir(), "eric7tasks.etj")
if os.path.exists(fn):
self.__tasksFile.readFile(fn)
@@ -7789,7 +7805,7 @@
fn = (
filename
if filename
- else os.path.join(Globals.getConfigDir(), "eric7session.esj")
+ else os.path.join(EricUtilities.getConfigDir(), "eric7session.esj")
)
return self.__sessionFile.writeFile(fn)
@@ -7806,7 +7822,7 @@
if filename:
fn = filename
else:
- fn = os.path.join(Globals.getConfigDir(), "eric7session.esj")
+ fn = os.path.join(EricUtilities.getConfigDir(), "eric7session.esj")
if not os.path.exists(fn):
EricMessageBox.critical(
self,
@@ -7878,10 +7894,12 @@
@rtype str
"""
if globPattern:
- return os.path.join(Globals.getConfigDir(), "eric7_crash_session_*.esj")
+ return os.path.join(
+ EricUtilities.getConfigDir(), "eric7_crash_session_*.esj"
+ )
else:
return os.path.join(
- Globals.getConfigDir(), f"eric7_crash_session_{os.getpid()}.esj"
+ EricUtilities.getConfigDir(), f"eric7_crash_session_{os.getpid()}.esj"
)
def __getCrashedSessions(self):
@@ -8474,6 +8492,8 @@
if self.microPythonWidget is not None:
self.microPythonWidget.shutdown()
+ self.pipInterface.shutdown()
+
self.pluginManager.doShutdown()
if self.SAServer is not None:
