Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/AdBlock/AdBlockIcon.py	Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockIcon.py	Sun Apr 12 19:07:49 2020 +0200
@@ -52,7 +52,7 @@
             self.currentChanged()
         else:
             self.setPixmap(
-                UI.PixmapCache.getPixmap("adBlockPlusDisabled16.png"))
+                UI.PixmapCache.getPixmap("adBlockPlusDisabled16"))
     
     def __createMenu(self, menu):
         """
@@ -67,13 +67,13 @@
         
         if manager.isEnabled():
             act = menu.addAction(
-                UI.PixmapCache.getIcon("adBlockPlusDisabled.png"),
+                UI.PixmapCache.getIcon("adBlockPlusDisabled"),
                 self.tr("Disable AdBlock"))
             act.setData(False)
             act.triggered.connect(lambda: self.__enableAdBlock(act))
         else:
             act = menu.addAction(
-                UI.PixmapCache.getIcon("adBlockPlus.png"),
+                UI.PixmapCache.getIcon("adBlockPlus"),
                 self.tr("Enable AdBlock"))
             act.setData(True)
             act.triggered.connect(lambda: self.__enableAdBlock(act))
@@ -81,22 +81,22 @@
         if manager.isEnabled() and self.__mw.currentBrowser().url().host():
             if self.__isCurrentHostExcepted():
                 act = menu.addAction(
-                    UI.PixmapCache.getIcon("adBlockPlus.png"),
+                    UI.PixmapCache.getIcon("adBlockPlus"),
                     self.tr("Remove AdBlock Exception"))
                 act.setData(False)
                 act.triggered.connect(lambda: self.__setException(act))
             else:
                 act = menu.addAction(
-                    UI.PixmapCache.getIcon("adBlockPlusGreen.png"),
+                    UI.PixmapCache.getIcon("adBlockPlusGreen"),
                     self.tr("Add AdBlock Exception"))
                 act.setData(True)
                 act.triggered.connect(lambda: self.__setException(act))
         menu.addAction(
-            UI.PixmapCache.getIcon("adBlockPlusGreen.png"),
+            UI.PixmapCache.getIcon("adBlockPlusGreen"),
             self.tr("AdBlock Exceptions..."), manager.showExceptionsDialog)
         menu.addSeparator()
         menu.addAction(
-            UI.PixmapCache.getIcon("adBlockPlus.png"),
+            UI.PixmapCache.getIcon("adBlockPlus"),
             self.tr("AdBlock Configuration..."), manager.showDialog)
     
     def menuAction(self):
@@ -114,10 +114,10 @@
         
         if self.__enabled:
             self.__menuAction.setIcon(
-                UI.PixmapCache.getIcon("adBlockPlus.png"))
+                UI.PixmapCache.getIcon("adBlockPlus"))
         else:
             self.__menuAction.setIcon(
-                UI.PixmapCache.getIcon("adBlockPlusDisabled.png"))
+                UI.PixmapCache.getIcon("adBlockPlusDisabled"))
         
         return self.__menuAction
     
@@ -167,9 +167,9 @@
         if self.__enabled:
             if self.__isCurrentHostExcepted():
                 self.setPixmap(
-                    UI.PixmapCache.getPixmap("adBlockPlusGreen16.png"))
+                    UI.PixmapCache.getPixmap("adBlockPlusGreen16"))
             else:
-                self.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus16.png"))
+                self.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus16"))
     
     def __setException(self, act):
         """