Mercurial Repositories > eric / file diff

--- a/src/eric7/UI/VersionsDialog.py	Mon Sep 19 19:44:55 2022 +0200
+++ b/src/eric7/UI/VersionsDialog.py	Tue Sep 20 10:29:54 2022 +0200
@@ -67,6 +67,15 @@
         Private slot to check, if updates of PyQt6 packages or the eric-ide
         package are available.
         """
+        upgradeButtonTemplate = self.tr("Upgrade {0}...")
+        headerTemplate = self.tr("<p>An upgrade of <b>{0}</b> is available.</p>")
+        tableTemplate = self.tr(
+            "<table>"
+            "<tr><th>Package</th><th>Installed</th><th>Available</th></tr>{0}"
+            "</table>"
+        )
+        entryTemplate = self.tr("<tr><td><b>{0}</b></td><td>{1}</td><td>{2}</td></tr>")
+
         msg = ""
 
         pip = ericApp().getObject("Pip")
@@ -94,31 +103,28 @@
 
             if ericUpdateAvailable:
                 self.__upgradeEricButton = self.buttonBox.addButton(
-                    self.tr("Upgrade eric7..."), QDialogButtonBox.ButtonRole.ActionRole
+                    upgradeButtonTemplate.format("eric7"),
+                    QDialogButtonBox.ButtonRole.ActionRole,
                 )
                 self.__upgradeEricButton.clicked.connect(self.__ui.upgradeEric)
-                msg += self.tr(
-                    "<p>An upgrade of <b>eric7</b> is available.<br/>"
-                    "<b>{0}</b>: {1} to {2}.</p>"
-                ).format(*ericVersionsData[0])
+                msg += headerTemplate.format("eric7")
+                msg += tableTemplate.format(entryTemplate.format(*ericVersionsData[0]))
 
             if pyqtUpdateAvailable:
                 self.__upgradePyQtButton = self.buttonBox.addButton(
-                    self.tr("Upgrade PyQt6..."), QDialogButtonBox.ButtonRole.ActionRole
+                    upgradeButtonTemplate.format("PyQt6"),
+                    QDialogButtonBox.ButtonRole.ActionRole,
                 )
                 self.__upgradePyQtButton.clicked.connect(self.__ui.upgradePyQt)
-                msg += self.tr(
-                    "<p>An upgrade of <b>PyQt6</b> is available.<br/>{0}</p>"
-                ).format(
-                    "<br/>".join(
-                        self.tr("<b>{0}</b>: {1} to {2}").format(*v)
-                        for v in pyqtVersionsData
-                    )
+                msg += headerTemplate.format("PyQt6")
+                msg += tableTemplate.format(
+                    "".join(entryTemplate.format(*v) for v in pyqtVersionsData)
                 )
 
             if ericUpdateAvailable and pyqtUpdateAvailable:
                 self.__upgradeBothButton = self.buttonBox.addButton(
-                    self.tr("Upgrade Both..."), QDialogButtonBox.ButtonRole.ActionRole
+                    upgradeButtonTemplate.format(self.tr("Both")),
+                    QDialogButtonBox.ButtonRole.ActionRole,
                 )
                 self.__upgradeBothButton.clicked.connect(self.__ui.upgradeEricPyQt)