Mercurial Repositories > eric / file diff

--- a/eric6/Network/IRC/IrcChannelWidget.py	Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/Network/IRC/IrcChannelWidget.py	Sun Apr 12 19:07:49 2020 +0200
@@ -129,17 +129,17 @@
         """
         # step 1: determine the icon
         if self.__privilege & IrcUserItem.Voice:
-            icon = UI.PixmapCache.getIcon("ircVoice.png")
+            icon = UI.PixmapCache.getIcon("ircVoice")
         elif self.__privilege & IrcUserItem.Owner:
-            icon = UI.PixmapCache.getIcon("ircOwner.png")
+            icon = UI.PixmapCache.getIcon("ircOwner")
         elif self.__privilege & IrcUserItem.Operator:
-            icon = UI.PixmapCache.getIcon("ircOp.png")
+            icon = UI.PixmapCache.getIcon("ircOp")
         elif self.__privilege & IrcUserItem.Halfop:
-            icon = UI.PixmapCache.getIcon("ircHalfop.png")
+            icon = UI.PixmapCache.getIcon("ircHalfop")
         elif self.__privilege & IrcUserItem.Admin:
-            icon = UI.PixmapCache.getIcon("ircAdmin.png")
+            icon = UI.PixmapCache.getIcon("ircAdmin")
         else:
-            icon = UI.PixmapCache.getIcon("ircNormal.png")
+            icon = UI.PixmapCache.getIcon("ircNormal")
         if self.__privilege & IrcUserItem.Away:
             icon = self.__awayIcon(icon)
         
@@ -154,7 +154,7 @@
         @return away icon (QIcon)
         """
         pix1 = icon.pixmap(16, 16)
-        pix2 = UI.PixmapCache.getPixmap("ircAway.png")
+        pix2 = UI.PixmapCache.getPixmap("ircAway")
         painter = QPainter(pix1)
         painter.drawPixmap(0, 0, pix2)
         painter.end()
@@ -259,7 +259,7 @@
         self.__ircWidget = parent
         
         self.editTopicButton.setIcon(
-            UI.PixmapCache.getIcon("ircEditTopic.png"))
+            UI.PixmapCache.getIcon("ircEditTopic"))
         self.editTopicButton.hide()
         
         height = self.usersList.height() + self.messages.height()
@@ -686,14 +686,14 @@
         if Preferences.getIrc("ShowNotifications"):
             if Preferences.getIrc("NotifyMessage"):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Channel Message"), msg)
             elif (
                 Preferences.getIrc("NotifyNick") and
                 self.__userName.lower() in msg.lower()
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Nick mentioned"), msg)
     
     def addUsers(self, users):
@@ -733,7 +733,7 @@
                 Preferences.getIrc("NotifyJoinPart")
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Join Channel"), msg)
             return True
         
@@ -768,7 +768,7 @@
                 Preferences.getIrc("NotifyJoinPart")
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Leave Channel"), nmsg)
             return True
         
@@ -800,7 +800,7 @@
                 Preferences.getIrc("NotifyJoinPart")
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Quit"), msg)
         
         # always return False for other channels and server to process
@@ -1417,22 +1417,22 @@
         """
         self.__messagesMenu = QMenu(self)
         self.__copyMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy"), self.__copyMessages)
         self.__messagesMenu.addSeparator()
         self.__cutAllMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr("Cut all"), self.__cutAllMessages)
         self.__copyAllMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy all"), self.__copyAllMessages)
         self.__messagesMenu.addSeparator()
         self.__clearMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             self.tr("Clear"), self.__clearMessages)
         self.__messagesMenu.addSeparator()
         self.__saveMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr("Save"), self.__saveMessages)
         self.__messagesMenu.addSeparator()
         self.__setMarkerMessagesAct = self.__messagesMenu.addAction(