Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun Apr 12 19:07:49 2020 +0200
@@ -209,7 +209,7 @@
         self.__navigationMenu.triggered.connect(self.__navigationMenuTriggered)
         
         self.navigationButton = QToolButton(self)
-        self.navigationButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.navigationButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         self.navigationButton.setToolTip(self.tr("Show a navigation menu"))
         self.navigationButton.setPopupMode(QToolButton.InstantPopup)
         self.navigationButton.setMenu(self.__navigationMenu)
@@ -234,7 +234,7 @@
         self.emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
         super(TabWidget, self).addTab(
             self.emptyLabel,
-            UI.PixmapCache.getIcon("empty.png"), "")
+            UI.PixmapCache.getIcon("empty"), "")
         
     def __initMenu(self):
         """
@@ -242,35 +242,35 @@
         """
         self.__menu = QMenu(self)
         self.leftMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("1leftarrow.png"),
+            UI.PixmapCache.getIcon("1leftarrow"),
             self.tr('Move Left'), self.__contextMenuMoveLeft)
         self.rightMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("1rightarrow.png"),
+            UI.PixmapCache.getIcon("1rightarrow"),
             self.tr('Move Right'), self.__contextMenuMoveRight)
         self.firstMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("2leftarrow.png"),
+            UI.PixmapCache.getIcon("2leftarrow"),
             self.tr('Move First'), self.__contextMenuMoveFirst)
         self.lastMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("2rightarrow.png"),
+            UI.PixmapCache.getIcon("2rightarrow"),
             self.tr('Move Last'), self.__contextMenuMoveLast)
         self.__menu.addSeparator()
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("tabClose.png"),
+            UI.PixmapCache.getIcon("tabClose"),
             self.tr('Close'), self.__contextMenuClose)
         self.closeOthersMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("tabCloseOther.png"),
+            UI.PixmapCache.getIcon("tabCloseOther"),
             self.tr("Close Others"), self.__contextMenuCloseOthers)
         self.__menu.addAction(
             self.tr('Close All'), self.__contextMenuCloseAll)
         self.__menu.addSeparator()
         self.saveMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('Save'), self.__contextMenuSave)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save As...'), self.__contextMenuSaveAs)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAll.png"),
+            UI.PixmapCache.getIcon("fileSaveAll"),
             self.tr('Save All'), self.__contextMenuSaveAll)
         self.__menu.addSeparator()
         self.openRejectionsMenuAct = self.__menu.addAction(
@@ -278,7 +278,7 @@
             self.__contextMenuOpenRejections)
         self.__menu.addSeparator()
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('Print'), self.__contextMenuPrintFile)
         self.__menu.addSeparator()
         self.copyPathAct = self.__menu.addAction(
@@ -365,7 +365,7 @@
         """
         editor = assembly.getEditor()
         super(TabWidget, self).addTab(
-            assembly, UI.PixmapCache.getIcon("empty.png"), title)
+            assembly, UI.PixmapCache.getIcon("empty"), title)
         self.setTabsClosable(True)
         self.navigationButton.setEnabled(True)
         
@@ -395,7 +395,7 @@
         editor = assembly.getEditor()
         newIndex = super(TabWidget, self).insertTab(
             index, assembly,
-            UI.PixmapCache.getIcon("empty.png"),
+            UI.PixmapCache.getIcon("empty"),
             title)
         self.setTabsClosable(True)
         self.navigationButton.setEnabled(True)
@@ -476,7 +476,7 @@
         
         if not self.editors:
             super(TabWidget, self).addTab(
-                self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
+                self.emptyLabel, UI.PixmapCache.getIcon("empty"), "")
             self.emptyLabel.show()
             self.setTabsClosable(False)
             self.navigationButton.setEnabled(False)
@@ -1109,13 +1109,13 @@
         index = tw.indexOf(editor)
         keys = []
         if m:
-            keys.append("fileModified.png")
+            keys.append("fileModified")
         if editor.hasSyntaxErrors():
-            keys.append("syntaxError22.png")
+            keys.append("syntaxError22")
         elif editor.hasWarnings():
-            keys.append("warning22.png")
+            keys.append("warning22")
         if not keys:
-            keys.append("empty.png")
+            keys.append("empty")
         tw.setTabIcon(index, UI.PixmapCache.getCombinedIcon(keys))
         self._checkActions(editor)
         
@@ -1132,13 +1132,13 @@
         index = tw.indexOf(editor)
         keys = []
         if editor.isModified():
-            keys.append("fileModified.png")
+            keys.append("fileModified")
         if editor.hasSyntaxErrors():
-            keys.append("syntaxError22.png")
+            keys.append("syntaxError22")
         elif editor.hasWarnings():
-            keys.append("warning22.png")
+            keys.append("warning22")
         if not keys:
-            keys.append("empty.png")
+            keys.append("empty")
         tw.setTabIcon(index, UI.PixmapCache.getCombinedIcon(keys))
         
         ViewManager._syntaxErrorToggled(self, editor)