Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserTabWidget.py	Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserTabWidget.py	Sun Apr 12 19:07:49 2020 +0200
@@ -118,7 +118,7 @@
         
         self.__navigationButton = QToolButton(self)
         self.__navigationButton.setIcon(
-            UI.PixmapCache.getIcon("1downarrow.png"))
+            UI.PixmapCache.getIcon("1downarrow"))
         self.__navigationButton.setToolTip(
             self.tr("Show a navigation menu"))
         self.__navigationButton.setPopupMode(QToolButton.InstantPopup)
@@ -131,7 +131,7 @@
             self.__aboutToShowClosedTabsMenu)
         
         self.__closedTabsButton = QToolButton(self)
-        self.__closedTabsButton.setIcon(UI.PixmapCache.getIcon("trash.png"))
+        self.__closedTabsButton.setIcon(UI.PixmapCache.getIcon("trash"))
         self.__closedTabsButton.setToolTip(
             self.tr("Show a navigation menu for closed tabs"))
         self.__closedTabsButton.setPopupMode(QToolButton.InstantPopup)
@@ -145,7 +145,7 @@
         self.setCornerWidget(self.__rightCornerWidget, Qt.TopRightCorner)
         
         self.__newTabButton = QToolButton(self)
-        self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
+        self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus"))
         self.__newTabButton.setToolTip(
             self.tr("Open a new web browser tab"))
         self.setCornerWidget(self.__newTabButton, Qt.TopLeftCorner)
@@ -161,36 +161,36 @@
         """
         self.__tabContextMenu = QMenu(self)
         self.tabContextNewAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("tabNew.png"),
+            UI.PixmapCache.getIcon("tabNew"),
             self.tr('New Tab'), self.newBrowser)
         self.__tabContextMenu.addSeparator()
         self.leftMenuAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("1leftarrow.png"),
+            UI.PixmapCache.getIcon("1leftarrow"),
             self.tr('Move Left'), self.__tabContextMenuMoveLeft)
         self.rightMenuAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("1rightarrow.png"),
+            UI.PixmapCache.getIcon("1rightarrow"),
             self.tr('Move Right'), self.__tabContextMenuMoveRight)
         self.__tabContextMenu.addSeparator()
         self.tabContextCloneAct = self.__tabContextMenu.addAction(
             self.tr("Duplicate Page"), self.__tabContextMenuClone)
         self.__tabContextMenu.addSeparator()
         self.tabContextCloseAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("tabClose.png"),
+            UI.PixmapCache.getIcon("tabClose"),
             self.tr('Close'), self.__tabContextMenuClose)
         self.tabContextCloseOthersAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("tabCloseOther.png"),
+            UI.PixmapCache.getIcon("tabCloseOther"),
             self.tr("Close Others"), self.__tabContextMenuCloseOthers)
         self.__tabContextMenu.addAction(
             self.tr('Close All'), self.closeAllBrowsers)
         self.__tabContextMenu.addSeparator()
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr('Print Preview'), self.__tabContextMenuPrintPreview)
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('Print'), self.__tabContextMenuPrint)
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("printPdf.png"),
+            UI.PixmapCache.getIcon("printPdf"),
             self.tr('Print as PDF'), self.__tabContextMenuPrintPdf)
         self.__tabContextMenu.addSeparator()
         if hasattr(WebBrowserPage, "isAudioMuted"):
@@ -200,25 +200,25 @@
         else:
             self.__audioAct = None
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("reload.png"),
+            UI.PixmapCache.getIcon("reload"),
             self.tr('Reload All'), self.reloadAllBrowsers)
         self.__tabContextMenu.addSeparator()
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr('Bookmark All Tabs'), self.__mainWindow.bookmarkAll)
         
         self.__tabBackContextMenu = QMenu(self)
         self.__tabBackContextMenu.addAction(
             self.tr('Close All'), self.closeAllBrowsers)
         self.__tabBackContextMenu.addAction(
-            UI.PixmapCache.getIcon("reload.png"),
+            UI.PixmapCache.getIcon("reload"),
             self.tr('Reload All'), self.reloadAllBrowsers)
         self.__tabBackContextMenu.addAction(
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr('Bookmark All Tabs'), self.__mainWindow.bookmarkAll)
         self.__tabBackContextMenu.addSeparator()
         self.__restoreClosedTabAct = self.__tabBackContextMenu.addAction(
-            UI.PixmapCache.getIcon("trash.png"),
+            UI.PixmapCache.getIcon("trash"),
             self.tr('Restore Closed Tab'))
         self.__restoreClosedTabAct.setEnabled(False)
         self.__restoreClosedTabAct.setData(0)
@@ -249,11 +249,11 @@
                 ):
                     self.__audioAct.setText(self.tr("Unmute Tab"))
                     self.__audioAct.setIcon(
-                        UI.PixmapCache.getIcon("audioVolumeHigh.png"))
+                        UI.PixmapCache.getIcon("audioVolumeHigh"))
                 else:
                     self.__audioAct.setText(self.tr("Mute Tab"))
                     self.__audioAct.setIcon(
-                        UI.PixmapCache.getIcon("audioVolumeMuted.png"))
+                        UI.PixmapCache.getIcon("audioVolumeMuted"))
             
             self.__tabContextMenu.popup(coord)
     
@@ -354,9 +354,9 @@
             painter = QPainter(pix)
             icon.paint(painter, 0, 0, 22, 22)
             if page.isAudioMuted():
-                audioIcon = UI.PixmapCache.getIcon("audioMuted.png")
+                audioIcon = UI.PixmapCache.getIcon("audioMuted")
             else:
-                audioIcon = UI.PixmapCache.getIcon("audioPlaying.png")
+                audioIcon = UI.PixmapCache.getIcon("audioPlaying")
             audioIcon.paint(painter, 13, 13, 18, 18)
             painter.end()
             self.setTabIcon(index, QIcon(pix))
@@ -961,10 +961,10 @@
                 parent=self)
             quitButton = mb.addButton(
                 self.tr("&Quit"), E5MessageBox.AcceptRole)
-            quitButton.setIcon(UI.PixmapCache.getIcon("exit.png"))
+            quitButton.setIcon(UI.PixmapCache.getIcon("exit"))
             closeTabButton = mb.addButton(
                 self.tr("C&lose Current Tab"), E5MessageBox.AcceptRole)
-            closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose.png"))
+            closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose"))
             mb.addButton(E5MessageBox.Cancel)
             mb.exec_()
             if mb.clickedButton() == quitButton: