--- a/src/eric7/UI/UserInterface.py Tue Oct 01 12:05:57 2024 +0200
+++ b/src/eric7/UI/UserInterface.py Tue Oct 01 14:04:31 2024 +0200
@@ -4605,39 +4605,48 @@
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(
- sys.version.split()[0], sizeStr
+ versionInfo.append(
+ 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(
- qVersion()
- )
+ versionInfo.append(f"<tr><td><b>Qt</b></td><td>{qVersion()}</td></tr>")
# PyQt versions
- versionText += ("""<tr><td><b>PyQt6</b></td><td>{0}</td></tr>""").format(
- PYQT_VERSION_STR
- )
+ versionInfo.append(f"<tr><td><b>PyQt6</b></td><td>{PYQT_VERSION_STR}</td></tr>")
with contextlib.suppress(ImportError, AttributeError):
from PyQt6 import QtCharts # __IGNORE_WARNING_I10__
- versionText += (
- """<tr><td><b>PyQt6-Charts</b></td><td>{0}</td></tr>"""
- ).format(QtCharts.PYQT_CHART_VERSION_STR)
+ versionInfo.append(
+ "<tr><td><b>PyQt6-Charts</b></td>"
+ f"<td>{QtCharts.PYQT_CHART_VERSION_STR}</td></tr>"
+ )
with contextlib.suppress(ImportError, AttributeError):
from PyQt6 import QtWebEngineCore # __IGNORE_WARNING_I10__
- versionText += (
- """<tr><td><b>PyQt6-WebEngine</b></td><td>{0}</td></tr>"""
- ).format(QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
- versionText += (
- """<tr><td><b>PyQt6-QScintilla</b></td><td>{0}</td></tr>"""
- ).format(QSCINTILLA_VERSION_STR)
- versionText += ("""<tr><td><b>sip</b></td><td>{0}</td></tr>""").format(
- sip_version_str
+ versionInfo.append(
+ "<tr><td><b>PyQt6-WebEngine</b></td>"
+ f"<td>{QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR}</td></tr>"
+ )
+ versionInfo.extend(
+ [
+ "<tr><td><b>PyQt6-QScintilla</b></td>"
+ f"<td>{QSCINTILLA_VERSION_STR}</td></tr>",
+ f"<tr><td><b>sip</b></td><td>{sip_version_str}</td></tr>",
+ ]
)
# webengine (chromium) version
@@ -4650,37 +4659,33 @@
chromiumVersion,
chromiumSecurityVersion,
) = WebBrowserTools.getWebEngineVersions()[0:2]
- versionText += """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>""".format(
- chromiumVersion
+ versionInfo.append(
+ f"<tr><td><b>WebEngine</b></td><td>{chromiumVersion}</td></tr>"
)
if chromiumSecurityVersion:
- versionText += self.tr(
- """<tr><td><b>WebEngine (Security)</b></td>"""
- """<td>{0}</td></tr>"""
- ).format(chromiumSecurityVersion)
-
- # eric7 version
- versionText += ("""<tr><td><b>{0}</b></td><td>{1}</td></tr>""").format(
- Program, Version
- )
+ versionInfo.append(
+ "<tr><td><b>WebEngine (Security)</b></td>"
+ f"<td>{chromiumSecurityVersion}</td></tr>"
+ )
# 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(
- self.tr("Desktop"), desktop
+ versionInfo.append(
+ 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(
- self.tr("Session Type"), session
+ versionInfo.append(
+ f"<tr><td><b>{self.tr('Session Type')}</b></td>"
+ f"<td>{session}</td></tr>"
)
- versionText += self.tr("""</table>""")
-
- VersionsDialog(self, Program, versionText)
+ versionInfo.append("</table>")
+
+ VersionsDialog(self, Program, "".join(versionInfo))
def __copyVersions(self):
"""
