--- a/eric6/IconEditor/IconEditorWindow.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/IconEditor/IconEditorWindow.py Sun Apr 12 19:07:49 2020 +0200 @@ -59,7 +59,7 @@ self.fromEric = fromEric self.initShortcutsOnly = initShortcutsOnly - self.setWindowIcon(UI.PixmapCache.getIcon("iconEditor.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("iconEditor")) if self.initShortcutsOnly: self.__initActions() @@ -193,7 +193,7 @@ """ self.newAct = E5Action( self.tr('New'), - UI.PixmapCache.getIcon("new.png"), + UI.PixmapCache.getIcon("new"), self.tr('&New'), QKeySequence(self.tr("Ctrl+N", "File|New")), 0, self, 'iconEditor_file_new') @@ -207,7 +207,7 @@ self.newWindowAct = E5Action( self.tr('New Window'), - UI.PixmapCache.getIcon("newWindow.png"), + UI.PixmapCache.getIcon("newWindow"), self.tr('New &Window'), 0, 0, self, 'iconEditor_file_new_window') self.newWindowAct.setStatusTip(self.tr( @@ -221,7 +221,7 @@ self.openAct = E5Action( self.tr('Open'), - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr('&Open...'), QKeySequence(self.tr("Ctrl+O", "File|Open")), 0, self, 'iconEditor_file_open') @@ -236,7 +236,7 @@ self.saveAct = E5Action( self.tr('Save'), - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr('&Save'), QKeySequence(self.tr("Ctrl+S", "File|Save")), 0, self, 'iconEditor_file_save') @@ -250,7 +250,7 @@ self.saveAsAct = E5Action( self.tr('Save As'), - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr('Save &As...'), QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")), 0, self, 'iconEditor_file_save_as') @@ -265,7 +265,7 @@ self.closeAct = E5Action( self.tr('Close'), - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr('&Close'), QKeySequence(self.tr("Ctrl+W", "File|Close")), 0, self, 'iconEditor_file_close') @@ -306,7 +306,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, 'iconEditor_file_quit') @@ -325,7 +325,7 @@ """ self.undoAct = E5Action( self.tr('Undo'), - UI.PixmapCache.getIcon("editUndo.png"), + UI.PixmapCache.getIcon("editUndo"), self.tr('&Undo'), QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")), QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")), @@ -340,7 +340,7 @@ self.redoAct = E5Action( self.tr('Redo'), - UI.PixmapCache.getIcon("editRedo.png"), + UI.PixmapCache.getIcon("editRedo"), self.tr('&Redo'), QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")), 0, self, 'iconEditor_edit_redo') @@ -354,7 +354,7 @@ self.cutAct = E5Action( self.tr('Cut'), - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr('Cu&t'), QKeySequence(self.tr("Ctrl+X", "Edit|Cut")), QKeySequence(self.tr("Shift+Del", "Edit|Cut")), @@ -369,7 +369,7 @@ self.copyAct = E5Action( self.tr('Copy'), - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr('&Copy'), QKeySequence(self.tr("Ctrl+C", "Edit|Copy")), QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")), @@ -384,7 +384,7 @@ self.pasteAct = E5Action( self.tr('Paste'), - UI.PixmapCache.getIcon("editPaste.png"), + UI.PixmapCache.getIcon("editPaste"), self.tr('&Paste'), QKeySequence(self.tr("Ctrl+V", "Edit|Paste")), QKeySequence(self.tr("Shift+Ins", "Edit|Paste")), @@ -412,7 +412,7 @@ self.deleteAct = E5Action( self.tr('Clear'), - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete"), self.tr('Cl&ear'), QKeySequence(self.tr("Alt+Shift+C", "Edit|Clear")), 0, @@ -443,7 +443,7 @@ self.resizeAct = E5Action( self.tr('Change Size'), - UI.PixmapCache.getIcon("transformResize.png"), + UI.PixmapCache.getIcon("transformResize"), self.tr('Change Si&ze...'), 0, 0, self, 'iconEditor_edit_change_size') @@ -457,7 +457,7 @@ self.grayscaleAct = E5Action( self.tr('Grayscale'), - UI.PixmapCache.getIcon("grayscale.png"), + UI.PixmapCache.getIcon("grayscale"), self.tr('&Grayscale'), 0, 0, self, 'iconEditor_edit_grayscale') @@ -494,7 +494,7 @@ """ self.zoomInAct = E5Action( self.tr('Zoom in'), - UI.PixmapCache.getIcon("zoomIn.png"), + UI.PixmapCache.getIcon("zoomIn"), self.tr('Zoom &in'), QKeySequence(self.tr("Ctrl++", "View|Zoom in")), 0, self, 'iconEditor_view_zoom_in') @@ -508,7 +508,7 @@ self.zoomOutAct = E5Action( self.tr('Zoom out'), - UI.PixmapCache.getIcon("zoomOut.png"), + UI.PixmapCache.getIcon("zoomOut"), self.tr('Zoom &out'), QKeySequence(self.tr("Ctrl+-", "View|Zoom out")), 0, self, 'iconEditor_view_zoom_out') @@ -522,7 +522,7 @@ self.zoomResetAct = E5Action( self.tr('Zoom reset'), - UI.PixmapCache.getIcon("zoomReset.png"), + UI.PixmapCache.getIcon("zoomReset"), self.tr('Zoom &reset'), QKeySequence(self.tr("Ctrl+0", "View|Zoom reset")), 0, self, 'iconEditor_view_zoom_reset') @@ -538,7 +538,7 @@ self.showGridAct = E5Action( self.tr('Show Grid'), - UI.PixmapCache.getIcon("grid.png"), + UI.PixmapCache.getIcon("grid"), self.tr('Show &Grid'), 0, 0, self, 'iconEditor_view_show_grid') @@ -565,7 +565,7 @@ self.drawPencilAct = E5Action( self.tr('Freehand'), - UI.PixmapCache.getIcon("drawBrush.png"), + UI.PixmapCache.getIcon("drawBrush"), self.tr('&Freehand'), 0, 0, self.drawingActGrp, 'iconEditor_tools_pencil') @@ -580,7 +580,7 @@ self.drawColorPickerAct = E5Action( self.tr('Color Picker'), - UI.PixmapCache.getIcon("colorPicker.png"), + UI.PixmapCache.getIcon("colorPicker"), self.tr('&Color Picker'), 0, 0, self.drawingActGrp, 'iconEditor_tools_color_picker') @@ -597,7 +597,7 @@ self.drawRectangleAct = E5Action( self.tr('Rectangle'), - UI.PixmapCache.getIcon("drawRectangle.png"), + UI.PixmapCache.getIcon("drawRectangle"), self.tr('&Rectangle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_rectangle') @@ -612,7 +612,7 @@ self.drawFilledRectangleAct = E5Action( self.tr('Filled Rectangle'), - UI.PixmapCache.getIcon("drawRectangleFilled.png"), + UI.PixmapCache.getIcon("drawRectangleFilled"), self.tr('F&illed Rectangle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_rectangle') @@ -628,7 +628,7 @@ self.drawCircleAct = E5Action( self.tr('Circle'), - UI.PixmapCache.getIcon("drawCircle.png"), + UI.PixmapCache.getIcon("drawCircle"), self.tr('Circle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_circle') @@ -643,7 +643,7 @@ self.drawFilledCircleAct = E5Action( self.tr('Filled Circle'), - UI.PixmapCache.getIcon("drawCircleFilled.png"), + UI.PixmapCache.getIcon("drawCircleFilled"), self.tr('Fille&d Circle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_circle') @@ -659,7 +659,7 @@ self.drawEllipseAct = E5Action( self.tr('Ellipse'), - UI.PixmapCache.getIcon("drawEllipse.png"), + UI.PixmapCache.getIcon("drawEllipse"), self.tr('&Ellipse'), 0, 0, self.drawingActGrp, 'iconEditor_tools_ellipse') @@ -674,7 +674,7 @@ self.drawFilledEllipseAct = E5Action( self.tr('Filled Ellipse'), - UI.PixmapCache.getIcon("drawEllipseFilled.png"), + UI.PixmapCache.getIcon("drawEllipseFilled"), self.tr('Fille&d Elli&pse'), 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_ellipse') @@ -690,7 +690,7 @@ self.drawFloodFillAct = E5Action( self.tr('Flood Fill'), - UI.PixmapCache.getIcon("drawFill.png"), + UI.PixmapCache.getIcon("drawFill"), self.tr('Fl&ood Fill'), 0, 0, self.drawingActGrp, 'iconEditor_tools_flood_fill') @@ -706,7 +706,7 @@ self.drawLineAct = E5Action( self.tr('Line'), - UI.PixmapCache.getIcon("drawLine.png"), + UI.PixmapCache.getIcon("drawLine"), self.tr('&Line'), 0, 0, self.drawingActGrp, 'iconEditor_tools_line') @@ -721,7 +721,7 @@ self.drawEraserAct = E5Action( self.tr('Eraser (Transparent)'), - UI.PixmapCache.getIcon("drawEraser.png"), + UI.PixmapCache.getIcon("drawEraser"), self.tr('Eraser (&Transparent)'), 0, 0, self.drawingActGrp, 'iconEditor_tools_eraser') @@ -736,7 +736,7 @@ self.drawRectangleSelectionAct = E5Action( self.tr('Rectangular Selection'), - UI.PixmapCache.getIcon("selectRectangle.png"), + UI.PixmapCache.getIcon("selectRectangle"), self.tr('Rect&angular Selection'), 0, 0, self.drawingActGrp, 'iconEditor_tools_selection_rectangle') @@ -753,7 +753,7 @@ self.drawCircleSelectionAct = E5Action( self.tr('Circular Selection'), - UI.PixmapCache.getIcon("selectCircle.png"), + UI.PixmapCache.getIcon("selectCircle"), self.tr('Rect&angular Selection'), 0, 0, self.drawingActGrp, 'iconEditor_tools_selection_circle') @@ -801,7 +801,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, 'iconEditor_help_whats_this') @@ -971,9 +971,9 @@ self.__updatePosition(0, 0) self.__zoomWidget = E5ZoomWidget( - UI.PixmapCache.getPixmap("zoomOut.png"), - UI.PixmapCache.getPixmap("zoomIn.png"), - UI.PixmapCache.getPixmap("zoomReset.png"), self) + UI.PixmapCache.getPixmap("zoomOut"), + UI.PixmapCache.getPixmap("zoomIn"), + UI.PixmapCache.getPixmap("zoomReset"), self) self.__zoomWidget.setMinimum(IconEditorGrid.ZoomMinimum) self.__zoomWidget.setMaximum(IconEditorGrid.ZoomMaximum) self.__zoomWidget.setDefault(IconEditorGrid.ZoomDefault)