eric: comparison eric6/UI/UserInterface.py

-:c1af2e327675
+:bedbe458d792
 import os
 import sys
 import logging
-from PyQt5.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \
+from PyQt5.QtCore import (
-PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \
+pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate,
-QObject, Qt, QUuid, QThread, QUrlQuery
+QIODevice, qVersion, QProcess, QSize, QUrl, QObject, Qt, QUuid, QThread,
+QUrlQuery
+)
 from PyQt5.QtGui import QKeySequence, QDesktopServices
-from PyQt5.QtWidgets import QSizePolicy, QWidget, QWhatsThis, QToolBar, \
+from PyQt5.QtWidgets import (
-QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \
+QSizePolicy, QWidget, QWhatsThis, QToolBar, QDialog, QSplitter,
-QAction, QLabel
+QApplication, QMenu, QVBoxLayout, QDockWidget, QAction, QLabel
+)
 from PyQt5.Qsci import QSCINTILLA_VERSION_STR
-from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \
+from PyQt5.QtNetwork import (
-QNetworkRequest, QNetworkReply
+QNetworkProxyFactory, QNetworkAccessManager, QNetworkRequest, QNetworkReply
+)
 from .Info import Version, VersionOnly, BugAddress, Program, FeatureAddress
 from . import Config
 from E5Gui.E5SingleApplication import E5SingleApplicationServer
 import Utilities
 import UI.PixmapCache
 from E5Network.E5NetworkIcon import E5NetworkIcon
-from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, \
+from E5Network.E5NetworkProxyFactory import (
-proxyAuthenticationRequired
+E5NetworkProxyFactory, proxyAuthenticationRequired
+)
 try:
 from E5Network.E5SslErrorHandler import E5SslErrorHandler
 SSL_AVAILABLE = True
 except ImportError:
 SSL_AVAILABLE = False
 self.pluginManager.activatePlugins()
 splash.showMessage(self.tr("Generating Plugins Toolbars..."))
 self.pluginManager.initPluginToolbars(self.toolbarManager)
 if Preferences.getPluginManager("StartupCleanup"):
 splash.showMessage(self.tr("Cleaning Plugins Download Area..."))
-from PluginManager.PluginRepositoryDialog import \
+from PluginManager.PluginRepositoryDialog import (
 PluginRepositoryDownloadCleanup
+)
 PluginRepositoryDownloadCleanup(quiet=True)
 # now read the keyboard shortcuts for all the actions
 from Preferences import Shortcuts
 Shortcuts.readShortcuts()
 @exception ValueError raised to indicate an invalid layout type
 """
 # Create the view manager depending on the configuration setting
 logging.debug("Creating Viewmanager...")
 import ViewManager
-self.viewmanager = \
+self.viewmanager = ViewManager.factory(
-ViewManager.factory(self, self, debugServer, self.pluginManager)
+self, self, debugServer, self.pluginManager)
 leftWidget = QWidget()
 layout = QVBoxLayout()
 layout.setContentsMargins(1, 1, 1, 1)
 layout.setSpacing(1)
 layout.addWidget(self.viewmanager.mainWidget())
 elif self.__shellPosition == "right":
 self.__shellParent = self.rToolboxDock
 else:
 self.__shellParent = self.hToolboxDock
 from QScintilla.Shell import ShellAssembly
-self.shellAssembly = \
+self.shellAssembly = ShellAssembly(
-ShellAssembly(debugServer, self.viewmanager, self.project, True)
+debugServer, self.viewmanager, self.project, True)
 self.shell = self.shellAssembly.shell()
 self.__shellParent.widget().insertItem(
 0, self.shellAssembly, UI.PixmapCache.getIcon("shell.png"),
 self.tr("Shell"))
 elif self.__shellPosition == "right":
 self.__shellParent = self.rightSidebar
 else:
 self.__shellParent = self.bottomSidebar
 from QScintilla.Shell import ShellAssembly
-self.shellAssembly = \
+self.shellAssembly = ShellAssembly(
-ShellAssembly(debugServer, self.viewmanager, self.project, True)
+debugServer, self.viewmanager, self.project, True)
 self.shell = self.shellAssembly.shell()
 self.__shellParent.insertTab(0, self.shellAssembly,
 UI.PixmapCache.getIcon("shell.png"),
 self.tr("Shell"))
 @param editor filename to be displayed (string)
 @param project project name to be displayed (string)
 """
 if editor is not None and self.captionShowsFilename:
-self.capEditor = \
+self.capEditor = Utilities.compactPath(editor, self.maxFilePathLen)
-Utilities.compactPath(editor, self.maxFilePathLen)
 if project is not None:
 self.capProject = project
 if self.passiveMode:
 if not self.capProject and not self.capEditor:
 """
 Private slot to create the menus.
 """
 self.__menus = {}
 mb = self.menuBar()
-if Utilities.isLinuxPlatform() and \
+if (
-not Preferences.getUI("UseNativeMenuBar"):
+Utilities.isLinuxPlatform() and
+not Preferences.getUI("UseNativeMenuBar")
+):
 mb.setNativeMenuBar(False)
 ##############################################################
 ## File menu
 ##############################################################
 ##############################################################
 ## Project menu
 ##############################################################
-self.__menus["project"], self.__menus["project_tools"] = \
+self.__menus["project"], self.__menus["project_tools"] = (
 self.project.initMenus()
+)
 mb.addMenu(self.__menus["project"])
 mb.addMenu(self.__menus["project_tools"])
 ##############################################################
 ## Start and Debug menus
 ##############################################################
-self.__menus["start"], self.__menus["debug"] = \
+self.__menus["start"], self.__menus["debug"] = (
 self.debuggerUI.initMenus()
+)
 mb.addMenu(self.__menus["start"])
 mb.addMenu(self.__menus["debug"])
 ##############################################################
 ## Extras menu
 ##############################################################
 ## Window/Toolbars menu
 ##############################################################
-self.__menus["toolbars"] = \
+self.__menus["toolbars"] = QMenu(
-QMenu(self.tr("&Toolbars"), self.__menus["window"])
+self.tr("&Toolbars"), self.__menus["window"])
 self.__menus["toolbars"].setTearOffEnabled(True)
 self.__menus["toolbars"].aboutToShow.connect(self.__showToolbarsMenu)
 self.__menus["toolbars"].triggered.connect(self.__TBMenuTriggered)
 self.__showWindowMenu()  # to initialize these actions
 sizeStr = "32-Bit"
 versionText = self.tr(
 """<h3>Version Numbers</h3>"""
 """<table>""")
-versionText += """<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>"""\
+versionText += (
-.format(sys.version.split()[0], sizeStr)
+"""<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>"""
-versionText += """<tr><td><b>Qt</b></td><td>{0}</td></tr>"""\
+).format(sys.version.split()[0], sizeStr)
-.format(qVersion())
+versionText += (
-versionText += """<tr><td><b>PyQt</b></td><td>{0}</td></tr>"""\
+"""<tr><td><b>Qt</b></td><td>{0}</td></tr>"""
-.format(PYQT_VERSION_STR)
+).format(qVersion())
-versionText += """<tr><td><b>sip</b></td><td>{0}</td></tr>"""\
+versionText += (
-.format(sip_version_str)
+"""<tr><td><b>PyQt</b></td><td>{0}</td></tr>"""
-versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\
+).format(PYQT_VERSION_STR)
-.format(QSCINTILLA_VERSION_STR)
+versionText += (
+"""<tr><td><b>sip</b></td><td>{0}</td></tr>"""
+).format(sip_version_str)
+versionText += (
+"""<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""
+).format(QSCINTILLA_VERSION_STR)
 try:
 from WebBrowser.Tools import WebBrowserTools
 chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
-versionText += \
+versionText += (
-"""<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\
+"""<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""
-.format(chromeVersion)
+).format(chromeVersion)
 except ImportError:
 pass
-versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\
+versionText += ("""<tr><td><b>{0}</b></td><td>{1}</td></tr>"""
-.format(Program, Version)
+).format(Program, Version)
 versionText += self.tr("""</table>""")
 E5MessageBox.about(self, Program, versionText)
 def __reportBug(self):
 self.profiles[self.currentProfile][2][4] = state
 state = self.rightSidebar.saveState()
 self.profiles[self.currentProfile][2][5] = state
 # step 2: save the visibility of the windows of the active profile
 if self.__layoutType == "Toolboxes":
-self.profiles[self.currentProfile][1][0] = \
+self.profiles[self.currentProfile][1][0] = (
 self.lToolboxDock.isVisible()
-self.profiles[self.currentProfile][1][1] = \
+)
+self.profiles[self.currentProfile][1][1] = (
 self.hToolboxDock.isVisible()
-self.profiles[self.currentProfile][1][2] = \
+)
+self.profiles[self.currentProfile][1][2] = (
 self.rToolboxDock.isVisible()
+)
 elif self.__layoutType == "Sidebars":
-self.profiles[self.currentProfile][1][0] = \
+self.profiles[self.currentProfile][1][0] = (
 self.leftSidebar.isVisible()
-self.profiles[self.currentProfile][1][1] = \
+)
+self.profiles[self.currentProfile][1][1] = (
 self.bottomSidebar.isVisible()
-self.profiles[self.currentProfile][1][2] = \
+)
+self.profiles[self.currentProfile][1][2] = (
 self.rightSidebar.isVisible()
+)
 Preferences.setUI("ViewProfiles2", self.profiles)
 def __activateViewProfile(self, name, save=True):
 """
 Private slot to activate a view profile.
 def __toolGroupsConfiguration(self):
 """
 Private slot to handle the tool groups configuration menu entry.
 """
-from Preferences.ToolGroupConfigurationDialog import \
+from Preferences.ToolGroupConfigurationDialog import (
 ToolGroupConfigurationDialog
+)
 dlg = ToolGroupConfigurationDialog(
 self.toolGroups, self.currentToolGroup, self)
 if dlg.exec_() == QDialog.Accepted:
 self.toolGroups, self.currentToolGroup = dlg.getToolGroups()
 args = []
 if fn is not None:
 fn = fn.replace('.qm', '.ts')
 try:
-if os.path.isfile(fn) and os.path.getsize(fn) and \
+if (
-fn not in args:
+os.path.isfile(fn) and
+os.path.getsize(fn) and
+fn not in args
+):
 args.append(fn)
 else:
 E5MessageBox.critical(
 self,
 self.tr('Problem'),
 '<p>The file <b>{0}</b> does not exist or'
 ' is zero length.</p>')
 .format(fn))
 return
-if not os.path.isfile(viewer) or \
+if (
-not proc.startDetached(sys.executable, args):
+not os.path.isfile(viewer) or
+not proc.startDetached(sys.executable, args)
+):
 E5MessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 '<p>Could not start UI Previewer.<br>'
 '<p>The file <b>{0}</b> does not exist or'
 ' is zero length.</p>')
 .format(fn))
 return
-if not os.path.isfile(viewer) or \
+if (
-not proc.startDetached(sys.executable, args):
+not os.path.isfile(viewer) or
+not proc.startDetached(sys.executable, args)
+):
 E5MessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 '<p>Could not start Translation Previewer.<br>'
 browser = os.path.join(getConfig("ericDir"), "eric6_sqlbrowser.py")
 args = []
 args.append(browser)
-if not os.path.isfile(browser) or \
+if (
-not proc.startDetached(sys.executable, args):
+not os.path.isfile(browser) or
+not proc.startDetached(sys.executable, args)
+):
 E5MessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 '<p>Could not start SQL Browser.<br>'
 snap = os.path.join(getConfig("ericDir"), "eric6_snap.py")
 args = []
 args.append(snap)
-if not os.path.isfile(snap) or \
+if (
-not proc.startDetached(sys.executable, args):
+not os.path.isfile(snap) or
+not proc.startDetached(sys.executable, args)
+):
 E5MessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 '<p>Could not start Snapshot tool.<br>'
 procData = (None,)
 program = tool['executable']
 args = []
 argv = Utilities.parseOptionString(tool['arguments'])
 args.extend(argv)
-t = self.tr("Starting process '{0} {1}'.\n")\
+t = self.tr("Starting process '{0} {1}'.\n"
-.format(program, tool['arguments'])
+).format(program, tool['arguments'])
 self.appendToStdout(t)
 proc.finished.connect(self.__toolFinished)
 if tool['redirect'] != 'no':
 proc.readyReadStandardOutput.connect(self.__processToolStdout)
 # loop through all running tool processes
 for program, toolProc, toolProcData in self.toolProcs:
 toolProc.setReadChannel(QProcess.StandardOutput)
-if toolProcData[0] is None or \
+if (
-toolProcData[1] not in ["insert", "replaceSelection"]:
+toolProcData[0] is None or
+toolProcData[1] not in ["insert", "replaceSelection"]
+):
 # not connected to an editor or wrong mode
 while toolProc.canReadLine():
 output = str(toolProc.readLine(), ioEncoding, 'replace')
 s = "{0} - {1}".format(program, output)
 self.appendToStdout(s)
 """
 pythonDocDir = Preferences.getHelp("PythonDocDir")
 if not pythonDocDir:
 if Utilities.isWindowsPlatform():
 venvName = Preferences.getDebugger("Python3VirtualEnv")
-interpreter = e5App().getObject("VirtualEnvManager")\
+interpreter = (
+e5App().getObject("VirtualEnvManager")
 .getVirtualenvInterpreter(venvName)
+)
 if interpreter:
 default = os.path.join(os.path.dirname(interpreter), "doc")
 else:
 default = ""
-pythonDocDir = \
+pythonDocDir = Utilities.getEnvironmentEntry(
-Utilities.getEnvironmentEntry("PYTHON3DOCDIR", default)
+"PYTHON3DOCDIR", default)
 else:
 pythonDocDir = Utilities.getEnvironmentEntry(
 "PYTHON3DOCDIR",
 '/usr/share/doc/packages/python3/html')
 if not pythonDocDir.startswith(("http://", "https://", "qthelp://")):
 """
 pythonDocDir = Preferences.getHelp("Python2DocDir")
 if not pythonDocDir:
 if Utilities.isWindowsPlatform():
 venvName = Preferences.getDebugger("Python2VirtualEnv")
-interpreter = e5App().getObject("VirtualEnvManager")\
+interpreter = (
+e5App().getObject("VirtualEnvManager")
 .getVirtualenvInterpreter(venvName)
+)
 if interpreter:
 default = os.path.join(os.path.dirname(interpreter), "doc")
 else:
 default = ""
-pythonDocDir = \
+pythonDocDir = Utilities.getEnvironmentEntry(
-Utilities.getEnvironmentEntry("PYTHON2DOCDIR", default)
+"PYTHON2DOCDIR", default)
 else:
 pythonDocDir = Utilities.getEnvironmentEntry(
 "PYTHON2DOCDIR",
 '/usr/share/doc/packages/python/html')
 if not pythonDocDir.startswith(("http://", "https://", "qthelp://")):
 @type QProcess
 @return error indication (1 = connection not possible, 0 = ok,
 -1 = server exited with an error code)
 @rtype int
 """
-from WebBrowser.WebBrowserSingleApplication import \
+from WebBrowser.WebBrowserSingleApplication import (
 WebBrowserSingleApplicationClient
+)
 webBrowserClient = WebBrowserSingleApplicationClient(
 self.__webBrowserSAName)
 connectCount = 30
 while connectCount:
 break
 else:
 connectCount -= 1
 QThread.msleep(1000)
 QApplication.processEvents()
-if process.state() == QProcess.NotRunning and \
+if (
-process.exitStatus() == QProcess.NormalExit and \
+process.state() == QProcess.NotRunning and
-process.exitCode() == 100:
+process.exitStatus() == QProcess.NormalExit and
+process.exitCode() == 100
+):
 # Process exited prematurely due to missing pre-requisites
 return -1
 if res <= 0:
 E5MessageBox.warning(
 self,
 QApplication.processEvents()
 if self.__configurationDialog.result() == QDialog.Accepted:
 self.__configurationDialog.setPreferences()
 Preferences.syncPreferences()
 self.__preferencesChanged()
-self.__lastConfigurationPageName = \
+self.__lastConfigurationPageName = (
 self.__configurationDialog.getConfigurationPageName()
-self.__expandedConfigurationEntries = \
+)
+self.__expandedConfigurationEntries = (
 self.__configurationDialog.getExpandedEntries()
+)
 self.__configurationDialog.deleteLater()
 self.__configurationDialog = None
 def __exportPreferences(self):
 self.masterPasswordChanged.emit(oldPassword, newPassword)
 Preferences.convertPasswords(oldPassword, newPassword)
 variant = Globals.getWebBrowserSupport()
 if variant == "QtWebEngine":
-from WebBrowser.Passwords.PasswordManager import \
+from WebBrowser.Passwords.PasswordManager import (
 PasswordManager
+)
 pwManager = PasswordManager()
 pwManager.masterPasswordChanged(oldPassword, newPassword)
 Utilities.crypto.changeRememberedMaster(newPassword)
 def __reloadAPIs(self):
 from .ClearPrivateDataDialog import ClearPrivateDataDialog
 dlg = ClearPrivateDataDialog(self)
 if dlg.exec_() == QDialog.Accepted:
 # recent files, recent projects, recent multi  projects,
 # debug histories, shell histories
-(files, projects, multiProjects, debug, shell, vcs, plugins) = \
+(files, projects, multiProjects, debug, shell, vcs, plugins) = (
 dlg.getData()
+)
 if files:
 # clear list of recently opened files
 self.viewmanager.clearRecent()
 if projects:
 # clear list of recently opened projects and other histories
 """
 Private slot to handle the projectOpened signal.
 """
 from Debugger.DebugClientCapabilities import HasUnittest
 self.__setWindowCaption(project=self.project.name)
-cap = e5App().getObject("DebugServer")\
+cap = e5App().getObject("DebugServer").getClientCapabilities(
-.getClientCapabilities(self.project.getProjectLanguage())
+self.project.getProjectLanguage())
 self.utProjectAct.setEnabled(cap & HasUnittest)
 self.utProjectOpen = cap & HasUnittest
 def __projectClosed(self):
 """
 def __writeCrashSession(self):
 """
 Private slot to write a crash session file.
 """
-if not self.__readingSession and \
+if (
-not self.__disableCrashSession and \
+not self.__readingSession and
-Preferences.getUI("CrashSessionEnabled"):
+not self.__disableCrashSession and
+Preferences.getUI("CrashSessionEnabled")
+):
 self.__writeSession(crashSession=True)
 def __readCrashSession(self):
 """
 Private method to check for and read a crash session.
 @return flag indicating a crash session file was found and read
 @rtype bool
 """
 res = False
-if not self.__disableCrashSession and \
+if (
-not self.__noCrashOpenAtStartup and \
+not self.__disableCrashSession and
-Preferences.getUI("OpenCrashSessionOnStartup"):
+not self.__noCrashOpenAtStartup and
+Preferences.getUI("OpenCrashSessionOnStartup")
+):
 fn = os.path.join(Utilities.getConfigDir(),
 "eric6_crash_session.e5s")
 if os.path.exists(fn):
 yes = E5MessageBox.yesNo(
 self,
 @keyparam searchDir directory to search in (string)
 @keyparam openFiles flag indicating to operate on open files (boolean)
 """
 if self.replaceFilesDialog is None:
 from .FindFileDialog import FindFileDialog
-self.replaceFilesDialog = \
+self.replaceFilesDialog = FindFileDialog(
-FindFileDialog(self.project, replaceMode=True)
+self.project, replaceMode=True)
 self.replaceFilesDialog.sourceFile.connect(
 self.viewmanager.openSourceFile)
 self.replaceFilesDialog.designerFile.connect(self.__designer)
 if searchDir:
 self.replaceFilesDialog.setSearchDirectory(searchDir)
 self.__replies.remove(reply)
 if reply.error() == QNetworkReply.NoError:
 ioEncoding = Preferences.getSystem("IOEncoding")
 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines()
 reply.close()
-if reply.error() != QNetworkReply.NoError or \
+if (
-len(versions) == 0 or \
+reply.error() != QNetworkReply.NoError or
-versions[0].startswith("<"):
+len(versions) == 0 or
+versions[0].startswith("<")
+):
 # network error or an error page
 self.httpAlternative += 1
 if self.httpAlternative >= len(self.__httpAlternatives):
 self.__inVersionCheck = False
 if self.__versionCheckProgress is not None:
 line = 0
 while line < len(versions):
 if versions[line] == "---":
 break
-versionText += """<tr><td>{0}</td><td><a href="{1}">{2}</a>""" \
+versionText += (
-"""</td></tr>""".format(
+"""<tr><td>{0}</td><td><a href="{1}">{2}</a></td></tr>"""
-versions[line], versions[line + 1],
+).format(
-'sourceforge' in versions[line + 1] and
+versions[line], versions[line + 1],
-"SourceForge" or versions[line + 1])
+'sourceforge' in versions[line + 1] and
+"SourceForge" or versions[line + 1])
 line += 2
 versionText += self.tr("""</table>""")
 self.__versionsDialog = E5MessageBox.E5MessageBox(
 E5MessageBox.NoIcon,

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py