--- a/eric6/QScintilla/ShellWindow.py Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/QScintilla/ShellWindow.py Sun Apr 12 19:07:49 2020 +0200
@@ -60,7 +60,7 @@
super(ShellWindow, self).__init__(parent)
if name is not None:
self.setObjectName(name)
- self.setWindowIcon(UI.PixmapCache.getIcon("shell.png"))
+ self.setWindowIcon(UI.PixmapCache.getIcon("shell"))
self.setWindowTitle(self.tr("eric6 Shell"))
self.setStyle(Preferences.getUI("Style"),
@@ -205,7 +205,7 @@
"""
self.exitAct = E5Action(
self.tr('Quit'),
- UI.PixmapCache.getIcon("exit.png"),
+ UI.PixmapCache.getIcon("exit"),
self.tr('&Quit'),
QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
0, self, 'quit')
@@ -220,7 +220,7 @@
self.newWindowAct = E5Action(
self.tr('New Window'),
- UI.PixmapCache.getIcon("newWindow.png"),
+ UI.PixmapCache.getIcon("newWindow"),
self.tr('New &Window'),
QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
0, self, 'new_window')
@@ -235,7 +235,7 @@
self.restartAct = E5Action(
self.tr('Restart'),
- UI.PixmapCache.getIcon("restart.png"),
+ UI.PixmapCache.getIcon("restart"),
self.tr('Restart'),
0, 0, self, 'shell_restart')
self.restartAct.setStatusTip(self.tr(
@@ -249,7 +249,7 @@
self.clearRestartAct = E5Action(
self.tr('Restart and Clear'),
- UI.PixmapCache.getIcon("restartDelete.png"),
+ UI.PixmapCache.getIcon("restartDelete"),
self.tr('Restart and Clear'),
Qt.Key_F4, 0, self, 'shell_clear_restart')
self.clearRestartAct.setStatusTip(self.tr(
@@ -272,7 +272,7 @@
self.cutAct = E5Action(
QCoreApplication.translate('ViewManager', 'Cut'),
- UI.PixmapCache.getIcon("editCut.png"),
+ UI.PixmapCache.getIcon("editCut"),
QCoreApplication.translate('ViewManager', 'Cu&t'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+X", "Edit|Cut")),
@@ -292,7 +292,7 @@
self.copyAct = E5Action(
QCoreApplication.translate('ViewManager', 'Copy'),
- UI.PixmapCache.getIcon("editCopy.png"),
+ UI.PixmapCache.getIcon("editCopy"),
QCoreApplication.translate('ViewManager', '&Copy'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+C", "Edit|Copy")),
@@ -312,7 +312,7 @@
self.pasteAct = E5Action(
QCoreApplication.translate('ViewManager', 'Paste'),
- UI.PixmapCache.getIcon("editPaste.png"),
+ UI.PixmapCache.getIcon("editPaste"),
QCoreApplication.translate('ViewManager', '&Paste'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+V", "Edit|Paste")),
@@ -332,7 +332,7 @@
self.clearAct = E5Action(
QCoreApplication.translate('ViewManager', 'Clear'),
- UI.PixmapCache.getIcon("editDelete.png"),
+ UI.PixmapCache.getIcon("editDelete"),
QCoreApplication.translate('ViewManager', 'Clear'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Alt+Shift+C", "Edit|Clear")),
@@ -740,7 +740,7 @@
self.searchAct = E5Action(
QCoreApplication.translate('ViewManager', 'Search'),
- UI.PixmapCache.getIcon("find.png"),
+ UI.PixmapCache.getIcon("find"),
QCoreApplication.translate('ViewManager', '&Search...'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+F", "Search|Search")),
@@ -761,7 +761,7 @@
self.searchNextAct = E5Action(
QCoreApplication.translate(
'ViewManager', 'Search next'),
- UI.PixmapCache.getIcon("findNext.png"),
+ UI.PixmapCache.getIcon("findNext"),
QCoreApplication.translate('ViewManager', 'Search &next'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "F3", "Search|Search next")),
@@ -782,7 +782,7 @@
self.searchPrevAct = E5Action(
QCoreApplication.translate('ViewManager', 'Search previous'),
- UI.PixmapCache.getIcon("findPrev.png"),
+ UI.PixmapCache.getIcon("findPrev"),
QCoreApplication.translate('ViewManager', 'Search &previous'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Shift+F3", "Search|Search previous")),
@@ -810,7 +810,7 @@
self.zoomInAct = E5Action(
QCoreApplication.translate('ViewManager', 'Zoom in'),
- UI.PixmapCache.getIcon("zoomIn.png"),
+ UI.PixmapCache.getIcon("zoomIn"),
QCoreApplication.translate('ViewManager', 'Zoom &in'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl++", "View|Zoom in")),
@@ -829,7 +829,7 @@
self.zoomOutAct = E5Action(
QCoreApplication.translate('ViewManager', 'Zoom out'),
- UI.PixmapCache.getIcon("zoomOut.png"),
+ UI.PixmapCache.getIcon("zoomOut"),
QCoreApplication.translate('ViewManager', 'Zoom &out'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+-", "View|Zoom out")),
@@ -848,7 +848,7 @@
self.zoomResetAct = E5Action(
QCoreApplication.translate('ViewManager', 'Zoom reset'),
- UI.PixmapCache.getIcon("zoomReset.png"),
+ UI.PixmapCache.getIcon("zoomReset"),
QCoreApplication.translate('ViewManager', 'Zoom &reset'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+0", "View|Zoom reset")),
@@ -867,7 +867,7 @@
self.zoomToAct = E5Action(
QCoreApplication.translate('ViewManager', 'Zoom'),
- UI.PixmapCache.getIcon("zoomTo.png"),
+ UI.PixmapCache.getIcon("zoomTo"),
QCoreApplication.translate('ViewManager', '&Zoom'),
QKeySequence(QCoreApplication.translate(
'ViewManager', "Ctrl+#", "View|Zoom")),
@@ -891,7 +891,7 @@
"""
self.showHistoryAct = E5Action(
self.tr('Show History'),
- UI.PixmapCache.getIcon("history.png"),
+ UI.PixmapCache.getIcon("history"),
self.tr('&Show History...'),
0, 0,
self, 'shell_show_history')
@@ -901,7 +901,7 @@
self.clearHistoryAct = E5Action(
self.tr('Clear History'),
- UI.PixmapCache.getIcon("historyClear.png"),
+ UI.PixmapCache.getIcon("historyClear"),
self.tr('&Clear History...'),
0, 0,
self, 'shell_clear_history')
@@ -949,7 +949,7 @@
self.whatsThisAct = E5Action(
self.tr('What\'s This?'),
- UI.PixmapCache.getIcon("whatsThis.png"),
+ UI.PixmapCache.getIcon("whatsThis"),
self.tr('&What\'s This?'),
QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
0, self, 'help_help_whats_this')
@@ -1250,9 +1250,9 @@
self.__statusBar.setSizeGripEnabled(True)
self.__sbZoom = E5ZoomWidget(
- UI.PixmapCache.getPixmap("zoomOut.png"),
- UI.PixmapCache.getPixmap("zoomIn.png"),
- UI.PixmapCache.getPixmap("zoomReset.png"),
+ UI.PixmapCache.getPixmap("zoomOut"),
+ UI.PixmapCache.getPixmap("zoomIn"),
+ UI.PixmapCache.getPixmap("zoomReset"),
self.__statusBar)
self.__statusBar.addPermanentWidget(self.__sbZoom)
self.__sbZoom.setWhatsThis(self.tr(
