eric: comparison src/eric7/UI/UserInterface.py

-:ea32acb9764c
+:07cad049002c
 from eric7 import EricUtilities, Globals, Preferences, Testing, Utilities
 from eric7.__version__ import Version, VersionOnly
 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
 from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
 from eric7.EricNetwork.EricNetworkProxyFactory import (
 """
 super().__init__()
 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
 self.__openAtStartup = not noOpenAtStartup
 self.__noCrashOpenAtStartup = noCrashOpenAtStartup
 self.resize(s)
 else:
 self.restoreGeometry(g)
 self.__startup = True
-if Preferences.getUI("UseSystemProxy"):
+if EricPreferences.getNetworkProxy("UseSystemProxy"):
 QNetworkProxyFactory.setUseSystemConfiguration(True)
 else:
 self.__proxyFactory = EricNetworkProxyFactory()
 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
 QNetworkProxyFactory.setUseSystemConfiguration(False)
 self.__ericServerInterface.aboutToDisconnect.connect(
 self.viewmanager.closeRemoteEditors
 )
 # 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..."))
 logging.getLogger(__name__).debug("Initializing Tools...")
 self.toolGroups, self.currentToolGroup = Preferences.readToolGroups()
 self.__networkManager = QNetworkAccessManager(self)
 self.__networkManager.proxyAuthenticationRequired.connect(
 proxyAuthenticationRequired
 )
 if SSL_AVAILABLE:
-self.__sslErrorHandler = EricSslErrorHandler(self)
+self.__sslErrorHandler = EricSslErrorHandler(
+Preferences.getSettings(), self
+)
 self.__networkManager.sslErrors.connect(self.__sslErrors)
 self.__replies = []
 # attributes for the last shown configuration page and the
 # extended configuration entries
 )
 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)
 def __initExternalToolsActions(self):
 user, what to do with it.
 """
 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()
 def __hasErrorLog(self):
 Private method to check, if an error log file exists.
 @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):
 """
 Private slot to show the most recent error log message.
 """
 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()
 def __showInstallInfo(self):
 process.finished.connect(self.__webBrowserFinished)
 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)
 self.__webBrowserClient.processArgs(args, disconnect=False)
 """
 Private slot to handle a change of the preferences.
 """
 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:
 self.SAServer = EricSingleApplicationServer()
 else:
 self.bottomSidebar.setIconBarSize(Preferences.getUI("IconBarSize"))
 if self.rightSidebar:
 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:
 self.__setWindowCaption(editor="")
 pel = SpellChecker.getUserDictionaryPath(isException=True)
 SpellCheckMixin.setDefaultLanguage(
 Preferences.getEditor("SpellCheckingDefaultLanguage"), pwl, pel
 )
-if Preferences.getUI("UseSystemProxy"):
+if EricPreferences.getNetworkProxy("UseSystemProxy"):
 QNetworkProxyFactory.setUseSystemConfiguration(True)
 else:
 self.__proxyFactory = EricNetworkProxyFactory()
 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
 QNetworkProxyFactory.setUseSystemConfiguration(False)
 PasswordManager,
 )
 pwManager = PasswordManager()
 pwManager.mainPasswordChanged(oldPassword, newPassword)
-Utilities.crypto.changeRememberedMain(newPassword)
+EricUtilities.crypto.changeRememberedMain(newPassword)
 def __reloadAPIs(self):
 """
 Private slot to reload the api information.
 """
 """
 from eric7.EricNetwork.EricSslCertificatesDialog import (
 EricSslCertificatesDialog,
 )
-dlg = EricSslCertificatesDialog(self)
+dlg = EricSslCertificatesDialog(settings=Preferences.getSettings(), parent=self)
 dlg.exec()
 def __clearPrivateData(self):
 """
 Private slot to clear the private data lists.
 def __writeTasks(self):
 """
 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)
 @pyqtSlot()
 def __showSessionsMenu(self):
 @rtype bool
 """
 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)
 def __readSession(self, filename=""):
 @rtype bool
 """
 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,
 self.tr("Read Session"),
 self.tr(
 @type bool (optional)
 @return crash session file path
 @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):
 """
 Private method to get a list of crash session file paths of crashed sessions.
 if self.__helpViewerWidget is not None:
 self.__helpViewerWidget.shutdown()
 if self.microPythonWidget is not None:
 self.microPythonWidget.shutdown()
+self.pipInterface.shutdown()
 self.pluginManager.doShutdown()
 if self.SAServer is not None:
 self.SAServer.shutdown()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/UserInterface.py

src/eric7/UI/UserInterface.py