Mercurial Repositories > eric / file diff

--- a/src/eric7/UI/UserInterface.py	Tue Jan 03 17:01:19 2023 +0100
+++ b/src/eric7/UI/UserInterface.py	Tue Jan 24 10:15:12 2023 +0100
@@ -95,7 +95,6 @@
 from eric7.Utilities.BackgroundService import BackgroundService
 from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
 
-from . import Config
 from .Info import BugAddress, FeatureAddress, Program, Version, VersionOnly
 from .NotificationWidget import NotificationTypes
 
@@ -4074,14 +4073,6 @@
         self.__menus["help"].addAction(self.whatsThisAct)
         self.__menus["help"].aboutToShow.connect(self.__showHelpMenu)
 
-    def getToolBarIconSize(self):
-        """
-        Public method to get the toolbar icon size.
-
-        @return toolbar icon size (QSize)
-        """
-        return Config.ToolBarIconSize
-
     def __initToolbars(self):
         """
         Private slot to create the toolbars.
@@ -4102,13 +4093,6 @@
         profilestb = QToolBar(self.tr("Profiles"), self)
         pluginstb = QToolBar(self.tr("Plugins"), self)
 
-        toolstb.setIconSize(Config.ToolBarIconSize)
-        testingtb.setIconSize(Config.ToolBarIconSize)
-        settingstb.setIconSize(Config.ToolBarIconSize)
-        helptb.setIconSize(Config.ToolBarIconSize)
-        profilestb.setIconSize(Config.ToolBarIconSize)
-        pluginstb.setIconSize(Config.ToolBarIconSize)
-
         toolstb.setObjectName("ToolsToolbar")
         testingtb.setObjectName("UnittestToolbar")
         settingstb.setObjectName("SettingsToolbar")
@@ -8253,20 +8237,22 @@
             ]
             updateAvailable = bool(newerVersionsTuple)
             if updateAvailable:
-                EricMessageBox.information(
+                yes = EricMessageBox.yesNo(
                     self,
                     self.tr("Upgrade available"),
                     self.tr(
                         """<p>A newer version of the <b>eric-ide</b> package is"""
                         """ available at <a href="{0}/eric-ide/">"""
                         """PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b>"""
-                        """</p>"""
+                        """</p><p>Shall <b>eric-ide</b> be upgraded?</p>"""
                     ).format(
                         self.pipInterface.getIndexUrlPypi(),
                         VersionOnly,
                         ".".join(str(p) for p in max(newerVersionsTuple) if p > 0),
                     ),
                 )
+                if yes and self.__shutdown():
+                    self.__performUpgrade("eric")
 
     def __sslErrors(self, reply, errors):
         """