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

-:e075c8fe07fd
+:df7edc29cbfb
 SpellChecker.setDefaultLanguage(
 Preferences.getEditor("SpellCheckingDefaultLanguage")
 )
 with contextlib.suppress(ImportError, AttributeError):
-from eric7.EricWidgets.EricSpellCheckedTextEdit import (  # __IGNORE_WARNING__
+from eric7.EricWidgets.EricSpellCheckedTextEdit import (  # noqa: I101
 SpellCheckMixin,
 )
 pwl = SpellChecker.getUserDictionaryPath(isException=False)
 pel = SpellChecker.getUserDictionaryPath(isException=True)
 self.preferencesChanged.connect(self.pipWidget.preferencesChanged)
 # create the toolbar manager object
 self.toolbarManager = EricToolBarManager(self, 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..."))
 self.toolGroups, self.currentToolGroup = Preferences.readToolGroups()
 self.toolProcs = []
 self.shell = self.shellAssembly.shell()
 if Preferences.getUI("ShowTemplateViewer"):
 # Create the template viewer part of the user interface
 logging.debug("Creating Template Viewer...")
-from eric7.Templates.TemplateViewer import (  # __IGNORE_WARNING_I101__
+from eric7.Templates.TemplateViewer import TemplateViewer  # noqa: I101
-TemplateViewer,
-)
 self.templateViewer = TemplateViewer(None, self.viewmanager)
 else:
 logging.debug("Template Viewer disabled")
 self.templateViewer = None
 if Preferences.getUI("ShowFileBrowser"):
 # Create the file browser
 logging.debug("Creating File Browser...")
-from .Browser import Browser  # __IGNORE_WARNING_I101__
+from .Browser import Browser  # noqa: I101
 self.browser = Browser()
 else:
 logging.debug("File Browser disabled")
 self.browser = None
 if Preferences.getUI("ShowSymbolsViewer"):
 # Create the symbols viewer
 logging.debug("Creating Symbols Viewer...")
-from .SymbolsWidget import SymbolsWidget  # __IGNORE_WARNING_I101__
+from .SymbolsWidget import SymbolsWidget  # noqa: I101
 self.symbolsViewer = SymbolsWidget()
 else:
 logging.debug("Symbols Viewer disabled")
 self.symbolsViewer = None
 if Preferences.getUI("ShowCodeDocumentationViewer"):
 # Create the code documentation viewer
 logging.debug("Creating Code Documentation Viewer...")
-from .CodeDocumentationViewer import (  # __IGNORE_WARNING_I101__
+from .CodeDocumentationViewer import CodeDocumentationViewer  # noqa: I101
-CodeDocumentationViewer,
-)
 self.codeDocumentationViewer = CodeDocumentationViewer(self)
 else:
 logging.debug("Code Documentation Viewer disabled")
 self.codeDocumentationViewer = None
 if Preferences.getUI("ShowPyPIPackageManager"):
 # Create the PyPI package manager
 logging.debug("Creating PyPI Package Manager...")
-from eric7.PipInterface.PipPackagesWidget import (  # __IGNORE_WARNING__
+from eric7.PipInterface.PipPackagesWidget import (  # noqa: I101
 PipPackagesWidget,
 )
 self.pipWidget = PipPackagesWidget(self.pipInterface)
 else:
 self.pipWidget = None
 if Preferences.getUI("ShowCondaPackageManager"):
 # Create the conda package manager
 logging.debug("Creating Conda Package Manager...")
-from eric7.CondaInterface.CondaPackagesWidget import (  # __IGNORE_WARNING__
+from eric7.CondaInterface.CondaPackagesWidget import (  # noqa: I101
 CondaPackagesWidget,
 )
 self.condaWidget = CondaPackagesWidget(self.condaInterface)
 else:
 self.condaWidget = None
 if Preferences.getUI("ShowCooperation"):
 # Create the chat part of the user interface
 logging.debug("Creating Chat Widget...")
-from eric7.Cooperation.ChatWidget import (  # __IGNORE_WARNING_I101__
+from eric7.Cooperation.ChatWidget import ChatWidget  # noqa: I101
-ChatWidget,
-)
 self.cooperation = ChatWidget(self)
 else:
 logging.debug("Chat Widget disabled")
 self.cooperation = None
 if Preferences.getUI("ShowIrc"):
 # Create the IRC part of the user interface
 logging.debug("Creating IRC Widget...")
-from eric7.Network.IRC.IrcWidget import IrcWidget  # __IGNORE_WARNING_I101__
+from eric7.Network.IRC.IrcWidget import IrcWidget  # noqa: I101
 self.irc = IrcWidget(self)
 else:
 logging.debug("IRC Widget disabled")
 self.irc = None
 if Preferences.getUI("ShowMicroPython"):
 # Create the MicroPython part of the user interface
 logging.debug("Creating MicroPython Widget...")
-from eric7.MicroPython.MicroPythonWidget import (  # __IGNORE_WARNING_I101__
+from eric7.MicroPython.MicroPythonWidget import (  # noqa: I101
 MicroPythonWidget,
 )
 self.microPythonWidget = MicroPythonWidget(self)
 else:
 self.microPythonWidget = None
 if Preferences.getUI("ShowNumbersViewer"):
 # Create the numbers viewer
 logging.debug("Creating Numbers Viewer...")
-from .NumbersWidget import NumbersWidget  # __IGNORE_WARNING_I101__
+from .NumbersWidget import NumbersWidget  # noqa: I101
 self.numbersViewer = NumbersWidget()
 else:
 logging.debug("Numbers Viewer disabled")
 self.numbersViewer = None
 self.__findFileDialog = None
 self.__replaceFileDialog = None
 if Preferences.getUI("ShowFindFileWidget"):
 # Create the find in files widget
-from .FindFileWidget import FindFileWidget  # __IGNORE_WARNING_I101__
+from .FindFileWidget import FindFileWidget  # noqa: I101
 self.__findFileWidget = FindFileWidget(self.project, self)
 self.__findFileWidget.sourceFile.connect(self.viewmanager.openSourceFile)
 self.__findFileWidget.designerFile.connect(self.__designer)
 self.__findFileWidget.linguistFile.connect(self.__linguist)
 self.__findFileWidget = None
 self.__findLocationDialog = None
 if Preferences.getUI("ShowFindLocationWidget"):
 # Create the find location (file) widget
-from .FindLocationWidget import (  # __IGNORE_WARNING_I101__
+from .FindLocationWidget import FindLocationWidget  # noqa: I101
-FindLocationWidget,
-)
 self.__findLocationWidget = FindLocationWidget(self.project, self)
 self.__findLocationWidget.sourceFile.connect(
 self.viewmanager.openSourceFile
 )
 Preferences.getUI("ShowInternalHelpViewer")
 or Preferences.getHelp("HelpViewerType") == 0
 ):
 # Create the embedded help viewer
 logging.debug("Creating Internal Help Viewer...")
-from eric7.HelpViewer.HelpViewerWidget import (  # __IGNORE_WARNING_I101__
+from eric7.HelpViewer.HelpViewerWidget import HelpViewerWidget  # noqa: I101
-HelpViewerWidget,
-)
 self.__helpViewerWidget = HelpViewerWidget(self)
 else:
 logging.debug("Internal Help Viewer disabled...")
 self.__helpViewerWidget = None
 def processArgs(self, args):
 """
 Public method to process the command line args passed to the UI.
-@param args list of files to open<br />
+@param args namespace object containing the parsed command line
-The args are processed one at a time. All arguments after a
+parameters
-'--' option are considered debug arguments to the program
+@type argparse.Namespace
-for the debugger. All files named before the '--' option
-are opened in a text editor, unless the argument ends in
-.epj or .e4p, then it is opened as a project file. If it
-ends in .emj, .e4m or .e5m, it is opened as a multi project.
 """
 # check and optionally read a crash session and ignore any arguments
 if self.__readCrashSession():
 return
-# no args, return
+if args.dd_args:
-if args is None:
+# store away any args we had
-if self.__openAtStartup:
+argsStr = " ".join(args.dd_args)
-self.__openOnStartup()
+self.debuggerUI.setArgvHistory(argsStr)
+if args.start_file:
+self.__openOnStartup("File")
 return
+elif args.start_multi:
+self.__openOnStartup("MultiProject")
+return
+elif args.start_project:
+self.__openOnStartup("Project")
+return
+elif args.start_session:
+self.__openOnStartup("Session")
+return
 opens = 0
+for filename in args.file_or_project:
-# holds space delimited list of command args, if any
-argsStr = None
-# flag indicating '--' options was found
-ddseen = False
-argChars = ["-", "/"] if OSUtilities.isWindowsPlatform() else ["-"]
-for arg in args:
-# handle a request to start with last session
-if arg == "--start-file":
-self.__openOnStartup("File")
-# ignore all further arguments
-return
-elif arg == "--start-multi":
-self.__openOnStartup("MultiProject")
-# ignore all further arguments
-return
-elif arg == "--start-project":
-self.__openOnStartup("Project")
-# ignore all further arguments
-return
-elif arg == "--start-session":
-self.__openOnStartup("Session")
-# ignore all further arguments
-return
-if arg == "--" and not ddseen:
-ddseen = True
-continue
-if arg[0] in argChars or ddseen:
-if argsStr is None:
-argsStr = arg
-else:
-argsStr = "{0} {1}".format(argsStr, arg)
-continue
 try:
-ext = os.path.splitext(arg)[1]
+ext = os.path.normcase(os.path.splitext(filename)[1])
-ext = os.path.normcase(ext)
 except IndexError:
 ext = ""
 if ext in (".epj", ".e4p"):
-self.project.openProject(arg)
+self.project.openProject(filename)
 opens += 1
 elif ext in (".emj", ".e4m", ".e5m"):
-self.multiProject.openMultiProject(arg)
+self.multiProject.openMultiProject(filename)
 opens += 1
 else:
-self.viewmanager.openFiles(arg)
+self.viewmanager.openFiles(filename)
 opens += 1
-# store away any args we had
-if argsStr is not None:
-self.debuggerUI.setArgvHistory(argsStr)
 if opens == 0 and self.__openAtStartup:
 # no files, project or multiproject was given
 self.__openOnStartup()
 """
 Private slot to create the menus.
 """
 self.__menus = {}
 mb = self.menuBar()
-if OSUtilities.isLinuxPlatform() and not Preferences.getUI("UseNativeMenuBar"):
+if (
+OSUtilities.isLinuxPlatform() or OSUtilities.isFreeBsdPlatform()
+) and not Preferences.getUI("UseNativeMenuBar"):
 mb.setNativeMenuBar(False)
 ##############################################################
 ## File menu
 ##############################################################
 @param searchWord word to search for
 @type str
 @return flag indicating a successful launch
 @rtype bool
 """
+from eric7.WebBrowser import WebBrowserArgumentsCreator
 clientArgs = []
 if searchWord:
 clientArgs.append("--search={0}".format(searchWord))
 if self.__webBrowserProcess is None:
 else:
 clientArgs.append("--newtab={0}".format(home))
 if clientArgs and self.__webBrowserClient:
-self.__webBrowserClient.processArgs(clientArgs, disconnect=False)
+args = WebBrowserArgumentsCreator.createArgparseNamespace(clientArgs)
+self.__webBrowserClient.processArgs(args, disconnect=False)
 return True
 def __connectToWebBrowser(self, process):
 """
 def __webBrowserShutdown(self):
 """
 Private method to shut down the web browser.
 """
-self.__webBrowserClient.processArgs(["--shutdown"], disconnect=False)
+from eric7.WebBrowser import WebBrowserArgumentsCreator
+args = WebBrowserArgumentsCreator.createArgparseNamespace(["--shutdown"])
+self.__webBrowserClient.processArgs(args, disconnect=False)
 def __helpViewer(self):
 """
 Private slot to start an empty help viewer/web browser.
 """
 SpellChecker.setDefaultLanguage(
 Preferences.getEditor("SpellCheckingDefaultLanguage")
 )
 with contextlib.suppress(ImportError, AttributeError):
-from eric7.EricWidgets.EricSpellCheckedTextEdit import (  # __IGNORE_WARNING__
+from eric7.EricWidgets.EricSpellCheckedTextEdit import (  # noqa: I101
 SpellCheckMixin,
 )
 pwl = SpellChecker.getUserDictionaryPath(isException=False)
 pel = SpellChecker.getUserDictionaryPath(isException=True)
 self.mainPasswordChanged.emit(oldPassword, newPassword)
 Preferences.convertPasswords(oldPassword, newPassword)
 variant = Globals.getWebBrowserSupport()
 if variant == "QtWebEngine":
-from eric7.WebBrowser.Passwords.PasswordManager import (  # __IGNORE_WARNING__
+from eric7.WebBrowser.Passwords.PasswordManager import (  # noqa: I101
 PasswordManager,
 )
 pwManager = PasswordManager()
 pwManager.mainPasswordChanged(oldPassword, newPassword)
 sessionCreated = self.__writeSession()
 self.__astViewer.hide()
+self.shell.closeShell()
 if not self.project.closeProject(shutdown=True):
 return False
 if not self.multiProject.closeMultiProject():
 return False
 self.codeDocumentationViewer.shutdown()
 self.__previewer.shutdown()
 self.__astViewer.shutdown()
-self.shell.closeShell()
 self.__writeTasks()
 if self.templateViewer is not None:
 self.templateViewer.save()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/UserInterface.py

src/eric7/UI/UserInterface.py