Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/TrayStarterPage.py	Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/TrayStarterPage.py	Sun Apr 12 19:07:49 2020 +0200
@@ -7,6 +7,7 @@
 Module implementing the tray starter configuration page.
 """
 
+import os
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TrayStarterPage import Ui_TrayStarterPage
@@ -27,21 +28,22 @@
         self.setupUi(self)
         self.setObjectName("TrayStarterPage")
         
-        self.standardButton.setIcon(UI.PixmapCache.getIcon("erict.png"))
-        self.highContrastButton.setIcon(UI.PixmapCache.getIcon("erict-hc.png"))
-        self.blackWhiteButton.setIcon(UI.PixmapCache.getIcon("erict-bw.png"))
+        self.standardButton.setIcon(UI.PixmapCache.getIcon("erict"))
+        self.highContrastButton.setIcon(UI.PixmapCache.getIcon("erict-hc"))
+        self.blackWhiteButton.setIcon(UI.PixmapCache.getIcon("erict-bw"))
         self.blackWhiteInverseButton.setIcon(
-            UI.PixmapCache.getIcon("erict-bwi.png"))
+            UI.PixmapCache.getIcon("erict-bwi"))
         
         # set initial values
-        iconName = Preferences.getTrayStarter("TrayStarterIcon")
-        if iconName == "erict.png":
+        iconName = os.path.splitext(
+            Preferences.getTrayStarter("TrayStarterIcon"))[0]
+        if iconName == "erict":
             self.standardButton.setChecked(True)
-        elif iconName == "erict-hc.png":
+        elif iconName == "erict-hc":
             self.highContrastButton.setChecked(True)
-        elif iconName == "erict-bw.png":
+        elif iconName == "erict-bw":
             self.blackWhiteButton.setChecked(True)
-        elif iconName == "erict-bwi.png":
+        elif iconName == "erict-bwi":
             self.blackWhiteInverseButton.setChecked(True)
     
     def save(self):
@@ -49,13 +51,13 @@
         Public slot to save the Python configuration.
         """
         if self.standardButton.isChecked():
-            iconName = "erict.png"
+            iconName = "erict"
         elif self.highContrastButton.isChecked():
-            iconName = "erict-hc.png"
+            iconName = "erict-hc"
         elif self.blackWhiteButton.isChecked():
-            iconName = "erict-bw.png"
+            iconName = "erict-bw"
         elif self.blackWhiteInverseButton.isChecked():
-            iconName = "erict-bwi.png"
+            iconName = "erict-bwi"
         Preferences.setTrayStarter("TrayStarterIcon", iconName)