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

-:c8df46dd566d
+:27cd57e98461
 )
 self.__ericServerInterface.connectionStateChanged.connect(
 self.shell.remoteConnectionChanged
 )
-self.__ericServerInterface.aboutToDisconnect.connect(self.project.closeProject)
+self.__ericServerInterface.aboutToDisconnect.connect(
+self.project.remoteConnectionAboutToDisconnect
+)
 self.__ericServerInterface.aboutToDisconnect.connect(
 self.viewmanager.closeRemoteEditors
 )
 # create the toolbar manager object
 except AttributeError:
 sip_version_str = "sip version not available"
 sizeStr = "64-Bit" if sys.maxsize > 2**32 else "32-Bit"
-versionText = self.tr("""<h2>Version Numbers</h2><table>""")
+versionInfo = [self.tr("""<h2>Version Numbers</h2><table>""")]
+# eric7 version
+versionInfo.extend(
+[
+"<tr><td></td><td></td></tr>",
+f"<tr><td><b>{Program}</b></td><td>{Version}</td></tr>",
+"<tr><td></td><td></td></tr>",
+]
+)
 # Python version
-versionText += ("""<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>""").format(
+versionInfo.append(
-sys.version.split()[0], sizeStr
+f"<tr><td><b>Python</b></td><td>{sys.version.split()[0]},"
+f" {sizeStr}</td></tr>"
 )
 # Qt version
-versionText += ("""<tr><td><b>Qt</b></td><td>{0}</td></tr>""").format(
+versionInfo.append(f"<tr><td><b>Qt</b></td><td>{qVersion()}</td></tr>")
-qVersion()
-)
 # PyQt versions
-versionText += ("""<tr><td><b>PyQt6</b></td><td>{0}</td></tr>""").format(
+versionInfo.append(f"<tr><td><b>PyQt6</b></td><td>{PYQT_VERSION_STR}</td></tr>")
-PYQT_VERSION_STR
-)
 with contextlib.suppress(ImportError, AttributeError):
 from PyQt6 import QtCharts  # __IGNORE_WARNING_I10__
-versionText += (
+versionInfo.append(
-"""<tr><td><b>PyQt6-Charts</b></td><td>{0}</td></tr>"""
+"<tr><td><b>PyQt6-Charts</b></td>"
-).format(QtCharts.PYQT_CHART_VERSION_STR)
+f"<td>{QtCharts.PYQT_CHART_VERSION_STR}</td></tr>"
+)
 with contextlib.suppress(ImportError, AttributeError):
 from PyQt6 import QtWebEngineCore  # __IGNORE_WARNING_I10__
-versionText += (
+versionInfo.append(
-"""<tr><td><b>PyQt6-WebEngine</b></td><td>{0}</td></tr>"""
+"<tr><td><b>PyQt6-WebEngine</b></td>"
-).format(QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
+f"<td>{QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR}</td></tr>"
-versionText += (
+)
-"""<tr><td><b>PyQt6-QScintilla</b></td><td>{0}</td></tr>"""
+versionInfo.extend(
-).format(QSCINTILLA_VERSION_STR)
+[
-versionText += ("""<tr><td><b>sip</b></td><td>{0}</td></tr>""").format(
+"<tr><td><b>PyQt6-QScintilla</b></td>"
-sip_version_str
+f"<td>{QSCINTILLA_VERSION_STR}</td></tr>",
+f"<tr><td><b>sip</b></td><td>{sip_version_str}</td></tr>",
+]
 )
 # webengine (chromium) version
 with contextlib.suppress(ImportError):
 from eric7.WebBrowser.Tools import (  # __IGNORE_WARNING_I101__
 (
 chromiumVersion,
 chromiumSecurityVersion,
 ) = WebBrowserTools.getWebEngineVersions()[0:2]
-versionText += """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>""".format(
+versionInfo.append(
-chromiumVersion
+f"<tr><td><b>WebEngine</b></td><td>{chromiumVersion}</td></tr>"
 )
 if chromiumSecurityVersion:
-versionText += self.tr(
+versionInfo.append(
-"""<tr><td><b>WebEngine (Security)</b></td>"""
+"<tr><td><b>WebEngine (Security)</b></td>"
-"""<td>{0}</td></tr>"""
+f"<td>{chromiumSecurityVersion}</td></tr>"
-).format(chromiumSecurityVersion)
+)
-# eric7 version
-versionText += ("""<tr><td><b>{0}</b></td><td>{1}</td></tr>""").format(
-Program, Version
-)
 # desktop and session type
 desktop = DesktopUtilities.desktopName()
 session = DesktopUtilities.sessionType()
 if desktop or session:
-versionText += "<tr><td></td><td></td></tr>"
+versionInfo.append("<tr><td></td><td></td></tr>")
 if desktop:
-versionText += ("<tr><td><b>{0}</b></td><td>{1}</td></tr>").format(
+versionInfo.append(
-self.tr("Desktop"), desktop
+f"<tr><td><b>{self.tr('Desktop')}</b></td><td>{desktop}</td></tr>"
 )
 if session:
-versionText += ("<tr><td><b>{0}</b></td><td>{1}</td></tr>").format(
+versionInfo.append(
-self.tr("Session Type"), session
+f"<tr><td><b>{self.tr('Session Type')}</b></td>"
+f"<td>{session}</td></tr>"
 )
-versionText += self.tr("""</table>""")
+versionInfo.append("</table>")
-VersionsDialog(self, Program, versionText)
+VersionsDialog(parent=self, title=Program, text="".join(versionInfo))
 def __copyVersions(self):
 """
 Private method to generated version information and copy that to the clipboard.
 """
 from .ErrorLogDialog import ErrorLogDialog
 if Preferences.getUI("CheckErrorLog"):
 logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
 if os.path.exists(logFile):
-dlg = ErrorLogDialog(logFile, False, self)
+dlg = ErrorLogDialog(logFile, False, parent=self)
 dlg.exec()
 def __hasErrorLog(self):
 """
 Private method to check, if an error log file exists.
 Private slot to show a dialog containing information about the
 installation process.
 """
 from .InstallInfoDialog import InstallInfoDialog
-dlg = InstallInfoDialog(self)
+dlg = InstallInfoDialog(parent=self)
 if dlg.wasLoaded():
 dlg.exec()
 def __compareFiles(self):
 """
 return False
 @pyqtSlot()
 def upgradeEricPyQt(self):
 """
-Public slot to upgrade the eric-ide and Pyqt packages of the eric7
+Public slot to upgrade the eric-ide and PyQt packages of the eric7
 environment.
 @return flag indicating a successful upgrade
 @rtype bool
 """
 yes = EricMessageBox.yesNo(
 None,
-self.tr("Upgrade Eric"),
+self.tr("Upgrade Eric and PyQt6"),
 self.tr(
 """eric needs to be closed in order to upgrade eric and"""
 """ PyQt. It will be restarted once the upgrade process"""
 """ has finished. This may take some time.\n\n Shall"""
 """ the upgrade be done now?"""
 """
 Private slot to handle the tools configuration menu entry.
 """
 from eric7.Preferences.ToolConfigurationDialog import ToolConfigurationDialog
-dlg = ToolConfigurationDialog(self.toolGroups[self.currentToolGroup][1], self)
+dlg = ToolConfigurationDialog(
+self.toolGroups[self.currentToolGroup][1], parent=self
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 self.toolGroups[self.currentToolGroup][1] = dlg.getToollist()
 self.__updateExternalToolsActions()
 def __toolGroupsConfiguration(self):
 """
 from eric7.Preferences.ToolGroupConfigurationDialog import (
 ToolGroupConfigurationDialog,
 )
-dlg = ToolGroupConfigurationDialog(self.toolGroups, self.currentToolGroup, self)
+dlg = ToolGroupConfigurationDialog(
+self.toolGroups, self.currentToolGroup, parent=self
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 self.toolGroups, self.currentToolGroup = dlg.getToolGroups()
 def __createTestingDialog(self):
 """
 from eric7.Preferences.ConfigurationDialog import ConfigurationDialog
 if self.__configurationDialog is None:
 # only one invocation at a time is allowed
 self.__configurationDialog = ConfigurationDialog(
-self,
+parent=self,
-"Configuration",
+name="Configuration",
 expandedEntries=self.__expandedConfigurationEntries,
 )
 self.__configurationDialog.preferencesChanged.connect(
 self.__preferencesChanged
 )
 Private slot to configure the various view profiles.
 """
 from eric7.Preferences.ViewProfileDialog import ViewProfileDialog
 dlg = ViewProfileDialog(
-self.__layoutType, self.profiles["edit"][1], self.profiles["debug"][1]
+self.__layoutType,
+self.profiles["edit"][1],
+self.profiles["debug"][1],
+parent=self,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 edit, debug = dlg.getVisibilities()
 self.profiles["edit"][1] = edit
 self.profiles["debug"][1] = debug
 """
 Private slot to configure the various toolbars.
 """
 from eric7.EricWidgets.EricToolBarDialog import EricToolBarDialog
-dlg = EricToolBarDialog(self.toolbarManager)
+dlg = EricToolBarDialog(self.toolbarManager, parent=self)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 Preferences.setUI("ToolbarManagerState", self.toolbarManager.saveState())
 def __configShortcuts(self):
 """
 """
 Private slot to clear the private data lists.
 """
 from .ClearPrivateDataDialog import ClearPrivateDataDialog
-dlg = ClearPrivateDataDialog(self)
+dlg = ClearPrivateDataDialog(parent=self)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 # recent files, recent projects, recent multi  projects,
 # debug histories, shell histories
 (
 files,
 """
 Private slot to show a dialog to uninstall a plugin.
 """
 from eric7.PluginManager.PluginUninstallDialog import PluginUninstallDialog
-dlg = PluginUninstallDialog(self.pluginManager, self)
+dlg = PluginUninstallDialog(self.pluginManager, parent=self)
 dlg.exec()
 if self.__findFileWidget:
 self.__findFileWidget.populateFileCategories()
 if self.__findFileDialog:
 """
 Private slot to show the plugins available for download.
 """
 from eric7.PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
-dlg = PluginRepositoryDialog(self.pluginManager, self)
+dlg = PluginRepositoryDialog(self.pluginManager, parent=self)
 res = dlg.exec()
 if res == (QDialog.DialogCode.Accepted + 1):
 self.__installPlugins(dlg.getDownloadedPlugins())
 def __pluginsConfigure(self):

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/UserInterface.py

src/eric7/UI/UserInterface.py