Sun, 12 Apr 2020 19:07:49 +0200
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
--- a/eric6/Cooperation/ChatWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Cooperation/ChatWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -59,13 +59,13 @@ self.setupUi(self) self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditDisconnected.png")) + UI.PixmapCache.getIcon("sharedEditDisconnected")) self.startEditButton.setIcon( - UI.PixmapCache.getIcon("sharedEditStart.png")) + UI.PixmapCache.getIcon("sharedEditStart")) self.sendEditButton.setIcon( - UI.PixmapCache.getIcon("sharedEditSend.png")) + UI.PixmapCache.getIcon("sharedEditSend")) self.cancelEditButton.setIcon( - UI.PixmapCache.getIcon("sharedEditCancel.png")) + UI.PixmapCache.getIcon("sharedEditCancel")) self.__ui = ui self.__client = CooperationClient(self) @@ -177,7 +177,7 @@ QListWidgetItem( UI.PixmapCache.getIcon( - "chatUser{0}.png".format(1 + self.usersList.count() % 6)), + "chatUser{0}".format(1 + self.usersList.count() % 6)), nick, self.usersList) if not self.__connected: @@ -185,7 +185,7 @@ if not self.isVisible(): self.__ui.showNotification( - UI.PixmapCache.getPixmap("cooperation48.png"), + UI.PixmapCache.getPixmap("cooperation48"), self.tr("New User"), self.tr("{0} has joined.") .format(nick)) @@ -216,7 +216,7 @@ if not self.isVisible(): self.__ui.showNotification( - UI.PixmapCache.getPixmap("cooperation48.png"), + UI.PixmapCache.getPixmap("cooperation48"), self.tr("User Left"), self.tr("{0} has left.") .format(nick)) @@ -239,7 +239,7 @@ if not self.isVisible(): self.__ui.showNotification( - UI.PixmapCache.getPixmap("cooperation48.png"), + UI.PixmapCache.getPixmap("cooperation48"), self.tr("Message from <{0}>").format(from_), message) @pyqtSlot(str) @@ -417,10 +417,10 @@ """ if checked: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditConnected.png")) + UI.PixmapCache.getIcon("sharedEditConnected")) else: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditDisconnected.png")) + UI.PixmapCache.getIcon("sharedEditDisconnected")) self.startEditButton.setEnabled(checked) self.shareEditor.emit(checked) @@ -477,10 +477,10 @@ self.shareButton.setChecked(sharing) if sharing: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditConnected.png")) + UI.PixmapCache.getIcon("sharedEditConnected")) else: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditDisconnected.png")) + UI.PixmapCache.getIcon("sharedEditDisconnected")) self.startEditButton.setChecked(editing) self.shareButton.setEnabled(shareable and not editing) @@ -495,22 +495,22 @@ """ self.__chatMenu = QMenu(self) self.__copyChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy"), self.__copyChat) self.__chatMenu.addSeparator() self.__cutAllChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr("Cut all"), self.__cutAllChat) self.__copyAllChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy all"), self.__copyAllChat) self.__chatMenu.addSeparator() self.__clearChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete"), self.tr("Clear"), self.__clearChat) self.__chatMenu.addSeparator() self.__saveChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr("Save"), self.__saveChat) self.on_chatEdit_copyAvailable(False) @@ -617,13 +617,13 @@ """ self.__usersMenu = QMenu(self) self.__kickUserAct = self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatKickUser.png"), + UI.PixmapCache.getIcon("chatKickUser"), self.tr("Kick User"), self.__kickUser) self.__banUserAct = self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatBanUser.png"), + UI.PixmapCache.getIcon("chatBanUser"), self.tr("Ban User"), self.__banUser) self.__banKickUserAct = self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatBanKickUser.png"), + UI.PixmapCache.getIcon("chatBanKickUser"), self.tr("Ban and Kick User"), self.__banKickUser) @pyqtSlot(QPoint)
--- a/eric6/Debugger/CallTraceViewer.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Debugger/CallTraceViewer.py Sun Apr 12 19:07:49 2020 +0200 @@ -43,16 +43,16 @@ self.__dbs = debugServer self.startTraceButton.setIcon( - UI.PixmapCache.getIcon("callTraceStart.png")) + UI.PixmapCache.getIcon("callTraceStart")) self.stopTraceButton.setIcon( - UI.PixmapCache.getIcon("callTraceStop.png")) - self.resizeButton.setIcon(UI.PixmapCache.getIcon("resizeColumns.png")) - self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete.png")) - self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSave.png")) + UI.PixmapCache.getIcon("callTraceStop")) + self.resizeButton.setIcon(UI.PixmapCache.getIcon("resizeColumns")) + self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete")) + self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSave")) self.__headerItem = QTreeWidgetItem( ["", self.tr("From"), self.tr("To")]) - self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("callReturn.png")) + self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("callReturn")) self.callTrace.setHeaderItem(self.__headerItem) self.__callStack = [] @@ -242,9 +242,9 @@ @param toFunction name of the target function (string) """ if isCall: - icon = UI.PixmapCache.getIcon("forward.png") + icon = UI.PixmapCache.getIcon("forward") else: - icon = UI.PixmapCache.getIcon("back.png") + icon = UI.PixmapCache.getIcon("back") parentItem = ( self.__callStack[-1] if self.__callStack else self.callTrace)
--- a/eric6/Debugger/DebugUI.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Debugger/DebugUI.py Sun Apr 12 19:07:49 2020 +0200 @@ -174,7 +174,7 @@ self.runAct = E5Action( self.tr('Run Script'), - UI.PixmapCache.getIcon("runScript.png"), + UI.PixmapCache.getIcon("runScript"), self.tr('&Run Script...'), Qt.Key_F2, 0, self, 'dbg_run_script') self.runAct.setStatusTip(self.tr('Run the current Script')) @@ -189,7 +189,7 @@ self.runProjectAct = E5Action( self.tr('Run Project'), - UI.PixmapCache.getIcon("runProject.png"), + UI.PixmapCache.getIcon("runProject"), self.tr('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self, 'dbg_run_project') self.runProjectAct.setStatusTip(self.tr('Run the current Project')) @@ -205,7 +205,7 @@ self.coverageAct = E5Action( self.tr('Coverage run of Script'), - UI.PixmapCache.getIcon("coverageScript.png"), + UI.PixmapCache.getIcon("coverageScript"), self.tr('Coverage run of Script...'), 0, 0, self, 'dbg_coverage_script') self.coverageAct.setStatusTip( @@ -221,7 +221,7 @@ self.coverageProjectAct = E5Action( self.tr('Coverage run of Project'), - UI.PixmapCache.getIcon("coverageProject.png"), + UI.PixmapCache.getIcon("coverageProject"), self.tr('Coverage run of Project...'), 0, 0, self, 'dbg_coverage_project') self.coverageProjectAct.setStatusTip( @@ -238,7 +238,7 @@ self.profileAct = E5Action( self.tr('Profile Script'), - UI.PixmapCache.getIcon("profileScript.png"), + UI.PixmapCache.getIcon("profileScript"), self.tr('Profile Script...'), 0, 0, self, 'dbg_profile_script') self.profileAct.setStatusTip(self.tr('Profile the current Script')) self.profileAct.setWhatsThis(self.tr( @@ -251,7 +251,7 @@ self.profileProjectAct = E5Action( self.tr('Profile Project'), - UI.PixmapCache.getIcon("profileProject.png"), + UI.PixmapCache.getIcon("profileProject"), self.tr('Profile Project...'), 0, 0, self, 'dbg_profile_project') self.profileProjectAct.setStatusTip( @@ -267,7 +267,7 @@ self.debugAct = E5Action( self.tr('Debug Script'), - UI.PixmapCache.getIcon("debugScript.png"), + UI.PixmapCache.getIcon("debugScript"), self.tr('&Debug Script...'), Qt.Key_F5, 0, self, 'dbg_debug_script') self.debugAct.setStatusTip(self.tr('Debug the current Script')) @@ -283,7 +283,7 @@ self.debugProjectAct = E5Action( self.tr('Debug Project'), - UI.PixmapCache.getIcon("debugProject.png"), + UI.PixmapCache.getIcon("debugProject"), self.tr('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self, 'dbg_debug_project') self.debugProjectAct.setStatusTip(self.tr( @@ -300,7 +300,7 @@ self.restartAct = E5Action( self.tr('Restart'), - UI.PixmapCache.getIcon("debugRestart.png"), + UI.PixmapCache.getIcon("debugRestart"), self.tr('Restart'), Qt.Key_F4, 0, self, 'dbg_restart_script') self.restartAct.setStatusTip(self.tr( 'Restart the last debugged script')) @@ -316,7 +316,7 @@ self.stopAct = E5Action( self.tr('Stop'), - UI.PixmapCache.getIcon("stopScript.png"), + UI.PixmapCache.getIcon("stopScript"), self.tr('Stop'), Qt.SHIFT + Qt.Key_F10, 0, self, 'dbg_stop_script') self.stopAct.setStatusTip(self.tr("""Stop the running script.""")) @@ -331,7 +331,7 @@ act = E5Action( self.tr('Continue'), - UI.PixmapCache.getIcon("continue.png"), + UI.PixmapCache.getIcon("continue"), self.tr('&Continue'), Qt.Key_F6, 0, self.debugActGrp, 'dbg_continue') act.setStatusTip( @@ -347,7 +347,7 @@ act = E5Action( self.tr('Continue to Cursor'), - UI.PixmapCache.getIcon("continueToCursor.png"), + UI.PixmapCache.getIcon("continueToCursor"), self.tr('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0, self.debugActGrp, 'dbg_continue_to_cursor') act.setStatusTip(self.tr( @@ -363,7 +363,7 @@ act = E5Action( self.tr('Move Instruction Pointer to Cursor'), - UI.PixmapCache.getIcon("moveInstructionPointer.png"), + UI.PixmapCache.getIcon("moveInstructionPointer"), self.tr('&Jump To Cursor'), Qt.Key_F12, 0, self.debugActGrp, 'dbg_jump_to_cursor') act.setStatusTip(self.tr( @@ -383,7 +383,7 @@ act = E5Action( self.tr('Single Step'), - UI.PixmapCache.getIcon("step.png"), + UI.PixmapCache.getIcon("step"), self.tr('Sin&gle Step'), Qt.Key_F7, 0, self.debugActGrp, 'dbg_single_step') act.setStatusTip(self.tr('Execute a single Python statement')) @@ -399,7 +399,7 @@ act = E5Action( self.tr('Step Over'), - UI.PixmapCache.getIcon("stepOver.png"), + UI.PixmapCache.getIcon("stepOver"), self.tr('Step &Over'), Qt.Key_F8, 0, self.debugActGrp, 'dbg_step_over') act.setStatusTip(self.tr( @@ -418,7 +418,7 @@ act = E5Action( self.tr('Step Out'), - UI.PixmapCache.getIcon("stepOut.png"), + UI.PixmapCache.getIcon("stepOut"), self.tr('Step Ou&t'), Qt.Key_F9, 0, self.debugActGrp, 'dbg_step_out') act.setStatusTip(self.tr( @@ -437,7 +437,7 @@ act = E5Action( self.tr('Stop'), - UI.PixmapCache.getIcon("stepQuit.png"), + UI.PixmapCache.getIcon("stepQuit"), self.tr('&Stop'), Qt.Key_F10, 0, self.debugActGrp, 'dbg_stop') act.setStatusTip(self.tr('Stop debugging')) @@ -502,7 +502,7 @@ self.dbgToggleBpAct = E5Action( self.tr('Toggle Breakpoint'), - UI.PixmapCache.getIcon("breakpointToggle.png"), + UI.PixmapCache.getIcon("breakpointToggle"), self.tr('Toggle Breakpoint'), QKeySequence(self.tr("Shift+F11", "Debug|Toggle Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_toggle_breakpoint') @@ -517,7 +517,7 @@ self.dbgEditBpAct = E5Action( self.tr('Edit Breakpoint'), - UI.PixmapCache.getIcon("cBreakpointToggle.png"), + UI.PixmapCache.getIcon("cBreakpointToggle"), self.tr('Edit Breakpoint...'), QKeySequence(self.tr("Shift+F12", "Debug|Edit Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_edit_breakpoint') @@ -532,7 +532,7 @@ self.dbgNextBpAct = E5Action( self.tr('Next Breakpoint'), - UI.PixmapCache.getIcon("breakpointNext.png"), + UI.PixmapCache.getIcon("breakpointNext"), self.tr('Next Breakpoint'), QKeySequence( self.tr("Ctrl+Shift+PgDown", "Debug|Next Breakpoint")), 0, @@ -547,7 +547,7 @@ self.dbgPrevBpAct = E5Action( self.tr('Previous Breakpoint'), - UI.PixmapCache.getIcon("breakpointPrevious.png"), + UI.PixmapCache.getIcon("breakpointPrevious"), self.tr('Previous Breakpoint'), QKeySequence( self.tr("Ctrl+Shift+PgUp", "Debug|Previous Breakpoint")), @@ -1069,7 +1069,7 @@ os.path.basename(self.ui.currentProg), status, info) self.ui.showNotification( - UI.PixmapCache.getPixmap("debug48.png"), + UI.PixmapCache.getPixmap("debug48"), self.tr("Program terminated"), msg) else: if self.ui.currentProg is None:
--- a/eric6/Debugger/DebugViewer.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Debugger/DebugViewer.py Sun Apr 12 19:07:49 2020 +0200 @@ -62,7 +62,7 @@ self.debugServer = debugServer self.debugUI = None - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__mainLayout = QVBoxLayout() self.__mainLayout.setContentsMargins(0, 0, 0, 0) @@ -105,7 +105,7 @@ index = self.__tabWidget.addTab( self.glvWidget, - UI.PixmapCache.getIcon("globalVariables.png"), '') + UI.PixmapCache.getIcon("globalVariables"), '') self.__tabWidget.setTabToolTip(index, self.globalsViewer.windowTitle()) self.setGlobalsFilterButton.clicked.connect( @@ -159,7 +159,7 @@ index = self.__tabWidget.addTab( self.lvWidget, - UI.PixmapCache.getIcon("localVariables.png"), '') + UI.PixmapCache.getIcon("localVariables"), '') self.__tabWidget.setTabToolTip(index, self.localsViewer.windowTitle()) self.sourceButton.clicked.connect(self.__showSource) @@ -189,7 +189,7 @@ self.callTraceViewer = CallTraceViewer(self.debugServer) index = self.__tabWidget.addTab( self.callTraceViewer, - UI.PixmapCache.getIcon("callTrace.png"), "") + UI.PixmapCache.getIcon("callTrace"), "") self.__tabWidget.setTabToolTip( index, self.callTraceViewer.windowTitle()) self.callTraceViewer.sourceFile.connect(self.sourceFile) @@ -200,7 +200,7 @@ self.breakpointViewer.setModel(self.debugServer.getBreakPointModel()) index = self.__tabWidget.addTab( self.breakpointViewer, - UI.PixmapCache.getIcon("breakpoints.png"), '') + UI.PixmapCache.getIcon("breakpoints"), '') self.__tabWidget.setTabToolTip( index, self.breakpointViewer.windowTitle()) self.breakpointViewer.sourceFile.connect(self.sourceFile) @@ -211,7 +211,7 @@ self.watchpointViewer.setModel(self.debugServer.getWatchPointModel()) index = self.__tabWidget.addTab( self.watchpointViewer, - UI.PixmapCache.getIcon("watchpoints.png"), '') + UI.PixmapCache.getIcon("watchpoints"), '') self.__tabWidget.setTabToolTip( index, self.watchpointViewer.windowTitle()) @@ -220,7 +220,7 @@ self.exceptionLogger = ExceptionLogger() index = self.__tabWidget.addTab( self.exceptionLogger, - UI.PixmapCache.getIcon("exceptions.png"), '') + UI.PixmapCache.getIcon("exceptions"), '') self.__tabWidget.setTabToolTip( index, self.exceptionLogger.windowTitle())
--- a/eric6/E5Gui/E5LineEdit.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Gui/E5LineEdit.py Sun Apr 12 19:07:49 2020 +0200 @@ -260,7 +260,7 @@ from E5Gui.E5LineEditButton import E5LineEditButton self.__clearButton = E5LineEditButton(self) - self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) + self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft")) self.addWidget(self.__clearButton, side) self.__clearButton.setVisible(False)
--- a/eric6/E5Gui/E5ModelMenu.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Gui/E5ModelMenu.py Sun Apr 12 19:07:49 2020 +0200 @@ -206,7 +206,7 @@ icon = parent.data(Qt.DecorationRole) if icon == NotImplemented or icon is None: - icon = UI.PixmapCache.getIcon("defaultIcon.png") + icon = UI.PixmapCache.getIcon("defaultIcon") modelMenu.setIcon(icon) if parentMenu is not None: parentMenu.addMenu(modelMenu).setData(v) @@ -246,7 +246,7 @@ """ icon = idx.data(Qt.DecorationRole) if icon == NotImplemented or icon is None: - icon = UI.PixmapCache.getIcon("defaultIcon.png") + icon = UI.PixmapCache.getIcon("defaultIcon") action = self.makeAction(icon, idx.data(), self) action.setStatusTip(idx.data(self.__statusBarTextRole))
--- a/eric6/E5Gui/E5PathPicker.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Gui/E5PathPicker.py Sun Apr 12 19:07:49 2020 +0200 @@ -101,7 +101,7 @@ self.__button = QToolButton(self) self.__button.setToolButtonStyle(Qt.ToolButtonIconOnly) - self.__button.setIcon(UI.PixmapCache.getIcon("open.png")) + self.__button.setIcon(UI.PixmapCache.getIcon("open")) self.__layout.addWidget(self._editor) self.__layout.addWidget(self.__button)
--- a/eric6/E5Gui/E5SideBar.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Gui/E5SideBar.py Sun Apr 12 19:07:49 2020 +0200 @@ -54,7 +54,7 @@ self.__autoHideButton = QToolButton() self.__autoHideButton.setCheckable(True) self.__autoHideButton.setIcon( - UI.PixmapCache.getIcon("autoHideOff.png")) + UI.PixmapCache.getIcon("autoHideOff")) self.__autoHideButton.setChecked(True) self.__autoHideButton.setToolTip( self.tr("Deselect to activate automatic collapsing")) @@ -647,10 +647,10 @@ self.__autoHide = not checked if self.__autoHide: self.__autoHideButton.setIcon( - UI.PixmapCache.getIcon("autoHideOn.png")) + UI.PixmapCache.getIcon("autoHideOn")) else: self.__autoHideButton.setIcon( - UI.PixmapCache.getIcon("autoHideOff.png")) + UI.PixmapCache.getIcon("autoHideOff")) def __appFocusChanged(self, old, now): """
--- a/eric6/E5Gui/E5TextEditSearchWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Gui/E5TextEditSearchWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -119,14 +119,14 @@ self.findPrevButton.setObjectName("findPrevButton") self.findPrevButton.setToolTip(self.tr( "Press to find the previous occurrence")) - self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) + self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) self.horizontalLayout3.addWidget(self.findPrevButton) self.findNextButton = QToolButton(self) self.findNextButton.setObjectName("findNextButton") self.findNextButton.setToolTip(self.tr( "Press to find the next occurrence")) - self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) self.horizontalLayout3.addWidget(self.findNextButton) self.horizontalLayout2.addLayout(self.horizontalLayout3)
--- a/eric6/E5Gui/E5ToolBarDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Gui/E5ToolBarDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -72,10 +72,10 @@ self.__toolBarItemToWidgetActionID = {} # maps toolbar item IDs to widget action IDs - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) - self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) - self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) + self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) + self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) self.__restoreDefaultsButton = self.buttonBox.button( QDialogButtonBox.RestoreDefaults)
--- a/eric6/E5Network/E5NetworkIcon.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Network/E5NetworkIcon.py Sun Apr 12 19:07:49 2020 +0200 @@ -54,9 +54,9 @@ @type bool """ if online: - self.setPixmap(UI.PixmapCache.getPixmap("network-online.png")) + self.setPixmap(UI.PixmapCache.getPixmap("network-online")) else: - self.setPixmap(UI.PixmapCache.getPixmap("network-offline.png")) + self.setPixmap(UI.PixmapCache.getPixmap("network-offline")) tooltip = self.tr("<p>Shows the network status<br/><br/>" "<b>Network:</b> {0}</p>")
--- a/eric6/E5Network/E5SslCertificateSelectionDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -43,7 +43,7 @@ self.setupUi(self) self.viewButton.setIcon( - UI.PixmapCache.getIcon("certificates.png")) + UI.PixmapCache.getIcon("certificates")) self.buttonBox.button(QDialogButtonBox.OK).setEnabled(False) self.viewButton.setEnabled(False)
--- a/eric6/E5Network/E5SslCertificatesDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Network/E5SslCertificatesDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -45,22 +45,22 @@ self.setupUi(self) self.serversViewButton.setIcon( - UI.PixmapCache.getIcon("certificates.png")) + UI.PixmapCache.getIcon("certificates")) self.serversDeleteButton.setIcon( - UI.PixmapCache.getIcon("certificateDelete.png")) + UI.PixmapCache.getIcon("certificateDelete")) self.serversExportButton.setIcon( - UI.PixmapCache.getIcon("certificateExport.png")) + UI.PixmapCache.getIcon("certificateExport")) self.serversImportButton.setIcon( - UI.PixmapCache.getIcon("certificateImport.png")) + UI.PixmapCache.getIcon("certificateImport")) self.caViewButton.setIcon( - UI.PixmapCache.getIcon("certificates.png")) + UI.PixmapCache.getIcon("certificates")) self.caDeleteButton.setIcon( - UI.PixmapCache.getIcon("certificateDelete.png")) + UI.PixmapCache.getIcon("certificateDelete")) self.caExportButton.setIcon( - UI.PixmapCache.getIcon("certificateExport.png")) + UI.PixmapCache.getIcon("certificateExport")) self.caImportButton.setIcon( - UI.PixmapCache.getIcon("certificateImport.png")) + UI.PixmapCache.getIcon("certificateImport")) self.__populateServerCertificatesTree() self.__populateCaCertificatesTree()
--- a/eric6/E5Network/E5SslInfoWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/E5Network/E5SslInfoWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -65,7 +65,7 @@ if cert.isNull(): label.setText(self.tr( "Warning: this site is NOT carrying a certificate.")) - imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32.png")) + imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32")) else: valid = not cert.isBlacklisted() if valid: @@ -76,12 +76,12 @@ " and has been verified by:\n{0}").format( Utilities.decodeString(txt))) imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) else: label.setText(self.tr( "The certificate for this site is NOT valid.")) imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) layout.addWidget(label, rows, 1) rows += 1 @@ -117,7 +117,7 @@ 'Your connection to "{0}" is NOT encrypted.\n').format( self.__url.host())) layout.addWidget(label, rows, 1) - imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32.png")) + imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32")) rows += 1 else: label = QLabel(self) @@ -131,37 +131,37 @@ if proto == QSsl.SslV3: sslVersion = "SSL 3.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) elif proto == QSsl.TlsV1SslV3: sslVersion = "TLS 1.0/SSL 3.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) elif proto == QSsl.SslV2: sslVersion = "SSL 2.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) else: sslVersion = self.tr("unknown") imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) if proto == QSsl.TlsV1_0: sslVersion = "TLS 1.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) elif proto == QSsl.TlsV1_1: sslVersion = "TLS 1.1" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) elif proto == QSsl.TlsV1_2: sslVersion = "TLS 1.2" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) try: # Qt 5.12 and newer if proto == QSsl.TlsV1_2: sslVersion = "TLS 1.2" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) except AttributeError: pass rows += 1
--- a/eric6/Graphics/PixmapDiagram.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Graphics/PixmapDiagram.py Sun Apr 12 19:07:49 2020 +0200 @@ -67,9 +67,9 @@ self.setCentralWidget(self.pixmapView) 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.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( PixmapDiagram.ZoomLevels, PixmapDiagram.ZoomLevelDefault) @@ -92,17 +92,17 @@ Private method to initialize the view actions. """ self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr("Close"), self) self.closeAct.triggered.connect(self.close) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr("Print"), self) self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self) self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
--- a/eric6/Graphics/SvgDiagram.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Graphics/SvgDiagram.py Sun Apr 12 19:07:49 2020 +0200 @@ -63,9 +63,9 @@ self.setCentralWidget(self.svgView) 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.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( SvgDiagram.ZoomLevels, SvgDiagram.ZoomLevelDefault) @@ -90,17 +90,17 @@ Private method to initialize the view actions. """ self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr("Close"), self) self.closeAct.triggered.connect(self.close) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr("Print"), self) self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self) self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
--- a/eric6/Graphics/UMLDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Graphics/UMLDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -74,37 +74,37 @@ Private slot to initialize the actions. """ self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr("Close"), self) self.closeAct.triggered.connect(self.close) self.openAct = QAction( - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr("Load"), self) self.openAct.triggered.connect(self.load) self.saveAct = QAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr("Save"), self) self.saveAct.triggered.connect(self.__save) self.saveAsAct = QAction( - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr("Save As..."), self) self.saveAsAct.triggered.connect(self.__saveAs) self.saveImageAct = QAction( - UI.PixmapCache.getIcon("fileSavePixmap.png"), + UI.PixmapCache.getIcon("fileSavePixmap"), self.tr("Save as Image"), self) self.saveImageAct.triggered.connect(self.umlView.saveImage) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr("Print"), self) self.printAct.triggered.connect(self.umlView.printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self) self.printPreviewAct.triggered.connect( self.umlView.printPreviewDiagram)
--- a/eric6/Graphics/UMLGraphicsView.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Graphics/UMLGraphicsView.py Sun Apr 12 19:07:49 2020 +0200 @@ -54,9 +54,9 @@ self.deltaSize = 100.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) parent.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( E5GraphicsView.ZoomLevels, E5GraphicsView.ZoomLevelDefault) @@ -77,85 +77,85 @@ self.alignMapper.mapped[int].connect(self.__alignShapes) self.deleteShapeAct = QAction( - UI.PixmapCache.getIcon("deleteShape.png"), + UI.PixmapCache.getIcon("deleteShape"), self.tr("Delete shapes"), self) self.deleteShapeAct.triggered.connect(self.__deleteShape) self.incWidthAct = QAction( - UI.PixmapCache.getIcon("sceneWidthInc.png"), + UI.PixmapCache.getIcon("sceneWidthInc"), self.tr("Increase width by {0} points").format( self.deltaSize), self) self.incWidthAct.triggered.connect(self.__incWidth) self.incHeightAct = QAction( - UI.PixmapCache.getIcon("sceneHeightInc.png"), + UI.PixmapCache.getIcon("sceneHeightInc"), self.tr("Increase height by {0} points").format( self.deltaSize), self) self.incHeightAct.triggered.connect(self.__incHeight) self.decWidthAct = QAction( - UI.PixmapCache.getIcon("sceneWidthDec.png"), + UI.PixmapCache.getIcon("sceneWidthDec"), self.tr("Decrease width by {0} points").format( self.deltaSize), self) self.decWidthAct.triggered.connect(self.__decWidth) self.decHeightAct = QAction( - UI.PixmapCache.getIcon("sceneHeightDec.png"), + UI.PixmapCache.getIcon("sceneHeightDec"), self.tr("Decrease height by {0} points").format( self.deltaSize), self) self.decHeightAct.triggered.connect(self.__decHeight) self.setSizeAct = QAction( - UI.PixmapCache.getIcon("sceneSize.png"), + UI.PixmapCache.getIcon("sceneSize"), self.tr("Set size"), self) self.setSizeAct.triggered.connect(self.__setSize) self.rescanAct = QAction( - UI.PixmapCache.getIcon("rescan.png"), + UI.PixmapCache.getIcon("rescan"), self.tr("Re-Scan"), self) self.rescanAct.triggered.connect(self.__rescan) self.relayoutAct = QAction( - UI.PixmapCache.getIcon("relayout.png"), + UI.PixmapCache.getIcon("relayout"), self.tr("Re-Layout"), self) self.relayoutAct.triggered.connect(self.__relayout) self.alignLeftAct = QAction( - UI.PixmapCache.getIcon("shapesAlignLeft.png"), + UI.PixmapCache.getIcon("shapesAlignLeft"), self.tr("Align Left"), self) self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft) self.alignLeftAct.triggered.connect(self.alignMapper.map) self.alignHCenterAct = QAction( - UI.PixmapCache.getIcon("shapesAlignHCenter.png"), + UI.PixmapCache.getIcon("shapesAlignHCenter"), self.tr("Align Center Horizontal"), self) self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter) self.alignHCenterAct.triggered.connect(self.alignMapper.map) self.alignRightAct = QAction( - UI.PixmapCache.getIcon("shapesAlignRight.png"), + UI.PixmapCache.getIcon("shapesAlignRight"), self.tr("Align Right"), self) self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight) self.alignRightAct.triggered.connect(self.alignMapper.map) self.alignTopAct = QAction( - UI.PixmapCache.getIcon("shapesAlignTop.png"), + UI.PixmapCache.getIcon("shapesAlignTop"), self.tr("Align Top"), self) self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop) self.alignTopAct.triggered.connect(self.alignMapper.map) self.alignVCenterAct = QAction( - UI.PixmapCache.getIcon("shapesAlignVCenter.png"), + UI.PixmapCache.getIcon("shapesAlignVCenter"), self.tr("Align Center Vertical"), self) self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter) self.alignVCenterAct.triggered.connect(self.alignMapper.map) self.alignBottomAct = QAction( - UI.PixmapCache.getIcon("shapesAlignBottom.png"), + UI.PixmapCache.getIcon("shapesAlignBottom"), self.tr("Align Bottom"), self) self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom) self.alignBottomAct.triggered.connect(self.alignMapper.map)
--- a/eric6/HexEdit/HexEditGotoWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/HexEdit/HexEditGotoWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -45,7 +45,7 @@ self.__currentFormat = "" - self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) + self.closeButton.setIcon(UI.PixmapCache.getIcon("close")) for dataFormat in formatOrder: formatStr, validator = self.__formatAndValidators[dataFormat]
--- a/eric6/HexEdit/HexEditMainWindow.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/HexEdit/HexEditMainWindow.py Sun Apr 12 19:07:49 2020 +0200 @@ -71,7 +71,7 @@ } self.__fromEric = fromEric - self.setWindowIcon(UI.PixmapCache.getIcon("hexEditor.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("hexEditor")) if not self.__fromEric: self.setStyle(Preferences.getUI("Style"), @@ -158,7 +158,7 @@ """ self.newWindowAct = E5Action( self.tr('New Window'), - UI.PixmapCache.getIcon("newWindow.png"), + UI.PixmapCache.getIcon("newWindow"), self.tr('New &Window'), 0, 0, self, 'hexEditor_file_new_window') self.newWindowAct.setStatusTip(self.tr( @@ -174,7 +174,7 @@ # correct texts will be set later 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, 'hexEditor_file_open') @@ -190,7 +190,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, 'hexEditor_file_save') @@ -204,7 +204,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, 'hexEditor_file_save_as') @@ -234,7 +234,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, 'hexEditor_file_close') @@ -275,7 +275,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, 'hexEditor_file_quit') @@ -294,7 +294,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")), @@ -309,7 +309,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, 'hexEditor_edit_redo') @@ -338,7 +338,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")), @@ -353,7 +353,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")), @@ -368,7 +368,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")), @@ -383,7 +383,7 @@ self.selectAllAct = E5Action( self.tr('Select All'), - UI.PixmapCache.getIcon("editSelectAll.png"), + UI.PixmapCache.getIcon("editSelectAll"), self.tr('&Select All'), QKeySequence(self.tr("Ctrl+A", "Edit|Select All")), 0, @@ -445,7 +445,7 @@ self.searchAct = E5Action( self.tr('Search'), - UI.PixmapCache.getIcon("find.png"), + UI.PixmapCache.getIcon("find"), self.tr('&Search...'), QKeySequence(self.tr("Ctrl+F", "Search|Search")), 0, @@ -461,7 +461,7 @@ self.searchNextAct = E5Action( self.tr('Search next'), - UI.PixmapCache.getIcon("findNext.png"), + UI.PixmapCache.getIcon("findNext"), self.tr('Search &next'), QKeySequence(self.tr("F3", "Search|Search next")), 0, @@ -478,7 +478,7 @@ self.searchPrevAct = E5Action( self.tr('Search previous'), - UI.PixmapCache.getIcon("findPrev.png"), + UI.PixmapCache.getIcon("findPrev"), self.tr('Search &previous'), QKeySequence(self.tr("Shift+F3", "Search|Search previous")), 0, @@ -512,7 +512,7 @@ self.gotoAct = E5Action( self.tr('Goto Offset'), - UI.PixmapCache.getIcon("goto.png"), + UI.PixmapCache.getIcon("goto"), self.tr('&Goto Offset...'), QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+G", "Search|Goto Offset")), @@ -575,7 +575,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, 'hexEditor_help_whats_this') @@ -597,7 +597,7 @@ """ self.prefAct = E5Action( self.tr('Preferences'), - UI.PixmapCache.getIcon("configure.png"), + UI.PixmapCache.getIcon("configure"), self.tr('&Preferences...'), 0, 0, self, 'hexEditor_settings_preferences') self.prefAct.setStatusTip(self.tr(
--- a/eric6/HexEdit/HexEditSearchReplaceWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/HexEdit/HexEditSearchReplaceWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -66,19 +66,19 @@ self.__ui = Ui_HexEditSearchWidget() self.__ui.setupUi(self) - self.__ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) + self.__ui.closeButton.setIcon(UI.PixmapCache.getIcon("close")) self.__ui.findPrevButton.setIcon( - UI.PixmapCache.getIcon("1leftarrow.png")) + UI.PixmapCache.getIcon("1leftarrow")) self.__ui.findNextButton.setIcon( - UI.PixmapCache.getIcon("1rightarrow.png")) + UI.PixmapCache.getIcon("1rightarrow")) if replace: self.__ui.replaceButton.setIcon( - UI.PixmapCache.getIcon("editReplace.png")) + UI.PixmapCache.getIcon("editReplace")) self.__ui.replaceSearchButton.setIcon( - UI.PixmapCache.getIcon("editReplaceSearch.png")) + UI.PixmapCache.getIcon("editReplaceSearch")) self.__ui.replaceAllButton.setIcon( - UI.PixmapCache.getIcon("editReplaceAll.png")) + UI.PixmapCache.getIcon("editReplaceAll")) for dataFormat in formatOrder: formatStr, validator = self.__formatAndValidators[dataFormat]
--- 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)
--- a/eric6/MultiProject/MultiProject.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/MultiProject/MultiProject.py Sun Apr 12 19:07:49 2020 +0200 @@ -702,7 +702,7 @@ act = E5Action( self.tr('New multiproject'), - UI.PixmapCache.getIcon("multiProjectNew.png"), + UI.PixmapCache.getIcon("multiProjectNew"), self.tr('&New...'), 0, 0, self.actGrp1, 'multi_project_new') act.setStatusTip(self.tr('Generate a new multiproject')) @@ -716,7 +716,7 @@ act = E5Action( self.tr('Open multiproject'), - UI.PixmapCache.getIcon("multiProjectOpen.png"), + UI.PixmapCache.getIcon("multiProjectOpen"), self.tr('&Open...'), 0, 0, self.actGrp1, 'multi_project_open') act.setStatusTip(self.tr('Open an existing multiproject')) @@ -729,7 +729,7 @@ self.closeAct = E5Action( self.tr('Close multiproject'), - UI.PixmapCache.getIcon("multiProjectClose.png"), + UI.PixmapCache.getIcon("multiProjectClose"), self.tr('&Close'), 0, 0, self, 'multi_project_close') self.closeAct.setStatusTip(self.tr( 'Close the current multiproject')) @@ -742,7 +742,7 @@ self.saveAct = E5Action( self.tr('Save multiproject'), - UI.PixmapCache.getIcon("multiProjectSave.png"), + UI.PixmapCache.getIcon("multiProjectSave"), self.tr('&Save'), 0, 0, self, 'multi_project_save') self.saveAct.setStatusTip(self.tr('Save the current multiproject')) self.saveAct.setWhatsThis(self.tr( @@ -754,7 +754,7 @@ self.saveasAct = E5Action( self.tr('Save multiproject as'), - UI.PixmapCache.getIcon("multiProjectSaveAs.png"), + UI.PixmapCache.getIcon("multiProjectSaveAs"), self.tr('Save &as...'), 0, 0, self, 'multi_project_save_as') self.saveasAct.setStatusTip(self.tr( @@ -768,7 +768,7 @@ self.addProjectAct = E5Action( self.tr('Add project to multiproject'), - UI.PixmapCache.getIcon("fileProject.png"), + UI.PixmapCache.getIcon("fileProject"), self.tr('Add &project...'), 0, 0, self, 'multi_project_add_project') self.addProjectAct.setStatusTip(self.tr( @@ -783,7 +783,7 @@ self.propsAct = E5Action( self.tr('Multiproject properties'), - UI.PixmapCache.getIcon("multiProjectProps.png"), + UI.PixmapCache.getIcon("multiProjectProps"), self.tr('&Properties...'), 0, 0, self, 'multi_project_properties') self.propsAct.setStatusTip(self.tr(
--- a/eric6/MultiProject/MultiProjectBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/MultiProject/MultiProjectBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -42,7 +42,7 @@ self.multiProject = multiProject self.project = project - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setAlternatingRowColors(True) self.setHeaderHidden(True) self.setItemsExpandable(False) @@ -252,9 +252,9 @@ """ itm.setText(0, project['name']) if project['master']: - itm.setIcon(0, UI.PixmapCache.getIcon("masterProject.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("masterProject")) else: - itm.setIcon(0, UI.PixmapCache.getIcon("empty.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("empty")) itm.setToolTip(0, project['file']) itm.setData(0, MultiProjectBrowser.ProjectFileNameRole, project['file'])
--- 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(
--- a/eric6/Network/IRC/IrcIdentitiesEditDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Network/IRC/IrcIdentitiesEditDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -39,17 +39,17 @@ super(IrcIdentitiesEditDialog, self).__init__(parent) self.setupUi(self) - self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png")) - self.renameButton.setIcon(UI.PixmapCache.getIcon("editRename.png")) - self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.nicknameAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.nicknameDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.addButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy")) + self.renameButton.setIcon(UI.PixmapCache.getIcon("editRename")) + self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.nicknameAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.nicknameDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) self.nicknameDownButton.setIcon( - UI.PixmapCache.getIcon("1downarrow.png")) + UI.PixmapCache.getIcon("1downarrow")) self.showPasswordButton.setIcon( - UI.PixmapCache.getIcon("showPassword.png")) + UI.PixmapCache.getIcon("showPassword")) self.__manager = manager @@ -468,13 +468,13 @@ if checked: self.passwordEdit.setEchoMode(QLineEdit.Normal) self.showPasswordButton.setIcon( - UI.PixmapCache.getIcon("hidePassword.png")) + UI.PixmapCache.getIcon("hidePassword")) self.showPasswordButton.setToolTip( self.tr("Press to hide the password")) else: self.passwordEdit.setEchoMode(QLineEdit.Password) self.showPasswordButton.setIcon( - UI.PixmapCache.getIcon("showPassword.png")) + UI.PixmapCache.getIcon("showPassword")) self.showPasswordButton.setToolTip( self.tr("Press to show the password"))
--- a/eric6/Network/IRC/IrcNetworkEditDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Network/IRC/IrcNetworkEditDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -39,13 +39,13 @@ self.__manager = manager self.editIdentitiesButton.setIcon( - UI.PixmapCache.getIcon("ircConfigure.png")) + UI.PixmapCache.getIcon("ircConfigure")) self.editServerButton.setIcon( - UI.PixmapCache.getIcon("ircConfigure.png")) + UI.PixmapCache.getIcon("ircConfigure")) self.editChannelButton.setIcon( - UI.PixmapCache.getIcon("ircConfigure.png")) - self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + UI.PixmapCache.getIcon("ircConfigure")) + self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus")) self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/eric6/Network/IRC/IrcNetworkWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Network/IRC/IrcNetworkWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -54,10 +54,10 @@ super(IrcNetworkWidget, self).__init__(parent) self.setupUi(self) - self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png")) - self.editButton.setIcon(UI.PixmapCache.getIcon("ircConfigure.png")) - self.joinButton.setIcon(UI.PixmapCache.getIcon("ircJoinChannel.png")) - self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserPresent.png")) + self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect")) + self.editButton.setIcon(UI.PixmapCache.getIcon("ircConfigure")) + self.joinButton.setIcon(UI.PixmapCache.getIcon("ircJoinChannel")) + self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserPresent")) self.joinButton.setEnabled(False) self.nickCombo.setEnabled(False) @@ -191,14 +191,14 @@ # set being away # don't send away, if the status is already set self.sendData.emit("AWAY :" + awayMessage) - self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway.png")) + self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway")) self.__away = True self.away.emit(self.__away) elif not awayMessage and self.__away: # cancel being away self.sendData.emit("AWAY") self.awayButton.setIcon( - UI.PixmapCache.getIcon("ircUserPresent.png")) + UI.PixmapCache.getIcon("ircUserPresent")) self.__away = False self.away.emit(self.__away) @@ -344,12 +344,12 @@ self.__connected = connected if self.__connected: self.connectButton.setIcon( - UI.PixmapCache.getIcon("ircDisconnect.png")) + UI.PixmapCache.getIcon("ircDisconnect")) self.connectButton.setToolTip( self.tr("Press to disconnect from the network")) else: self.connectButton.setIcon( - UI.PixmapCache.getIcon("ircConnect.png")) + UI.PixmapCache.getIcon("ircConnect")) self.connectButton.setToolTip( self.tr("Press to connect to the selected network")) @@ -374,7 +374,7 @@ self.awayButton.setEnabled(registered) if registered: self.awayButton.setIcon( - UI.PixmapCache.getIcon("ircUserPresent.png")) + UI.PixmapCache.getIcon("ircUserPresent")) self.__away = False def __clearMessages(self): @@ -471,22 +471,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.on_messages_copyAvailable(False)
--- a/eric6/Network/IRC/IrcWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Network/IRC/IrcWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -61,7 +61,7 @@ self.__leaveButton = QToolButton(self) self.__leaveButton.setIcon( - UI.PixmapCache.getIcon("ircCloseChannel.png")) + UI.PixmapCache.getIcon("ircCloseChannel")) self.__leaveButton.setToolTip( self.tr("Press to leave the current channel")) self.__leaveButton.clicked.connect(self.__leaveChannel) @@ -113,7 +113,7 @@ self.__prefixRe = re.compile(r""".*\sPREFIX=\((.*)\)([^ ]+).*""") self.__chanTypesRe = re.compile(r""".*\sCHANTYPES=([^ ]+).*""") - ircPic = UI.PixmapCache.getPixmap("irc128.png") + ircPic = UI.PixmapCache.getPixmap("irc128") self.__emptyLabel = QLabel() self.__emptyLabel.setPixmap(ircPic) self.__emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
--- a/eric6/PluginManager/PluginRepositoryDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/PluginManager/PluginRepositoryDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -394,7 +394,7 @@ ui = None if ui and ui.notificationsEnabled(): ui.showNotification( - UI.PixmapCache.getPixmap("plugin48.png"), + UI.PixmapCache.getPixmap("plugin48"), self.tr("Download Plugin Files"), self.tr("""The requested plugins were downloaded.""")) @@ -651,22 +651,22 @@ updateStatus = self.__updateStatus(filename, version) if updateStatus == PluginRepositoryWidget.PluginStatusUpToDate: - itm.setIcon(1, UI.PixmapCache.getIcon("empty.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("empty")) itm.setToolTip(1, self.tr("up-to-date")) elif updateStatus == PluginRepositoryWidget.PluginStatusNew: - itm.setIcon(1, UI.PixmapCache.getIcon("download.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("download")) itm.setToolTip(1, self.tr("new download available")) self.__newItems += 1 elif updateStatus == PluginRepositoryWidget.PluginStatusLocalUpdate: - itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal")) itm.setToolTip(1, self.tr("update installable")) self.__updateLocalItems += 1 elif updateStatus == PluginRepositoryWidget.PluginStatusRemoteUpdate: - itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote")) itm.setToolTip(1, self.tr("updated download available")) self.__updateRemoteItems += 1 elif updateStatus == PluginRepositoryWidget.PluginStatusError: - itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("warning")) itm.setToolTip(1, self.tr("error determining status")) def __updateStatus(self, filename, version):
--- a/eric6/PluginManager/PluginUninstallDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/PluginManager/PluginUninstallDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -189,7 +189,7 @@ ui = e5App().getObject("UserInterface") if ui.notificationsEnabled(): ui.showNotification( - UI.PixmapCache.getPixmap("plugin48.png"), + UI.PixmapCache.getPixmap("plugin48"), self.tr("Plugin Uninstallation"), self.tr( """<p>The plugin <b>{0}</b> was uninstalled"""
--- a/eric6/Plugins/AboutPlugin/AboutDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/AboutPlugin/AboutDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -753,7 +753,7 @@ self.ericLabel.setText(titleText) self.ericPixmap.setPixmap( - UI.PixmapCache.getPixmap("eric.png").scaled(48, 48)) + UI.PixmapCache.getPixmap("eric").scaled(48, 48)) #################################################################### ## ABOUT
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -69,13 +69,13 @@ self.optionsTabWidget.setCurrentIndex(0) self.excludeMessagesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.includeMessagesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.fixIssuesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.noFixIssuesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.docTypeComboBox.addItem(self.tr("PEP-257"), "pep257") self.docTypeComboBox.addItem(self.tr("Eric"), "eric") @@ -101,8 +101,8 @@ self.resultList.headerItem().setText(self.resultList.columnCount(), "") self.resultList.header().setSortIndicator(0, Qt.AscendingOrder) - self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus")) self.checkProgress.setVisible(False) self.checkProgressLabel.setVisible(False) @@ -192,20 +192,20 @@ self.__lastFileItem, ["{0:6}".format(line), code, message]) if code.startswith(("W", "-", "C", "M")): - itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("warning")) elif code.startswith("N"): - itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("namingError")) elif code.startswith("D"): - itm.setIcon(1, UI.PixmapCache.getIcon("docstringError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("docstringError")) else: - itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError")) if fixed: - itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed")) elif ( code in FixableCodeStyleIssues and not autofixing and code not in self.__noFixCodesList ): - itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable")) fixable = True itm.setTextAlignment(0, Qt.AlignRight) @@ -243,7 +243,7 @@ if fixed: code, message = text.split(None, 1) itm.setText(2, message) - itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed")) itm.setData(0, self.messageRole, message) else:
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -52,16 +52,16 @@ continue itm = QTreeWidgetItem(self.codeTable, [code, message]) if code.startswith(("W", "C", "M")): - itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("warning")) elif code.startswith("E"): - itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError")) elif code.startswith("N"): - itm.setIcon(0, UI.PixmapCache.getIcon("namingError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("namingError")) elif code.startswith("D"): - itm.setIcon(0, UI.PixmapCache.getIcon("docstringError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("docstringError")) else: # unknown category prefix => warning - itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("warning")) itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) if code in codeList: itm.setCheckState(0, Qt.Checked)
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -84,13 +84,13 @@ itm.setData(1, Qt.DisplayRole, code) itm.setData(2, Qt.DisplayRole, message) if code.startswith(("W", "C", "M")): - itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("warning")) elif code.startswith("E"): - itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError")) elif code.startswith("N"): - itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("namingError")) elif code.startswith("D"): - itm.setIcon(1, UI.PixmapCache.getIcon("docstringError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("docstringError")) itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(1, Qt.AlignHCenter)
--- a/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -133,9 +133,9 @@ itm = QTreeWidgetItem(self.__lastFileItem) if isWarning: - itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("warning")) else: - itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError")) itm.setData(0, Qt.DisplayRole, line) itm.setData(1, Qt.DisplayRole, error) itm.setData(2, Qt.DisplayRole, sourcecode)
--- a/eric6/Plugins/PluginAbout.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/PluginAbout.py Sun Apr 12 19:07:49 2020 +0200 @@ -78,7 +78,7 @@ self.aboutAct = E5Action( self.tr('About {0}').format(UI.Info.Program), - UI.PixmapCache.getIcon("helpAbout.png"), + UI.PixmapCache.getIcon("helpAbout"), self.tr('&About {0}').format(UI.Info.Program), 0, 0, self, 'about_eric') self.aboutAct.setStatusTip(self.tr( @@ -93,7 +93,7 @@ self.aboutQtAct = E5Action( self.tr('About Qt'), - UI.PixmapCache.getIcon("helpAboutQt.png"), + UI.PixmapCache.getIcon("helpAboutQt"), self.tr('About &Qt'), 0, 0, self, 'about_qt') self.aboutQtAct.setStatusTip( self.tr('Display information about the Qt toolkit'))
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -66,8 +66,8 @@ self.__translator.getAppIcon("swap")) self.translateButton.setIcon( self.__translator.getAppIcon("translate")) - self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete.png")) - self.preferencesButton.setIcon(UI.PixmapCache.getIcon("configure.png")) + self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete")) + self.preferencesButton.setIcon(UI.PixmapCache.getIcon("configure")) self.translateButton.setEnabled(False) self.clearButton.setEnabled(False)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -38,7 +38,7 @@ super(GitArchiveDataDialog, self).__init__(parent) self.setupUi(self) - self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.fileButton.setIcon(UI.PixmapCache.getIcon("open")) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -38,7 +38,7 @@ super(GitCopyDialog, self).__init__(parent) self.setupUi(self) - self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.dirButton.setIcon(UI.PixmapCache.getIcon("open")) self.source = source if os.path.isdir(self.source):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -87,8 +87,8 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(1, Qt.AscendingOrder) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) self.refreshButton = self.buttonBox.addButton( self.tr("&Refresh"), QDialogButtonBox.ActionRole) @@ -96,8 +96,8 @@ self.tr("Press to refresh the list of commits")) self.refreshButton.setEnabled(False) - self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) - self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) + self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) self.__findBackwards = False self.modeComboBox.addItem(self.tr("Find"), "find") @@ -350,7 +350,7 @@ "Show the most recent tag reachable from a commit")) self.actionsButton.setIcon( - UI.PixmapCache.getIcon("actionsToolButton.png")) + UI.PixmapCache.getIcon("actionsToolButton")) self.actionsButton.setMenu(self.__actionsMenu) def __initData(self):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -40,10 +40,10 @@ self.__vcs = vcs - self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) - self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open")) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open")) self.vcsUrlClearHistoryButton.setIcon( - UI.PixmapCache.getIcon("editDelete.png")) + UI.PixmapCache.getIcon("editDelete")) vcsUrlHistory = self.__vcs.getPlugin().getPreferences( "RepositoryUrlHistory")
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -42,10 +42,10 @@ self.eofCheckBox.setChecked(patchCheckData[2]) self.lineCountsCheckBox.setChecked(patchCheckData[3]) - self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.addButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) self.__okButton.setEnabled(len(self.__getPatchFilesList()) > 0)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -101,29 +101,29 @@ self.__lDiffMenu = QMenu() self.__stageLinesAct = self.__lDiffMenu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr("Stage Selected Lines"), self.__stageHunkOrLines) self.__revertLinesAct = self.__lDiffMenu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr("Revert Selected Lines"), self.__revertHunkOrLines) self.__stageHunkAct = self.__lDiffMenu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr("Stage Hunk"), self.__stageHunkOrLines) self.__revertHunkAct = self.__lDiffMenu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr("Revert Hunk"), self.__revertHunkOrLines) self.__rDiffMenu = QMenu() self.__unstageLinesAct = self.__rDiffMenu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr("Unstage Selected Lines"), self.__unstageHunkOrLines) self.__unstageHunkAct = self.__rDiffMenu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr("Unstage Hunk"), self.__unstageHunkOrLines) @@ -257,7 +257,7 @@ "Adjusts the width of all columns to their contents")) self.actionsButton.setIcon( - UI.PixmapCache.getIcon("actionsToolButton.png")) + UI.PixmapCache.getIcon("actionsToolButton")) self.actionsButton.setMenu(self.__actionsMenu) def closeEvent(self, e):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -43,10 +43,10 @@ self.__vcs = vcs self.__repodir = repodir - self.submoduleDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) - self.submoduleUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.submoduleDirButton.setIcon(UI.PixmapCache.getIcon("open")) + self.submoduleUrlButton.setIcon(UI.PixmapCache.getIcon("open")) self.submoduleUrlClearHistoryButton.setIcon( - UI.PixmapCache.getIcon("editDelete.png")) + UI.PixmapCache.getIcon("editDelete")) submoduleUrlHistory = self.__vcs.getPlugin().getPreferences( "RepositoryUrlHistory")
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -180,28 +180,28 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add/Stage to repository'), self._VCSAdd) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Unstage changes'), self.__GitUnstage) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository only'), self.__GitForget) self.vcsMenuActions.append(act) @@ -212,30 +212,30 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side'), self.__GitSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__GitExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side (extended)'), self.__GitSbsExtendedDiff) self.vcsMenuActions.append(act) @@ -246,7 +246,7 @@ self.vcsMenuActions.append(self.annotateAct) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__GitRevert) self.vcsMenuActions.append(act) menu.addSeparator() @@ -288,48 +288,48 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add/Stage to repository'), self._VCSAdd) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Unstage changes'), self.__GitUnstage) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository only'), self.__GitForget) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__GitExtendedDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__GitRevert) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -406,22 +406,22 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add/Stage to repository'), self._VCSAdd) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Unstage changes'), self.__GitUnstage) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) @@ -432,27 +432,27 @@ self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__GitExtendedDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__GitRevert) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -496,43 +496,43 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add/Stage to repository'), self._VCSAdd) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Unstage changes'), self.__GitUnstage) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__GitExtendedDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__GitRevert) self.vcsDirMultiMenuActions.append(act) menu.addSeparator()
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -71,7 +71,7 @@ """ self.vcsNewAct = E5Action( self.tr('New from repository'), - UI.PixmapCache.getIcon("vcsCheckout.png"), + UI.PixmapCache.getIcon("vcsCheckout"), self.tr('&New from repository...'), 0, 0, self, 'git_new') self.vcsNewAct.setStatusTip(self.tr( @@ -87,7 +87,7 @@ self.gitFetchAct = E5Action( self.tr('Fetch changes'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Fetch changes'), 0, 0, self, 'git_fetch') self.gitFetchAct.setStatusTip(self.tr( @@ -103,7 +103,7 @@ self.gitPullAct = E5Action( self.tr('Pull changes'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Pull changes'), 0, 0, self, 'git_pull') self.gitPullAct.setStatusTip(self.tr( @@ -119,7 +119,7 @@ self.vcsCommitAct = E5Action( self.tr('Commit changes to repository'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), 0, 0, self, 'git_commit') self.vcsCommitAct.setStatusTip(self.tr( @@ -135,7 +135,7 @@ self.gitPushAct = E5Action( self.tr('Push changes'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Push changes'), 0, 0, self, 'git_push') self.gitPushAct.setStatusTip(self.tr( @@ -151,7 +151,7 @@ self.vcsExportAct = E5Action( self.tr('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), + UI.PixmapCache.getIcon("vcsExport"), self.tr('&Export from repository...'), 0, 0, self, 'git_export_repo') self.vcsExportAct.setStatusTip(self.tr( @@ -166,7 +166,7 @@ self.gitLogBrowserAct = E5Action( self.tr('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), 0, 0, self, 'git_log_browser') self.gitLogBrowserAct.setStatusTip(self.tr( @@ -183,7 +183,7 @@ self.gitReflogBrowserAct = E5Action( self.tr('Show reflog browser'), - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show reflog browser'), 0, 0, self, 'git_reflog_browser') self.gitReflogBrowserAct.setStatusTip(self.tr( @@ -200,7 +200,7 @@ self.vcsDiffAct = E5Action( self.tr('Show differences'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show &differences...'), 0, 0, self, 'git_diff') self.vcsDiffAct.setStatusTip(self.tr( @@ -216,7 +216,7 @@ self.gitExtDiffAct = E5Action( self.tr('Show differences (extended)'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended) ...'), 0, 0, self, 'git_extendeddiff') self.gitExtDiffAct.setStatusTip(self.tr( @@ -232,7 +232,7 @@ self.vcsStatusAct = E5Action( self.tr('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show &status...'), 0, 0, self, 'git_status') self.vcsStatusAct.setStatusTip(self.tr( @@ -247,7 +247,7 @@ self.vcsSwitchAct = E5Action( self.tr('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr('S&witch...'), 0, 0, self, 'git_switch') self.vcsSwitchAct.setStatusTip(self.tr( @@ -263,7 +263,7 @@ self.vcsTagAct = E5Action( self.tr('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), + UI.PixmapCache.getIcon("vcsTag"), self.tr('&Tag in repository...'), 0, 0, self, 'git_tag') self.vcsTagAct.setStatusTip(self.tr( @@ -352,7 +352,7 @@ self.gitBranchAct = E5Action( self.tr('Branch in repository'), - UI.PixmapCache.getIcon("vcsBranch.png"), + UI.PixmapCache.getIcon("vcsBranch"), self.tr('&Branch in repository...'), 0, 0, self, 'git_branch') self.gitBranchAct.setStatusTip(self.tr( @@ -396,7 +396,7 @@ self.vcsRevertAct = E5Action( self.tr('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Re&vert changes'), 0, 0, self, 'git_revert') self.vcsRevertAct.setStatusTip(self.tr( @@ -411,7 +411,7 @@ self.gitUnstageAct = E5Action( self.tr('Unstage changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('&Unstage changes'), 0, 0, self, 'git_revert') self.gitUnstageAct.setStatusTip(self.tr( @@ -426,7 +426,7 @@ self.vcsMergeAct = E5Action( self.tr('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Mer&ge changes...'), 0, 0, self, 'git_merge') self.vcsMergeAct.setStatusTip(self.tr( @@ -632,7 +632,7 @@ self.gitCherryPickAct = E5Action( self.tr('Copy Commits'), - UI.PixmapCache.getIcon("vcsGraft.png"), + UI.PixmapCache.getIcon("vcsGraft"), self.tr('Copy Commits'), 0, 0, self, 'git_cherrypick') self.gitCherryPickAct.setStatusTip(self.tr( @@ -1083,7 +1083,7 @@ self.gitBisectLogBrowserAct = E5Action( self.tr('Show bisect log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show bisect log browser'), 0, 0, self, 'git_bisect_log_browser') self.gitBisectLogBrowserAct.setStatusTip(self.tr( @@ -1424,7 +1424,7 @@ self.subMenus.append(bisectMenu) tagsMenu = QMenu(self.tr("Tags"), menu) - tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag.png")) + tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag")) tagsMenu.setTearOffEnabled(True) tagsMenu.addAction(self.vcsTagAct) tagsMenu.addAction(self.gitTagListAct) @@ -1432,7 +1432,7 @@ self.subMenus.append(tagsMenu) branchesMenu = QMenu(self.tr("Branches"), menu) - branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch.png")) + branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch")) branchesMenu.setTearOffEnabled(True) branchesMenu.addAction(self.gitBranchAct) branchesMenu.addSeparator() @@ -1465,7 +1465,7 @@ remotesMenu.addAction(self.gitRemotePruneAct) cherrypickMenu = QMenu(self.tr("Cherry-pick"), menu) - cherrypickMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) + cherrypickMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft")) cherrypickMenu.setTearOffEnabled(True) cherrypickMenu.addAction(self.gitCherryPickAct) cherrypickMenu.addAction(self.gitCherryPickContinueAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -34,7 +34,7 @@ """ self.hgFetchAct = E5Action( self.tr('Fetch changes'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Fetch changes'), 0, 0, self, 'mercurial_fetch') self.hgFetchAct.setStatusTip(self.tr( @@ -59,7 +59,7 @@ @return populated menu (QMenu) """ menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("vcsUpdate.png")) + menu.setIcon(UI.PixmapCache.getIcon("vcsUpdate")) menu.setTearOffEnabled(True) menu.addAction(self.hgFetchAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -33,7 +33,7 @@ """ self.hgGpgListAct = E5Action( self.tr('List Signed Changesets'), - UI.PixmapCache.getIcon("changesetSignList.png"), + UI.PixmapCache.getIcon("changesetSignList"), self.tr('List Signed Changesets...'), 0, 0, self, 'mercurial_gpg_list') self.hgGpgListAct.setStatusTip(self.tr( @@ -48,7 +48,7 @@ self.hgGpgVerifyAct = E5Action( self.tr('Verify Signatures'), - UI.PixmapCache.getIcon("changesetSignVerify.png"), + UI.PixmapCache.getIcon("changesetSignVerify"), self.tr('Verify Signatures'), 0, 0, self, 'mercurial_gpg_verify') self.hgGpgVerifyAct.setStatusTip(self.tr( @@ -64,7 +64,7 @@ self.hgGpgSignAct = E5Action( self.tr('Sign Revision'), - UI.PixmapCache.getIcon("changesetSign.png"), + UI.PixmapCache.getIcon("changesetSign"), self.tr('Sign Revision'), 0, 0, self, 'mercurial_gpg_sign') self.hgGpgSignAct.setStatusTip(self.tr( @@ -85,7 +85,7 @@ @return populated menu (QMenu) """ menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("changesetSign.png")) + menu.setIcon(UI.PixmapCache.getIcon("changesetSign")) menu.setTearOffEnabled(True) menu.addAction(self.hgGpgListAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -259,22 +259,22 @@ if itm is not None: menu = QMenu(self.bookmarksList) menu.addAction( - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr("Switch to"), self.__switchTo) menu.addSeparator() menu.addAction( - UI.PixmapCache.getIcon("deleteBookmark.png"), + UI.PixmapCache.getIcon("deleteBookmark"), self.tr("Delete"), self.__deleteBookmark) menu.addAction( - UI.PixmapCache.getIcon("renameBookmark.png"), + UI.PixmapCache.getIcon("renameBookmark"), self.tr("Rename"), self.__renameBookmark) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("pullBookmark.png"), + UI.PixmapCache.getIcon("pullBookmark"), self.tr("Pull"), self.__pullBookmark) act.setEnabled(self.vcs.canPull()) act = menu.addAction( - UI.PixmapCache.getIcon("pushBookmark.png"), + UI.PixmapCache.getIcon("pushBookmark"), self.tr("Push"), self.__pushBookmark) act.setEnabled(self.vcs.canPush()) menu.popup(self.bookmarksList.mapToGlobal(pos))
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -109,8 +109,8 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) self.refreshButton = self.buttonBox.addButton( self.tr("&Refresh"), QDialogButtonBox.ActionRole) @@ -118,8 +118,8 @@ self.tr("Press to refresh the list of changesets")) self.refreshButton.setEnabled(False) - self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) - self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) + self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) self.__findBackwards = False self.modeComboBox.addItem(self.tr("Find"), "find") @@ -259,13 +259,13 @@ self.__actionsMenu.setToolTipsVisible(True) self.__graftAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsGraft.png"), + UI.PixmapCache.getIcon("vcsGraft"), self.tr("Copy Changesets"), self.__graftActTriggered) self.__graftAct.setToolTip(self.tr( "Copy the selected changesets to the current branch")) self.__mergeAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr("Merge with Changeset"), self.__mergeActTriggered) self.__mergeAct.setToolTip(self.tr( "Merge the working directory with the selected changeset")) @@ -280,7 +280,7 @@ """ the same current phase.</p>""")) self.__tagAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsTag.png"), self.tr("Tag"), + UI.PixmapCache.getIcon("vcsTag"), self.tr("Tag"), self.__tagActTriggered) self.__tagAct.setToolTip(self.tr("Tag the selected revision")) @@ -290,7 +290,7 @@ self.__closeHeadsAct.setToolTip(self.tr("Close the selected heads")) self.__switchAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsSwitch.png"), self.tr("Switch"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr("Switch"), self.__switchActTriggered) self.__switchAct.setToolTip(self.tr( "Switch the working directory to the selected revision")) @@ -298,12 +298,12 @@ self.__actionsMenu.addSeparator() self.__bookmarkAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("addBookmark.png"), + UI.PixmapCache.getIcon("addBookmark"), self.tr("Define Bookmark..."), self.__bookmarkActTriggered) self.__bookmarkAct.setToolTip( self.tr("Bookmark the selected revision")) self.__bookmarkMoveAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("moveBookmark.png"), + UI.PixmapCache.getIcon("moveBookmark"), self.tr("Move Bookmark..."), self.__bookmarkMoveActTriggered) self.__bookmarkMoveAct.setToolTip( self.tr("Move bookmark to the selected revision")) @@ -311,7 +311,7 @@ self.__actionsMenu.addSeparator() self.__pullAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), self.tr("Pull Changes"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr("Pull Changes"), self.__pullActTriggered) self.__pullAct.setToolTip(self.tr( "Pull changes from a remote repository")) @@ -327,13 +327,13 @@ self.__actionsMenu.addSeparator() self.__pushAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr("Push Selected Changes"), self.__pushActTriggered) self.__pushAct.setToolTip(self.tr( "Push changes of the selected changeset and its ancestors" " to a remote repository")) self.__pushAllAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr("Push All Changes"), self.__pushAllActTriggered) self.__pushAllAct.setToolTip(self.tr( "Push all changes to a remote repository")) @@ -341,7 +341,7 @@ self.__actionsMenu.addSeparator() self.__bundleAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsCreateChangegroup.png"), + UI.PixmapCache.getIcon("vcsCreateChangegroup"), self.tr("Create Changegroup"), self.__bundleActTriggered) self.__bundleAct.setToolTip(self.tr( "Create a changegroup file containing the selected changesets")) @@ -355,7 +355,7 @@ """ If the dialog is showing outgoing changesets, all""" """ selected changesets will be bundled.</p>""")) self.__unbundleAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("vcsApplyChangegroup.png"), + UI.PixmapCache.getIcon("vcsApplyChangegroup"), self.tr("Apply Changegroup"), self.__unbundleActTriggered) self.__unbundleAct.setToolTip(self.tr( "Apply the currently viewed changegroup file")) @@ -363,12 +363,12 @@ self.__actionsMenu.addSeparator() self.__gpgSignAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("changesetSign.png"), + UI.PixmapCache.getIcon("changesetSign"), self.tr("Sign Revisions"), self.__gpgSignActTriggered) self.__gpgSignAct.setToolTip(self.tr( "Add a signature for the selected revisions")) self.__gpgVerifyAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("changesetSignVerify.png"), + UI.PixmapCache.getIcon("changesetSignVerify"), self.tr("Verify Signatures"), self.__gpgVerifyActTriggered) self.__gpgVerifyAct.setToolTip(self.tr( "Verify all signatures there may be for the selected revision")) @@ -376,7 +376,7 @@ self.__actionsMenu.addSeparator() self.__stripAct = self.__actionsMenu.addAction( - UI.PixmapCache.getIcon("fileDelete.png"), + UI.PixmapCache.getIcon("fileDelete"), self.tr("Strip Changesets"), self.__stripActTriggered) self.__stripAct.setToolTip(self.tr( "Strip changesets from a repository")) @@ -390,7 +390,7 @@ lambda: self.__selectAllActTriggered(False)) self.actionsButton.setIcon( - UI.PixmapCache.getIcon("actionsToolButton.png")) + UI.PixmapCache.getIcon("actionsToolButton")) self.actionsButton.setMenu(self.__actionsMenu) def __initData(self):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -49,7 +49,7 @@ QComboBox.AdjustToMinimumContentsLength) self.vcsUrlPicker.setPathsList(vcsUrlHistory) self.vcsUrlClearHistoryButton.setIcon( - UI.PixmapCache.getIcon("editDelete.png")) + UI.PixmapCache.getIcon("editDelete")) self.vcsUrlPicker.setText("") ipath = (
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -38,9 +38,9 @@ self.setupUi(self) self.defaultShowPasswordButton.setIcon( - UI.PixmapCache.getIcon("showPassword.png")) + UI.PixmapCache.getIcon("showPassword")) self.defaultPushShowPasswordButton.setIcon( - UI.PixmapCache.getIcon("showPassword.png")) + UI.PixmapCache.getIcon("showPassword")) self.__withLargefiles = withLargefiles if withLargefiles:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -67,7 +67,7 @@ self.tr("Stop Server"), self) self.__stopAct.triggered.connect(self.__stopServer) self.__browserAct = QAction( - UI.PixmapCache.getIcon("home.png"), + UI.PixmapCache.getIcon("home"), self.tr("Start Browser"), self) self.__browserAct.triggered.connect(self.__startBrowser)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -194,7 +194,7 @@ "Adjusts the width of all columns to their contents")) self.actionsButton.setIcon( - UI.PixmapCache.getIcon("actionsToolButton.png")) + UI.PixmapCache.getIcon("actionsToolButton")) self.actionsButton.setMenu(self.__actionsMenu) def closeEvent(self, e):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -285,11 +285,11 @@ menu = QMenu(self.tagList) if self.tagsMode: menu.addAction( - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr("Switch to"), self.__switchTo) else: act = menu.addAction( - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr("Switch to"), self.__switchTo) act.setEnabled(itm.text(3) != self.__currentBranch) menu.addSeparator()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -44,9 +44,9 @@ self.tagCombo.addItem("", False) for tag, isLocal in sorted(taglist, reverse=True): if isLocal: - icon = UI.PixmapCache.getIcon("vcsTagLocal.png") + icon = UI.PixmapCache.getIcon("vcsTagLocal") else: - icon = UI.PixmapCache.getIcon("vcsTagGlobal.png") + icon = UI.PixmapCache.getIcon("vcsTagGlobal") self.tagCombo.addItem(icon, tag, isLocal) if revision:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -67,13 +67,13 @@ self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser( "~\\AppData\\Local\\largefiles")) - self.fpAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.fpDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.fpEditButton.setIcon(UI.PixmapCache.getIcon("edit.png")) + self.fpAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.fpDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.fpEditButton.setIcon(UI.PixmapCache.getIcon("edit")) - self.protocolAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.protocolDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.protocolEditButton.setIcon(UI.PixmapCache.getIcon("edit.png")) + self.protocolAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.protocolDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.protocolEditButton.setIcon(UI.PixmapCache.getIcon("edit")) self.minimumProtocolComboBox.addItem(self.tr("Default"), "") for protocol in sorted(self.__minimumProtocols.keys()):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py Sun Apr 12 19:07:49 2020 +0200 @@ -87,8 +87,8 @@ super(HgHisteditPlanEditor, self).__init__(parent) self.setupUi(self) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) self.planTreeWidget.headerItem().setText( self.planTreeWidget.columnCount(), "")
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -34,7 +34,7 @@ """ self.hgHisteditStartAct = E5Action( self.tr('Start'), - UI.PixmapCache.getIcon("vcsEditHistory.png"), + UI.PixmapCache.getIcon("vcsEditHistory"), self.tr('Start'), 0, 0, self, 'mercurial_histedit_start') self.hgHisteditStartAct.setStatusTip(self.tr( @@ -100,7 +100,7 @@ @return populated menu (QMenu) """ menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("vcsEditHistory.png")) + menu.setIcon(UI.PixmapCache.getIcon("vcsEditHistory")) menu.setTearOffEnabled(True) menu.addAction(self.hgHisteditStartAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -47,12 +47,12 @@ menu = QMenu(self.menuTitle()) menu.setTearOffEnabled(True) act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add as Large File'), lambda: self.__hgAddLargefiles("large")) self.__addSingleActs.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add as Normal File'), lambda: self.__hgAddLargefiles("normal")) self.__addSingleActs.append(act) @@ -61,12 +61,12 @@ menu = QMenu(self.menuTitle()) menu.setTearOffEnabled(True) act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add as Large Files'), lambda: self.__hgAddLargefiles("large")) self.__addMultiActs.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add as Normal Files'), lambda: self.__hgAddLargefiles("normal")) self.__addMultiActs.append(act)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -67,7 +67,7 @@ self.hgLfPullAct = E5Action( self.tr('Pull Large Files'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Pull Large Files'), 0, 0, self, 'mercurial_pull_largefiles') self.hgLfPullAct.setStatusTip(self.tr( @@ -83,7 +83,7 @@ self.hgLfSummaryAct = E5Action( self.tr('Show Summary'), - UI.PixmapCache.getIcon("vcsSummary.png"), + UI.PixmapCache.getIcon("vcsSummary"), self.tr('Show summary...'), 0, 0, self, 'mercurial_summary_largefiles') self.hgLfSummaryAct.setStatusTip(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -287,24 +287,24 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) self.__addExtensionsMenu(menu, 'mainMenu') menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository only'), self.__HgForget) self.vcsMenuActions.append(act) @@ -315,30 +315,30 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side'), self.__HgSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side (extended)'), self.__HgSbsExtendedDiff) self.vcsMenuActions.append(act) @@ -348,7 +348,7 @@ self.vcsMenuActions.append(self.annotateAct) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) act = menu.addAction( @@ -399,44 +399,44 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) self.__addExtensionsMenu(menu, 'multiMenu') menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository only'), self.__HgForget) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__HgRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( @@ -522,18 +522,18 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) self.__addExtensionsMenu(menu, 'dirMenu') menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) @@ -544,27 +544,27 @@ self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__HgRevert) self.vcsDirMenuActions.append(act) act = menu.addAction( @@ -617,39 +617,39 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) self.__addExtensionsMenu(menu, 'dirMultiMenu') menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self.__HgRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -124,7 +124,7 @@ """ self.vcsNewAct = E5Action( self.tr('New from repository'), - UI.PixmapCache.getIcon("vcsCheckout.png"), + UI.PixmapCache.getIcon("vcsCheckout"), self.tr('&New from repository...'), 0, 0, self, 'mercurial_new') self.vcsNewAct.setStatusTip(self.tr( @@ -140,7 +140,7 @@ self.hgIncomingAct = E5Action( self.tr('Show incoming log'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Show incoming log'), 0, 0, self, 'mercurial_incoming') self.hgIncomingAct.setStatusTip(self.tr( @@ -156,7 +156,7 @@ self.hgPullAct = E5Action( self.tr('Pull changes'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Pull changes'), 0, 0, self, 'mercurial_pull') self.hgPullAct.setStatusTip(self.tr( @@ -172,7 +172,7 @@ self.vcsUpdateAct = E5Action( self.tr('Update from repository'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('&Update from repository'), 0, 0, self, 'mercurial_update') self.vcsUpdateAct.setStatusTip(self.tr( @@ -188,7 +188,7 @@ self.vcsCommitAct = E5Action( self.tr('Commit changes to repository'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('&Commit changes to repository...'), 0, 0, self, 'mercurial_commit') self.vcsCommitAct.setStatusTip(self.tr( @@ -204,7 +204,7 @@ self.hgOutgoingAct = E5Action( self.tr('Show outgoing log'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Show outgoing log'), 0, 0, self, 'mercurial_outgoing') self.hgOutgoingAct.setStatusTip(self.tr( @@ -220,7 +220,7 @@ self.hgPushAct = E5Action( self.tr('Push changes'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Push changes'), 0, 0, self, 'mercurial_push') self.hgPushAct.setStatusTip(self.tr( @@ -236,7 +236,7 @@ self.hgPushForcedAct = E5Action( self.tr('Push changes (force)'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Push changes (force)'), 0, 0, self, 'mercurial_push_forced') self.hgPushForcedAct.setStatusTip(self.tr( @@ -252,7 +252,7 @@ self.vcsExportAct = E5Action( self.tr('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), + UI.PixmapCache.getIcon("vcsExport"), self.tr('&Export from repository...'), 0, 0, self, 'mercurial_export_repo') self.vcsExportAct.setStatusTip(self.tr( @@ -267,7 +267,7 @@ self.hgLogBrowserAct = E5Action( self.tr('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), 0, 0, self, 'mercurial_log_browser') self.hgLogBrowserAct.setStatusTip(self.tr( @@ -284,7 +284,7 @@ self.vcsDiffAct = E5Action( self.tr('Show differences'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show &difference'), 0, 0, self, 'mercurial_diff') self.vcsDiffAct.setStatusTip(self.tr( @@ -300,7 +300,7 @@ self.hgExtDiffAct = E5Action( self.tr('Show differences (extended)'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), 0, 0, self, 'mercurial_extendeddiff') self.hgExtDiffAct.setStatusTip(self.tr( @@ -316,7 +316,7 @@ self.vcsStatusAct = E5Action( self.tr('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show &status...'), 0, 0, self, 'mercurial_status') self.vcsStatusAct.setStatusTip(self.tr( @@ -331,7 +331,7 @@ self.hgSummaryAct = E5Action( self.tr('Show Summary'), - UI.PixmapCache.getIcon("vcsSummary.png"), + UI.PixmapCache.getIcon("vcsSummary"), self.tr('Show summary...'), 0, 0, self, 'mercurial_summary') self.hgSummaryAct.setStatusTip(self.tr( @@ -389,7 +389,7 @@ self.vcsRevertAct = E5Action( self.tr('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Re&vert changes'), 0, 0, self, 'mercurial_revert') self.vcsRevertAct.setStatusTip(self.tr( @@ -404,7 +404,7 @@ self.vcsMergeAct = E5Action( self.tr('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Mer&ge changes...'), 0, 0, self, 'mercurial_merge') self.vcsMergeAct.setStatusTip(self.tr( @@ -449,7 +449,7 @@ self.hgReMergeAct = E5Action( self.tr('Re-Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Re-Merge'), 0, 0, self, 'mercurial_remerge') self.hgReMergeAct.setStatusTip(self.tr( @@ -510,7 +510,7 @@ self.vcsTagAct = E5Action( self.tr('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), + UI.PixmapCache.getIcon("vcsTag"), self.tr('&Tag in repository...'), 0, 0, self, 'mercurial_tag') self.vcsTagAct.setStatusTip(self.tr( @@ -553,7 +553,7 @@ self.hgBranchAct = E5Action( self.tr('Create branch'), - UI.PixmapCache.getIcon("vcsBranch.png"), + UI.PixmapCache.getIcon("vcsBranch"), self.tr('Create &branch...'), 0, 0, self, 'mercurial_branch') self.hgBranchAct.setStatusTip(self.tr( @@ -569,7 +569,7 @@ self.hgPushBranchAct = E5Action( self.tr('Push new branch'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Push new branch'), 0, 0, self, 'mercurial_push_branch') self.hgPushBranchAct.setStatusTip(self.tr( @@ -615,7 +615,7 @@ self.vcsSwitchAct = E5Action( self.tr('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr('S&witch...'), 0, 0, self, 'mercurial_switch') self.vcsSwitchAct.setStatusTip(self.tr( @@ -790,7 +790,7 @@ self.hgBundleAct = E5Action( self.tr('Create changegroup'), - UI.PixmapCache.getIcon("vcsCreateChangegroup.png"), + UI.PixmapCache.getIcon("vcsCreateChangegroup"), self.tr('Create changegroup...'), 0, 0, self, 'mercurial_bundle') self.hgBundleAct.setStatusTip(self.tr( @@ -806,7 +806,7 @@ self.hgPreviewBundleAct = E5Action( self.tr('Preview changegroup'), - UI.PixmapCache.getIcon("vcsPreviewChangegroup.png"), + UI.PixmapCache.getIcon("vcsPreviewChangegroup"), self.tr('Preview changegroup...'), 0, 0, self, 'mercurial_preview_bundle') self.hgPreviewBundleAct.setStatusTip(self.tr( @@ -822,7 +822,7 @@ self.hgUnbundleAct = E5Action( self.tr('Apply changegroups'), - UI.PixmapCache.getIcon("vcsApplyChangegroup.png"), + UI.PixmapCache.getIcon("vcsApplyChangegroup"), self.tr('Apply changegroups...'), 0, 0, self, 'mercurial_unbundle') self.hgUnbundleAct.setStatusTip(self.tr( @@ -949,7 +949,7 @@ self.hgImportAct = E5Action( self.tr('Import Patch'), - UI.PixmapCache.getIcon("vcsImportPatch.png"), + UI.PixmapCache.getIcon("vcsImportPatch"), self.tr('Import Patch...'), 0, 0, self, 'mercurial_import') self.hgImportAct.setStatusTip(self.tr( @@ -965,7 +965,7 @@ self.hgExportAct = E5Action( self.tr('Export Patches'), - UI.PixmapCache.getIcon("vcsExportPatch.png"), + UI.PixmapCache.getIcon("vcsExportPatch"), self.tr('Export Patches...'), 0, 0, self, 'mercurial_export') self.hgExportAct.setStatusTip(self.tr( @@ -994,7 +994,7 @@ self.hgGraftAct = E5Action( self.tr('Copy Changesets'), - UI.PixmapCache.getIcon("vcsGraft.png"), + UI.PixmapCache.getIcon("vcsGraft"), self.tr('Copy Changesets'), 0, 0, self, 'mercurial_graft') self.hgGraftAct.setStatusTip(self.tr( @@ -1055,7 +1055,7 @@ self.hgAddSubrepoAct = E5Action( self.tr('Add'), - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add...'), 0, 0, self, 'mercurial_add_subrepo') self.hgAddSubrepoAct.setStatusTip(self.tr( @@ -1070,7 +1070,7 @@ self.hgRemoveSubreposAct = E5Action( self.tr('Remove'), - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove...'), 0, 0, self, 'mercurial_remove_subrepos') self.hgRemoveSubreposAct.setStatusTip(self.tr( @@ -1086,7 +1086,7 @@ self.hgArchiveAct = E5Action( self.tr('Create unversioned archive'), - UI.PixmapCache.getIcon("vcsExport.png"), + UI.PixmapCache.getIcon("vcsExport"), self.tr('Create unversioned archive...'), 0, 0, self, 'mercurial_archive') self.hgArchiveAct.setStatusTip(self.tr( @@ -1102,7 +1102,7 @@ self.hgBookmarksListAct = E5Action( self.tr('List bookmarks'), - UI.PixmapCache.getIcon("listBookmarks.png"), + UI.PixmapCache.getIcon("listBookmarks"), self.tr('List bookmarks...'), 0, 0, self, 'mercurial_list_bookmarks') self.hgBookmarksListAct.setStatusTip(self.tr( @@ -1117,7 +1117,7 @@ self.hgBookmarkDefineAct = E5Action( self.tr('Define bookmark'), - UI.PixmapCache.getIcon("addBookmark.png"), + UI.PixmapCache.getIcon("addBookmark"), self.tr('Define bookmark...'), 0, 0, self, 'mercurial_define_bookmark') self.hgBookmarkDefineAct.setStatusTip(self.tr( @@ -1132,7 +1132,7 @@ self.hgBookmarkDeleteAct = E5Action( self.tr('Delete bookmark'), - UI.PixmapCache.getIcon("deleteBookmark.png"), + UI.PixmapCache.getIcon("deleteBookmark"), self.tr('Delete bookmark...'), 0, 0, self, 'mercurial_delete_bookmark') self.hgBookmarkDeleteAct.setStatusTip(self.tr( @@ -1147,7 +1147,7 @@ self.hgBookmarkRenameAct = E5Action( self.tr('Rename bookmark'), - UI.PixmapCache.getIcon("renameBookmark.png"), + UI.PixmapCache.getIcon("renameBookmark"), self.tr('Rename bookmark...'), 0, 0, self, 'mercurial_rename_bookmark') self.hgBookmarkRenameAct.setStatusTip(self.tr( @@ -1162,7 +1162,7 @@ self.hgBookmarkMoveAct = E5Action( self.tr('Move bookmark'), - UI.PixmapCache.getIcon("moveBookmark.png"), + UI.PixmapCache.getIcon("moveBookmark"), self.tr('Move bookmark...'), 0, 0, self, 'mercurial_move_bookmark') self.hgBookmarkMoveAct.setStatusTip(self.tr( @@ -1178,7 +1178,7 @@ self.hgBookmarkIncomingAct = E5Action( self.tr('Show incoming bookmarks'), - UI.PixmapCache.getIcon("incomingBookmark.png"), + UI.PixmapCache.getIcon("incomingBookmark"), self.tr('Show incoming bookmarks'), 0, 0, self, 'mercurial_incoming_bookmarks') self.hgBookmarkIncomingAct.setStatusTip(self.tr( @@ -1195,7 +1195,7 @@ self.hgBookmarkPullAct = E5Action( self.tr('Pull bookmark'), - UI.PixmapCache.getIcon("pullBookmark.png"), + UI.PixmapCache.getIcon("pullBookmark"), self.tr('Pull bookmark'), 0, 0, self, 'mercurial_pull_bookmark') self.hgBookmarkPullAct.setStatusTip(self.tr( @@ -1211,7 +1211,7 @@ self.hgBookmarkPullCurrentAct = E5Action( self.tr('Pull current bookmark'), - UI.PixmapCache.getIcon("pullBookmark.png"), + UI.PixmapCache.getIcon("pullBookmark"), self.tr('Pull current bookmark'), 0, 0, self, 'mercurial_pull_current_bookmark') self.hgBookmarkPullCurrentAct.setStatusTip(self.tr( @@ -1227,7 +1227,7 @@ self.hgBookmarkOutgoingAct = E5Action( self.tr('Show outgoing bookmarks'), - UI.PixmapCache.getIcon("outgoingBookmark.png"), + UI.PixmapCache.getIcon("outgoingBookmark"), self.tr('Show outgoing bookmarks'), 0, 0, self, 'mercurial_outgoing_bookmarks') self.hgBookmarkOutgoingAct.setStatusTip(self.tr( @@ -1244,7 +1244,7 @@ self.hgBookmarkPushAct = E5Action( self.tr('Push bookmark'), - UI.PixmapCache.getIcon("pushBookmark.png"), + UI.PixmapCache.getIcon("pushBookmark"), self.tr('Push bookmark'), 0, 0, self, 'mercurial_push_bookmark') self.hgBookmarkPushAct.setStatusTip(self.tr( @@ -1260,7 +1260,7 @@ self.hgBookmarkPushCurrentAct = E5Action( self.tr('Push current bookmark'), - UI.PixmapCache.getIcon("pushBookmark.png"), + UI.PixmapCache.getIcon("pushBookmark"), self.tr('Push current bookmark'), 0, 0, self, 'mercurial_push_current_bookmark') self.hgBookmarkPushCurrentAct.setStatusTip(self.tr( @@ -1277,7 +1277,7 @@ self.hgDeleteBackupsAct = E5Action( self.tr('Delete all backups'), - UI.PixmapCache.getIcon("clearPrivateData.png"), + UI.PixmapCache.getIcon("clearPrivateData"), self.tr('Delete all backups'), 0, 0, self, 'mercurial_delete_all_backups') self.hgDeleteBackupsAct.setStatusTip(self.tr( @@ -1380,14 +1380,14 @@ self.subMenus.append(bisectMenu) tagsMenu = QMenu(self.tr("Tags"), menu) - tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag.png")) + tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag")) tagsMenu.setTearOffEnabled(True) tagsMenu.addAction(self.vcsTagAct) tagsMenu.addAction(self.hgTagListAct) self.subMenus.append(tagsMenu) branchesMenu = QMenu(self.tr("Branches"), menu) - branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch.png")) + branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch")) branchesMenu.setTearOffEnabled(True) branchesMenu.addAction(self.hgBranchAct) branchesMenu.addAction(self.hgPushBranchAct) @@ -1396,7 +1396,7 @@ self.subMenus.append(branchesMenu) bookmarksMenu = QMenu(self.tr("Bookmarks"), menu) - bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22.png")) + bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22")) bookmarksMenu.setTearOffEnabled(True) bookmarksMenu.addAction(self.hgBookmarkDefineAct) bookmarksMenu.addAction(self.hgBookmarkDeleteAct) @@ -1428,7 +1428,7 @@ self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) graftMenu = QMenu(self.tr("Copy Changesets"), menu) - graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) + graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft")) graftMenu.setTearOffEnabled(True) graftMenu.addAction(self.hgGraftAct) graftMenu.addAction(self.hgGraftContinueAct) @@ -1442,7 +1442,7 @@ subrepoMenu.addAction(self.hgRemoveSubreposAct) mergeMenu = QMenu(self.tr("Merge Changesets"), menu) - mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge.png")) + mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge")) mergeMenu.setTearOffEnabled(True) mergeMenu.addAction(self.vcsMergeAct) mergeMenu.addAction(self.hgShowConflictsAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -33,7 +33,7 @@ """ self.hgPurgeAct = E5Action( self.tr('Purge Files'), - UI.PixmapCache.getIcon("fileDelete.png"), + UI.PixmapCache.getIcon("fileDelete"), self.tr('Purge Files'), 0, 0, self, 'mercurial_purge') self.hgPurgeAct.setStatusTip(self.tr( @@ -74,7 +74,7 @@ self.hgPurgeListAct = E5Action( self.tr('List Files to be Purged'), - UI.PixmapCache.getIcon("fileDeleteList.png"), + UI.PixmapCache.getIcon("fileDeleteList"), self.tr('List Files to be Purged...'), 0, 0, self, 'mercurial_purge_list') self.hgPurgeListAct.setStatusTip(self.tr( @@ -113,7 +113,7 @@ @return populated menu (QMenu) """ menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("fileDelete.png")) + menu.setIcon(UI.PixmapCache.getIcon("fileDelete")) menu.setTearOffEnabled(True) menu.addAction(self.hgPurgeAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -45,8 +45,8 @@ self.__patches = patchesList[:] self.patchSelector.addItems([""] + self.__patches) - self.plusButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.minusButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + self.plusButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.minusButton.setIcon(UI.PixmapCache.getIcon("minus")) self.__dirtyList = False self.__currentPatch = "" @@ -141,11 +141,11 @@ guardsList = guards.strip().split() for guard in guardsList: if guard.startswith("+"): - icon = UI.PixmapCache.getIcon("plus.png") + icon = UI.PixmapCache.getIcon("plus") guard = guard[1:] sign = "+" elif guard.startswith("-"): - icon = UI.PixmapCache.getIcon("minus.png") + icon = UI.PixmapCache.getIcon("minus") guard = guard[1:] sign = "-" else: @@ -193,10 +193,10 @@ guard = self.guardCombo.currentText() if self.plusButton.isChecked(): sign = "+" - icon = UI.PixmapCache.getIcon("plus.png") + icon = UI.PixmapCache.getIcon("plus") else: sign = "-" - icon = UI.PixmapCache.getIcon("minus.png") + icon = UI.PixmapCache.getIcon("minus") guardItem = self.__getGuard(guard) if guardItem:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -30,10 +30,10 @@ super(HgQueuesFoldDialog, self).__init__(parent) self.setupUi(self) - self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.removeButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.addButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.removeButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) for patch in patchesList: name, summary = patch.split("@@")
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -69,10 +69,10 @@ patchItm.setExpanded(True) for guard in guardsDict[patchName]: if guard.startswith("+"): - icon = UI.PixmapCache.getIcon("plus.png") + icon = UI.PixmapCache.getIcon("plus") guard = guard[1:] elif guard.startswith("-"): - icon = UI.PixmapCache.getIcon("minus.png") + icon = UI.PixmapCache.getIcon("minus") guard = guard[1:] else: icon = None
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -92,10 +92,10 @@ guardsList = guards.strip().split() for guard in guardsList: if guard.startswith("+"): - icon = UI.PixmapCache.getIcon("plus.png") + icon = UI.PixmapCache.getIcon("plus") guard = guard[1:] elif guard.startswith("-"): - icon = UI.PixmapCache.getIcon("minus.png") + icon = UI.PixmapCache.getIcon("minus") guard = guard[1:] else: icon = None
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -34,7 +34,7 @@ """ self.hgRebaseAct = E5Action( self.tr('Rebase Changesets'), - UI.PixmapCache.getIcon("vcsRebase.png"), + UI.PixmapCache.getIcon("vcsRebase"), self.tr('Rebase Changesets'), 0, 0, self, 'mercurial_rebase') self.hgRebaseAct.setStatusTip(self.tr( @@ -83,7 +83,7 @@ @return populated menu (QMenu) """ menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("vcsRebase.png")) + menu.setIcon(UI.PixmapCache.getIcon("vcsRebase")) menu.setTearOffEnabled(True) menu.addAction(self.hgRebaseAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -34,7 +34,7 @@ """ self.hgStripAct = E5Action( self.tr('Strip changesets'), - UI.PixmapCache.getIcon("fileDelete.png"), + UI.PixmapCache.getIcon("fileDelete"), self.tr('Strip changesets'), 0, 0, self, 'mercurial_strip') self.hgStripAct.setStatusTip(self.tr( @@ -58,7 +58,7 @@ @return populated menu (QMenu) """ menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("fileDelete.png")) + menu.setIcon(UI.PixmapCache.getIcon("fileDelete")) menu.setTearOffEnabled(True) menu.addAction(self.hgStripAct)
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -212,28 +212,28 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) if 1 in self.browser.specialMenuEntries: self.vcsMenuAddTree = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add tree to repository'), self._VCSAddTree) self.vcsAddMenuActions.append(self.vcsMenuAddTree) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) @@ -255,39 +255,39 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRepo.png"), + UI.PixmapCache.getIcon("vcsRepo"), self.tr('Show repository info'), self.__SVNInfo) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side'), self.__SVNSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side (extended)'), self.__SVNSbsExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) @@ -297,11 +297,11 @@ self.vcsMenuActions.append(self.blameAct) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) act = menu.addAction( @@ -309,19 +309,19 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLock.png"), + UI.PixmapCache.getIcon("vcsLock"), self.tr('Lock'), self.__SVNLock) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Unlock'), self.__SVNUnlock) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Break Lock'), self.__SVNBreakLock) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Steal Lock'), self.__SVNStealLock) self.vcsMenuActions.append(act) menu.addSeparator() @@ -370,26 +370,26 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddMultiMenuActions.append(act) if 1 in self.browser.specialMenuEntries: self.vcsMultiMenuAddTree = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add tree to repository'), self._VCSAddTree) self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) @@ -405,27 +405,27 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( @@ -433,19 +433,19 @@ self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLock.png"), + UI.PixmapCache.getIcon("vcsLock"), self.tr('Lock'), self.__SVNLock) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Unlock'), self.__SVNUnlock) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Break Lock'), self.__SVNBreakLock) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Steal Lock'), self.__SVNStealLock) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -528,21 +528,21 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) @@ -563,40 +563,40 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRepo.png"), + UI.PixmapCache.getIcon("vcsRepo"), self.tr('Show repository info'), self.__SVNInfo) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) act = menu.addAction( @@ -650,21 +650,21 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) @@ -680,31 +680,31 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -49,7 +49,7 @@ """ self.vcsNewAct = E5Action( self.tr('New from repository'), - UI.PixmapCache.getIcon("vcsCheckout.png"), + UI.PixmapCache.getIcon("vcsCheckout"), self.tr('&New from repository...'), 0, 0, self, 'pysvn_new') self.vcsNewAct.setStatusTip(self.tr( @@ -65,7 +65,7 @@ self.vcsUpdateAct = E5Action( self.tr('Update from repository'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('&Update from repository'), 0, 0, self, 'pysvn_update') self.vcsUpdateAct.setStatusTip(self.tr( @@ -81,7 +81,7 @@ self.vcsCommitAct = E5Action( self.tr('Commit changes to repository'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('&Commit changes to repository...'), 0, 0, self, 'pysvn_commit') self.vcsCommitAct.setStatusTip(self.tr( @@ -97,7 +97,7 @@ self.svnLogBrowserAct = E5Action( self.tr('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), 0, 0, self, 'pysvn_log_browser') self.svnLogBrowserAct.setStatusTip(self.tr( @@ -114,7 +114,7 @@ self.vcsDiffAct = E5Action( self.tr('Show differences'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show &difference'), 0, 0, self, 'pysvn_diff') self.vcsDiffAct.setStatusTip(self.tr( @@ -130,7 +130,7 @@ self.svnExtDiffAct = E5Action( self.tr('Show differences (extended)'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), 0, 0, self, 'pysvn_extendeddiff') self.svnExtDiffAct.setStatusTip(self.tr( @@ -146,7 +146,7 @@ self.svnUrlDiffAct = E5Action( self.tr('Show differences (URLs)'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), 0, 0, self, 'pysvn_urldiff') self.svnUrlDiffAct.setStatusTip(self.tr( @@ -162,7 +162,7 @@ self.vcsStatusAct = E5Action( self.tr('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show &status'), 0, 0, self, 'pysvn_status') self.vcsStatusAct.setStatusTip(self.tr( @@ -177,7 +177,7 @@ self.svnChangeListsAct = E5Action( self.tr('Show change lists'), - UI.PixmapCache.getIcon("vcsChangeLists.png"), + UI.PixmapCache.getIcon("vcsChangeLists"), self.tr('Show change lists'), 0, 0, self, 'pysvn_changelists') self.svnChangeListsAct.setStatusTip(self.tr( @@ -193,7 +193,7 @@ self.svnRepoInfoAct = E5Action( self.tr('Show repository info'), - UI.PixmapCache.getIcon("vcsRepo.png"), + UI.PixmapCache.getIcon("vcsRepo"), self.tr('Show repository info'), 0, 0, self, 'pysvn_repoinfo') self.svnRepoInfoAct.setStatusTip(self.tr( @@ -209,7 +209,7 @@ self.vcsTagAct = E5Action( self.tr('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), + UI.PixmapCache.getIcon("vcsTag"), self.tr('&Tag in repository...'), 0, 0, self, 'pysvn_tag') self.vcsTagAct.setStatusTip(self.tr( @@ -224,7 +224,7 @@ self.vcsExportAct = E5Action( self.tr('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), + UI.PixmapCache.getIcon("vcsExport"), self.tr('&Export from repository...'), 0, 0, self, 'pysvn_export') self.vcsExportAct.setStatusTip(self.tr( @@ -252,7 +252,7 @@ self.vcsRevertAct = E5Action( self.tr('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Re&vert changes'), 0, 0, self, 'pysvn_revert') self.vcsRevertAct.setStatusTip(self.tr( @@ -267,7 +267,7 @@ self.vcsMergeAct = E5Action( self.tr('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Mer&ge changes...'), 0, 0, self, 'pysvn_merge') self.vcsMergeAct.setStatusTip(self.tr( @@ -283,7 +283,7 @@ self.vcsSwitchAct = E5Action( self.tr('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr('S&witch...'), 0, 0, self, 'pysvn_switch') self.vcsSwitchAct.setStatusTip(self.tr( @@ -425,7 +425,7 @@ self.svnRelocateAct = E5Action( self.tr('Relocate'), - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr('Relocate...'), 0, 0, self, 'pysvn_relocate') self.svnRelocateAct.setStatusTip(self.tr( @@ -441,7 +441,7 @@ self.svnRepoBrowserAct = E5Action( self.tr('Repository Browser'), - UI.PixmapCache.getIcon("vcsRepoBrowser.png"), + UI.PixmapCache.getIcon("vcsRepoBrowser"), self.tr('Repository Browser...'), 0, 0, self, 'pysvn_repo_browser') self.svnRepoBrowserAct.setStatusTip(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -48,8 +48,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -56,8 +56,8 @@ self.buttonBox.button(QDialogButtonBox.Ok).hide() self.buttonBox.button(QDialogButtonBox.Cancel).hide() - self.__dirIcon = UI.PixmapCache.getIcon("dirClosed.png") - self.__fileIcon = UI.PixmapCache.getIcon("fileMisc.png") + self.__dirIcon = UI.PixmapCache.getIcon("dirClosed") + self.__fileIcon = UI.PixmapCache.getIcon("fileMisc") self.__urlRole = Qt.UserRole self.__ignoreExpand = False
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -210,28 +210,28 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) if 1 in self.browser.specialMenuEntries: self.vcsMenuAddTree = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add tree to repository'), self._VCSAddTree) self.vcsAddMenuActions.append(self.vcsMenuAddTree) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) @@ -252,35 +252,35 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side'), self.__SVNSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsSbsDiff.png"), + UI.PixmapCache.getIcon("vcsSbsDiff"), self.tr('Show differences side-by-side (extended)'), self.__SVNSbsExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) @@ -290,11 +290,11 @@ self.vcsMenuActions.append(self.blameAct) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) act = menu.addAction( @@ -303,19 +303,19 @@ if self.vcs.version >= (1, 2, 0): menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLock.png"), + UI.PixmapCache.getIcon("vcsLock"), self.tr('Lock'), self.__SVNLock) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Unlock'), self.__SVNUnlock) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Break Lock'), self.__SVNBreakLock) self.vcsMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Steal Lock'), self.__SVNStealLock) self.vcsMenuActions.append(act) menu.addSeparator() @@ -365,26 +365,26 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddMultiMenuActions.append(act) if 1 in self.browser.specialMenuEntries: self.vcsMultiMenuAddTree = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add tree to repository'), self._VCSAddTree) self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) @@ -400,27 +400,27 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( @@ -429,19 +429,19 @@ if self.vcs.version >= (1, 2, 0): menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLock.png"), + UI.PixmapCache.getIcon("vcsLock"), self.tr('Lock'), self.__SVNLock) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Unlock'), self.__SVNUnlock) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Break Lock'), self.__SVNBreakLock) self.vcsMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsUnlock.png"), + UI.PixmapCache.getIcon("vcsUnlock"), self.tr('Steal Lock'), self.__SVNStealLock) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -526,21 +526,21 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) @@ -561,36 +561,36 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsDirMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) act = menu.addAction( @@ -645,21 +645,21 @@ menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('Update from repository'), self._VCSUpdate) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsAdd.png"), + UI.PixmapCache.getIcon("vcsAdd"), self.tr('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsRemove.png"), + UI.PixmapCache.getIcon("vcsRemove"), self.tr('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) @@ -675,31 +675,31 @@ self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show status'), self._VCSStatus) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Revert changes'), self._VCSRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sun Apr 12 19:07:49 2020 +0200 @@ -49,7 +49,7 @@ """ self.vcsNewAct = E5Action( self.tr('New from repository'), - UI.PixmapCache.getIcon("vcsCheckout.png"), + UI.PixmapCache.getIcon("vcsCheckout"), self.tr('&New from repository...'), 0, 0, self, 'subversion_new') self.vcsNewAct.setStatusTip(self.tr( @@ -65,7 +65,7 @@ self.vcsUpdateAct = E5Action( self.tr('Update from repository'), - UI.PixmapCache.getIcon("vcsUpdate.png"), + UI.PixmapCache.getIcon("vcsUpdate"), self.tr('&Update from repository'), 0, 0, self, 'subversion_update') self.vcsUpdateAct.setStatusTip(self.tr( @@ -81,7 +81,7 @@ self.vcsCommitAct = E5Action( self.tr('Commit changes to repository'), - UI.PixmapCache.getIcon("vcsCommit.png"), + UI.PixmapCache.getIcon("vcsCommit"), self.tr('&Commit changes to repository...'), 0, 0, self, 'subversion_commit') self.vcsCommitAct.setStatusTip(self.tr( @@ -97,7 +97,7 @@ self.svnLogBrowserAct = E5Action( self.tr('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), + UI.PixmapCache.getIcon("vcsLog"), self.tr('Show log browser'), 0, 0, self, 'subversion_log_browser') self.svnLogBrowserAct.setStatusTip(self.tr( @@ -114,7 +114,7 @@ self.vcsDiffAct = E5Action( self.tr('Show differences'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show &difference'), 0, 0, self, 'subversion_diff') self.vcsDiffAct.setStatusTip(self.tr( @@ -130,7 +130,7 @@ self.svnExtDiffAct = E5Action( self.tr('Show differences (extended)'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (extended)'), 0, 0, self, 'subversion_extendeddiff') self.svnExtDiffAct.setStatusTip(self.tr( @@ -146,7 +146,7 @@ self.svnUrlDiffAct = E5Action( self.tr('Show differences (URLs)'), - UI.PixmapCache.getIcon("vcsDiff.png"), + UI.PixmapCache.getIcon("vcsDiff"), self.tr('Show differences (URLs)'), 0, 0, self, 'subversion_urldiff') self.svnUrlDiffAct.setStatusTip(self.tr( @@ -162,7 +162,7 @@ self.vcsStatusAct = E5Action( self.tr('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), + UI.PixmapCache.getIcon("vcsStatus"), self.tr('Show &status'), 0, 0, self, 'subversion_status') self.vcsStatusAct.setStatusTip(self.tr( @@ -177,7 +177,7 @@ self.svnChangeListsAct = E5Action( self.tr('Show change lists'), - UI.PixmapCache.getIcon("vcsChangeLists.png"), + UI.PixmapCache.getIcon("vcsChangeLists"), self.tr('Show change lists'), 0, 0, self, 'subversion_changelists') self.svnChangeListsAct.setStatusTip(self.tr( @@ -193,7 +193,7 @@ self.vcsTagAct = E5Action( self.tr('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), + UI.PixmapCache.getIcon("vcsTag"), self.tr('&Tag in repository...'), 0, 0, self, 'subversion_tag') self.vcsTagAct.setStatusTip(self.tr( @@ -208,7 +208,7 @@ self.vcsExportAct = E5Action( self.tr('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), + UI.PixmapCache.getIcon("vcsExport"), self.tr('&Export from repository...'), 0, 0, self, 'subversion_export') self.vcsExportAct.setStatusTip(self.tr( @@ -236,7 +236,7 @@ self.vcsRevertAct = E5Action( self.tr('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), + UI.PixmapCache.getIcon("vcsRevert"), self.tr('Re&vert changes'), 0, 0, self, 'subversion_revert') self.vcsRevertAct.setStatusTip(self.tr( @@ -251,7 +251,7 @@ self.vcsMergeAct = E5Action( self.tr('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), + UI.PixmapCache.getIcon("vcsMerge"), self.tr('Mer&ge changes...'), 0, 0, self, 'subversion_merge') self.vcsMergeAct.setStatusTip(self.tr( @@ -267,7 +267,7 @@ self.vcsSwitchAct = E5Action( self.tr('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr('S&witch...'), 0, 0, self, 'subversion_switch') self.vcsSwitchAct.setStatusTip(self.tr( @@ -409,7 +409,7 @@ self.svnRelocateAct = E5Action( self.tr('Relocate'), - UI.PixmapCache.getIcon("vcsSwitch.png"), + UI.PixmapCache.getIcon("vcsSwitch"), self.tr('Relocate...'), 0, 0, self, 'subversion_relocate') self.svnRelocateAct.setStatusTip(self.tr( @@ -425,7 +425,7 @@ self.svnRepoBrowserAct = E5Action( self.tr('Repository Browser'), - UI.PixmapCache.getIcon("vcsRepoBrowser.png"), + UI.PixmapCache.getIcon("vcsRepoBrowser"), self.tr('Repository Browser...'), 0, 0, self, 'subversion_repo_browser') self.svnRepoBrowserAct.setStatusTip(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -47,8 +47,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -61,8 +61,8 @@ self.buttonBox.button(QDialogButtonBox.Ok).hide() self.buttonBox.button(QDialogButtonBox.Cancel).hide() - self.__dirIcon = UI.PixmapCache.getIcon("dirClosed.png") - self.__fileIcon = UI.PixmapCache.getIcon("fileMisc.png") + self.__dirIcon = UI.PixmapCache.getIcon("dirClosed") + self.__fileIcon = UI.PixmapCache.getIcon("fileMisc") self.__urlRole = Qt.UserRole self.__ignoreExpand = False
--- a/eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sun Apr 12 19:07:49 2020 +0200 @@ -253,23 +253,23 @@ """ self.__menu = QMenu(self) 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( @@ -277,7 +277,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( @@ -596,13 +596,13 @@ index = self.editors.index(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") item = self.viewlist.item(index) if item: item.setIcon(UI.PixmapCache.getCombinedIcon(keys)) @@ -620,13 +620,13 @@ index = self.editors.index(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") item = self.viewlist.item(index) if item: item.setIcon(UI.PixmapCache.getCombinedIcon(keys))
--- 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)
--- a/eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -104,7 +104,7 @@ projectOpen = e5App().getObject("Project").isOpen() self.projectButton.setEnabled(projectOpen) - icon = UI.PixmapCache.getIcon("listSelection.png") + icon = UI.PixmapCache.getIcon("listSelection") self.categoriesButton.setIcon(icon) self.onlyShowButton.setIcon(icon) self.notShowButton.setIcon(icon)
--- a/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -44,32 +44,32 @@ self.setupUi(self) # initialize icons of the tool buttons - self.commentButton.setIcon(UI.PixmapCache.getIcon("comment.png")) - self.charButton.setIcon(UI.PixmapCache.getIcon("characters.png")) - self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png")) - self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png")) - self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup.png")) - self.groupButton.setIcon(UI.PixmapCache.getIcon("group.png")) - self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup.png")) + self.commentButton.setIcon(UI.PixmapCache.getIcon("comment")) + self.charButton.setIcon(UI.PixmapCache.getIcon("characters")) + self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar")) + self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat")) + self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup")) + self.groupButton.setIcon(UI.PixmapCache.getIcon("group")) + self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup")) self.namedReferenceButton.setIcon( - UI.PixmapCache.getIcon("namedreference.png")) - self.altnButton.setIcon(UI.PixmapCache.getIcon("altn.png")) - self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline.png")) - self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline.png")) + UI.PixmapCache.getIcon("namedreference")) + self.altnButton.setIcon(UI.PixmapCache.getIcon("altn")) + self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline")) + self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline")) self.wordboundButton.setIcon( - UI.PixmapCache.getIcon("wordboundary.png")) + UI.PixmapCache.getIcon("wordboundary")) self.nonwordboundButton.setIcon( - UI.PixmapCache.getIcon("nonwordboundary.png")) + UI.PixmapCache.getIcon("nonwordboundary")) self.poslookaheadButton.setIcon( - UI.PixmapCache.getIcon("poslookahead.png")) + UI.PixmapCache.getIcon("poslookahead")) self.neglookaheadButton.setIcon( - UI.PixmapCache.getIcon("neglookahead.png")) + UI.PixmapCache.getIcon("neglookahead")) self.poslookbehindButton.setIcon( - UI.PixmapCache.getIcon("poslookbehind.png")) + UI.PixmapCache.getIcon("poslookbehind")) self.neglookbehindButton.setIcon( - UI.PixmapCache.getIcon("neglookbehind.png")) - self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo.png")) - self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo.png")) + UI.PixmapCache.getIcon("neglookbehind")) + self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo")) + self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo")) self.namedGroups = re.compile(r"""\(?P<([^>]+)>""").findall
--- a/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -44,36 +44,36 @@ # initialize icons of the tool buttons # regexp tool buttons - self.charButton.setIcon(UI.PixmapCache.getIcon("characters.png")) - self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png")) - self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png")) - self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup.png")) - self.groupButton.setIcon(UI.PixmapCache.getIcon("group.png")) - self.altnButton.setIcon(UI.PixmapCache.getIcon("altn.png")) - self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline.png")) - self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline.png")) + self.charButton.setIcon(UI.PixmapCache.getIcon("characters")) + self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar")) + self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat")) + self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup")) + self.groupButton.setIcon(UI.PixmapCache.getIcon("group")) + self.altnButton.setIcon(UI.PixmapCache.getIcon("altn")) + self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline")) + self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline")) self.wordboundButton.setIcon( - UI.PixmapCache.getIcon("wordboundary.png")) + UI.PixmapCache.getIcon("wordboundary")) self.nonwordboundButton.setIcon( - UI.PixmapCache.getIcon("nonwordboundary.png")) + UI.PixmapCache.getIcon("nonwordboundary")) self.poslookaheadButton.setIcon( - UI.PixmapCache.getIcon("poslookahead.png")) + UI.PixmapCache.getIcon("poslookahead")) self.neglookaheadButton.setIcon( - UI.PixmapCache.getIcon("neglookahead.png")) - self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo.png")) - self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo.png")) + UI.PixmapCache.getIcon("neglookahead")) + self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo")) + self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo")) # wildcard tool buttons self.wildcardCharButton.setIcon( - UI.PixmapCache.getIcon("characters.png")) + UI.PixmapCache.getIcon("characters")) self.wildcardAnycharButton.setIcon( - UI.PixmapCache.getIcon("anychar.png")) - self.wildcardRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png")) + UI.PixmapCache.getIcon("anychar")) + self.wildcardRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat")) # W3C tool buttons - self.w3cCharButton.setIcon(UI.PixmapCache.getIcon("characters.png")) - self.w3cAnycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png")) - self.w3cRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png")) - self.w3cGroupButton.setIcon(UI.PixmapCache.getIcon("group.png")) - self.w3cAltnButton.setIcon(UI.PixmapCache.getIcon("altn.png")) + self.w3cCharButton.setIcon(UI.PixmapCache.getIcon("characters")) + self.w3cAnycharButton.setIcon(UI.PixmapCache.getIcon("anychar")) + self.w3cRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat")) + self.w3cGroupButton.setIcon(UI.PixmapCache.getIcon("group")) + self.w3cAltnButton.setIcon(UI.PixmapCache.getIcon("altn")) # initialize the syntax pattern combo self.syntaxCombo.addItem("RegExp", QRegExp.RegExp)
--- a/eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -49,34 +49,34 @@ self.setupUi(self) # initialize icons of the tool buttons - self.commentButton.setIcon(UI.PixmapCache.getIcon("comment.png")) - self.charButton.setIcon(UI.PixmapCache.getIcon("characters.png")) - self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png")) - self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png")) - self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup.png")) + self.commentButton.setIcon(UI.PixmapCache.getIcon("comment")) + self.charButton.setIcon(UI.PixmapCache.getIcon("characters")) + self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar")) + self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat")) + self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup")) self.atomicGroupButton.setIcon( - UI.PixmapCache.getIcon("atomicgroup.png")) - self.groupButton.setIcon(UI.PixmapCache.getIcon("group.png")) - self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup.png")) + UI.PixmapCache.getIcon("atomicgroup")) + self.groupButton.setIcon(UI.PixmapCache.getIcon("group")) + self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup")) self.namedReferenceButton.setIcon( - UI.PixmapCache.getIcon("namedreference.png")) - self.altnButton.setIcon(UI.PixmapCache.getIcon("altn.png")) - self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline.png")) - self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline.png")) + UI.PixmapCache.getIcon("namedreference")) + self.altnButton.setIcon(UI.PixmapCache.getIcon("altn")) + self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline")) + self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline")) self.wordboundButton.setIcon( - UI.PixmapCache.getIcon("wordboundary.png")) + UI.PixmapCache.getIcon("wordboundary")) self.nonwordboundButton.setIcon( - UI.PixmapCache.getIcon("nonwordboundary.png")) + UI.PixmapCache.getIcon("nonwordboundary")) self.poslookaheadButton.setIcon( - UI.PixmapCache.getIcon("poslookahead.png")) + UI.PixmapCache.getIcon("poslookahead")) self.neglookaheadButton.setIcon( - UI.PixmapCache.getIcon("neglookahead.png")) + UI.PixmapCache.getIcon("neglookahead")) self.poslookbehindButton.setIcon( - UI.PixmapCache.getIcon("poslookbehind.png")) + UI.PixmapCache.getIcon("poslookbehind")) self.neglookbehindButton.setIcon( - UI.PixmapCache.getIcon("neglookbehind.png")) - self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo.png")) - self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo.png")) + UI.PixmapCache.getIcon("neglookbehind")) + self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo")) + self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo")) self.namedGroups = re.compile(r"""\(?P<([^>]+)>""").findall
--- a/eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -55,9 +55,9 @@ self.__packageRootDirCompleter = E5DirCompleter(self.packageRootEdit) self.__sourceDirCompleter = E5DirCompleter(self.sourceDirectoryEdit) - self.packageRootDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) - self.packageDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) - self.sourceDirectoryButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.packageRootDirButton.setIcon(UI.PixmapCache.getIcon("open")) + self.packageDirButton.setIcon(UI.PixmapCache.getIcon("open")) + self.sourceDirectoryButton.setIcon(UI.PixmapCache.getIcon("open")) self.variantComboBox.addItem(self.tr("distutils"), "distutils.core") self.variantComboBox.addItem(self.tr("setuptools"), "setuptools")
--- a/eric6/Preferences/ConfigurationDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/ConfigurationDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -140,235 +140,235 @@ # create the configuration page. This must have the method # 'save' to save the settings. "applicationPage": - [self.tr("Application"), "preferences-application.png", + [self.tr("Application"), "preferences-application", "ApplicationPage", None, None], "condaPage": - [self.tr("Conda"), "miniconda.png", + [self.tr("Conda"), "miniconda", "CondaPage", None, None], "cooperationPage": - [self.tr("Cooperation"), "preferences-cooperation.png", + [self.tr("Cooperation"), "preferences-cooperation", "CooperationPage", None, None], "corbaPage": - [self.tr("CORBA"), "preferences-orbit.png", + [self.tr("CORBA"), "preferences-orbit", "CorbaPage", None, None], "diffPage": - [self.tr("Diff"), "diffFiles.png", + [self.tr("Diff"), "diffFiles", "DiffColoursPage", None, None], "emailPage": - [self.tr("Email"), "preferences-mail_generic.png", + [self.tr("Email"), "preferences-mail_generic", "EmailPage", None, None], "graphicsPage": - [self.tr("Graphics"), "preferences-graphics.png", + [self.tr("Graphics"), "preferences-graphics", "GraphicsPage", None, None], "hexEditorPage": - [self.tr("Hex Editor"), "hexEditor.png", + [self.tr("Hex Editor"), "hexEditor", "HexEditorPage", None, None], "iconsPage": - [self.tr("Icons"), "preferences-icons.png", + [self.tr("Icons"), "preferences-icons", "IconsPage", None, None], "ircPage": - [self.tr("IRC"), "irc.png", + [self.tr("IRC"), "irc", "IrcPage", None, None], "logViewerPage": - [self.tr("Log-Viewer"), "preferences-logviewer.png", + [self.tr("Log-Viewer"), "preferences-logviewer", "LogViewerPage", None, None], "microPythonPage": [self.tr("MicroPython"), "micropython", "MicroPythonPage", None, None], "mimeTypesPage": - [self.tr("Mimetypes"), "preferences-mimetypes.png", + [self.tr("Mimetypes"), "preferences-mimetypes", "MimeTypesPage", None, None], "networkPage": - [self.tr("Network"), "preferences-network.png", + [self.tr("Network"), "preferences-network", "NetworkPage", None, None], "notificationsPage": [self.tr("Notifications"), - "preferences-notifications.png", + "preferences-notifications", "NotificationsPage", None, None], "pipPage": - [self.tr("Python Package Management"), "pypi.png", + [self.tr("Python Package Management"), "pypi", "PipPage", None, None], "pluginManagerPage": [self.tr("Plugin Manager"), - "preferences-pluginmanager.png", + "preferences-pluginmanager", "PluginManagerPage", None, None], "printerPage": - [self.tr("Printer"), "preferences-printer.png", + [self.tr("Printer"), "preferences-printer", "PrinterPage", None, None], "protobufPage": - [self.tr("Protobuf"), "protobuf.png", + [self.tr("Protobuf"), "protobuf", "ProtobufPage", None, None], "pythonPage": - [self.tr("Python"), "preferences-python.png", + [self.tr("Python"), "preferences-python", "PythonPage", None, None], "qtPage": - [self.tr("Qt"), "preferences-qtlogo.png", + [self.tr("Qt"), "preferences-qtlogo", "QtPage", None, None], "securityPage": - [self.tr("Security"), "preferences-security.png", + [self.tr("Security"), "preferences-security", "SecurityPage", None, None], "shellPage": - [self.tr("Shell"), "preferences-shell.png", + [self.tr("Shell"), "preferences-shell", "ShellPage", None, None], "tasksPage": - [self.tr("Tasks"), "task.png", + [self.tr("Tasks"), "task", "TasksPage", None, None], "templatesPage": - [self.tr("Templates"), "preferences-template.png", + [self.tr("Templates"), "preferences-template", "TemplatesPage", None, None], "trayStarterPage": - [self.tr("Tray Starter"), "erict.png", + [self.tr("Tray Starter"), "erict", "TrayStarterPage", None, None], "vcsPage": [self.tr("Version Control Systems"), - "preferences-vcs.png", + "preferences-vcs", "VcsPage", None, None], "0debuggerPage": - [self.tr("Debugger"), "preferences-debugger.png", + [self.tr("Debugger"), "preferences-debugger", None, None, None], "debuggerGeneralPage": - [self.tr("General"), "preferences-debugger.png", + [self.tr("General"), "preferences-debugger", "DebuggerGeneralPage", "0debuggerPage", None], "debuggerPython2Page": - [self.tr("Python2"), "preferences-pyDebugger.png", + [self.tr("Python2"), "preferences-pyDebugger", "DebuggerPython2Page", "0debuggerPage", None], "debuggerPython3Page": - [self.tr("Python3"), "preferences-pyDebugger.png", + [self.tr("Python3"), "preferences-pyDebugger", "DebuggerPython3Page", "0debuggerPage", None], "0editorPage": - [self.tr("Editor"), "preferences-editor.png", + [self.tr("Editor"), "preferences-editor", None, None, None], "editorAPIsPage": - [self.tr("APIs"), "preferences-api.png", + [self.tr("APIs"), "preferences-api", "EditorAPIsPage", "0editorPage", None], "editorAutocompletionPage": [self.tr("Autocompletion"), - "preferences-autocompletion.png", + "preferences-autocompletion", "EditorAutocompletionPage", "0editorPage", None], "editorAutocompletionQScintillaPage": - [self.tr("QScintilla"), "qscintilla.png", + [self.tr("QScintilla"), "qscintilla", "EditorAutocompletionQScintillaPage", "editorAutocompletionPage", None], "editorCalltipsPage": - [self.tr("Calltips"), "preferences-calltips.png", + [self.tr("Calltips"), "preferences-calltips", "EditorCalltipsPage", "0editorPage", None], "editorCalltipsQScintillaPage": - [self.tr("QScintilla"), "qscintilla.png", + [self.tr("QScintilla"), "qscintilla", "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], "editorDocViewerPage": - [self.tr("Documentation Viewer"), "codeDocuViewer.png", + [self.tr("Documentation Viewer"), "codeDocuViewer", "EditorDocViewerPage", "0editorPage", None], "editorGeneralPage": - [self.tr("General"), "preferences-general.png", + [self.tr("General"), "preferences-general", "EditorGeneralPage", "0editorPage", None], "editorFilePage": [self.tr("Filehandling"), - "preferences-filehandling.png", + "preferences-filehandling", "EditorFilePage", "0editorPage", None], "editorSearchPage": - [self.tr("Searching"), "preferences-search.png", + [self.tr("Searching"), "preferences-search", "EditorSearchPage", "0editorPage", None], "editorSpellCheckingPage": [self.tr("Spell checking"), - "preferences-spellchecking.png", + "preferences-spellchecking", "EditorSpellCheckingPage", "0editorPage", None], "editorStylesPage": - [self.tr("Style"), "preferences-styles.png", + [self.tr("Style"), "preferences-styles", "EditorStylesPage", "0editorPage", None], "editorSyntaxPage": - [self.tr("Code Checkers"), "preferences-debugger.png", + [self.tr("Code Checkers"), "preferences-debugger", "EditorSyntaxPage", "0editorPage", None], "editorTypingPage": - [self.tr("Typing"), "preferences-typing.png", + [self.tr("Typing"), "preferences-typing", "EditorTypingPage", "0editorPage", None], "editorExportersPage": - [self.tr("Exporters"), "preferences-exporters.png", + [self.tr("Exporters"), "preferences-exporters", "EditorExportersPage", "0editorPage", None], "1editorLexerPage": [self.tr("Highlighters"), - "preferences-highlighting-styles.png", + "preferences-highlighting-styles", None, "0editorPage", None], "editorHighlightersPage": [self.tr("Filetype Associations"), - "preferences-highlighter-association.png", + "preferences-highlighter-association", "EditorHighlightersPage", "1editorLexerPage", None], "editorHighlightingStylesPage": [self.tr("Styles"), - "preferences-highlighting-styles.png", + "preferences-highlighting-styles", "EditorHighlightingStylesPage", "1editorLexerPage", None], "editorKeywordsPage": - [self.tr("Keywords"), "preferences-keywords.png", + [self.tr("Keywords"), "preferences-keywords", "EditorKeywordsPage", "1editorLexerPage", None], "editorPropertiesPage": - [self.tr("Properties"), "preferences-properties.png", + [self.tr("Properties"), "preferences-properties", "EditorPropertiesPage", "1editorLexerPage", None], "1editorMouseClickHandlers": [self.tr("Mouse Click Handlers"), - "preferences-mouse-click-handler.png", + "preferences-mouse-click-handler", "EditorMouseClickHandlerPage", "0editorPage", None], "0helpPage": - [self.tr("Help"), "preferences-help.png", + [self.tr("Help"), "preferences-help", None, None, None], "helpDocumentationPage": [self.tr("Help Documentation"), - "preferences-helpdocumentation.png", + "preferences-helpdocumentation", "HelpDocumentationPage", "0helpPage", None], "helpViewersPage": [self.tr("Help Viewers"), - "preferences-helpviewers.png", + "preferences-helpviewers", "HelpViewersPage", "0helpPage", None], "0projectPage": - [self.tr("Project"), "preferences-project.png", + [self.tr("Project"), "preferences-project", None, None, None], "projectBrowserPage": - [self.tr("Project Viewer"), "preferences-project.png", + [self.tr("Project Viewer"), "preferences-project", "ProjectBrowserPage", "0projectPage", None], "projectPage": - [self.tr("Project"), "preferences-project.png", + [self.tr("Project"), "preferences-project", "ProjectPage", "0projectPage", None], "multiProjectPage": [self.tr("Multiproject"), - "preferences-multiproject.png", + "preferences-multiproject", "MultiProjectPage", "0projectPage", None], "0interfacePage": - [self.tr("Interface"), "preferences-interface.png", + [self.tr("Interface"), "preferences-interface", None, None, None], "interfacePage": - [self.tr("Interface"), "preferences-interface.png", + [self.tr("Interface"), "preferences-interface", "InterfacePage", "0interfacePage", None], "viewmanagerPage": - [self.tr("Viewmanager"), "preferences-viewmanager.png", + [self.tr("Viewmanager"), "preferences-viewmanager", "ViewmanagerPage", "0interfacePage", None], } if self.__webEngine: self.configItems.update({ "0webBrowserPage": - [self.tr("Web Browser"), "ericWeb.png", + [self.tr("Web Browser"), "ericWeb", None, None, None], "webBrowserAppearancePage": - [self.tr("Appearance"), "preferences-styles.png", + [self.tr("Appearance"), "preferences-styles", "WebBrowserAppearancePage", "0webBrowserPage", None], "webBrowserPage": - [self.tr("eric6 Web Browser"), "ericWeb.png", + [self.tr("eric6 Web Browser"), "ericWeb", "WebBrowserPage", "0webBrowserPage", None], "webBrowserFlashCookieManagerPage": [self.tr("Flash Cookie Manager"), - "flashCookie16.png", + "flashCookie16", "WebBrowserFlashCookieManagerPage", "0webBrowserPage", None], "webBrowserVirusTotalPage": - [self.tr("VirusTotal Interface"), "virustotal.png", + [self.tr("VirusTotal Interface"), "virustotal", "WebBrowserVirusTotalPage", "0webBrowserPage", None], "webBrowserSpellCheckingPage": [self.tr("Spell checking"), - "preferences-spellchecking.png", + "preferences-spellchecking", "WebBrowserSpellCheckingPage", "0webBrowserPage", None], }) @@ -385,41 +385,41 @@ # create the configuration page. This must have the method # 'save' to save the settings. "interfacePage": - [self.tr("Interface"), "preferences-interface.png", + [self.tr("Interface"), "preferences-interface", "WebBrowserInterfacePage", None, None], "networkPage": - [self.tr("Network"), "preferences-network.png", + [self.tr("Network"), "preferences-network", "NetworkPage", None, None], "printerPage": - [self.tr("Printer"), "preferences-printer.png", + [self.tr("Printer"), "preferences-printer", "PrinterPage", None, None], "securityPage": - [self.tr("Security"), "preferences-security.png", + [self.tr("Security"), "preferences-security", "SecurityPage", None, None], "helpDocumentationPage": [self.tr("Help Documentation"), - "preferences-helpdocumentation.png", + "preferences-helpdocumentation", "HelpDocumentationPage", None, None], "webBrowserAppearancePage": - [self.tr("Appearance"), "preferences-styles.png", + [self.tr("Appearance"), "preferences-styles", "WebBrowserAppearancePage", None, None], "webBrowserPage": - [self.tr("eric6 Web Browser"), "ericWeb.png", + [self.tr("eric6 Web Browser"), "ericWeb", "WebBrowserPage", None, None], "webBrowserFlashCookieManagerPage": [self.tr("Flash Cookie Manager"), - "flashCookie16.png", + "flashCookie16", "WebBrowserFlashCookieManagerPage", None, None], "webBrowserVirusTotalPage": - [self.tr("VirusTotal Interface"), "virustotal.png", + [self.tr("VirusTotal Interface"), "virustotal", "WebBrowserVirusTotalPage", None, None], "webBrowserSpellCheckingPage": [self.tr("Spell checking"), - "preferences-spellchecking.png", + "preferences-spellchecking", "WebBrowserSpellCheckingPage", None, None], } @@ -432,7 +432,7 @@ # create the configuration page. This must have the method # 'save' to save the settings. "trayStarterPage": - [self.tr("Tray Starter"), "erict.png", + [self.tr("Tray Starter"), "erict", "TrayStarterPage", None, None], } @@ -445,7 +445,7 @@ # create the configuration page. This must have the method # 'save' to save the settings. "hexEditorPage": - [self.tr("Hex Editor"), "hexEditor.png", + [self.tr("Hex Editor"), "hexEditor", "HexEditorPage", None, None], }
--- a/eric6/Preferences/ConfigurationPages/DebuggerPython2Page.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/DebuggerPython2Page.py Sun Apr 12 19:07:49 2020 +0200 @@ -38,7 +38,7 @@ from VirtualEnv.VirtualenvManager import VirtualenvManager self.__virtualenvManager = VirtualenvManager() - self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv.png")) + self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv")) self.debugClientPicker.setMode(E5PathPickerModes.OpenFileMode) self.debugClientPicker.setToolTip(self.tr(
--- a/eric6/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Apr 12 19:07:49 2020 +0200 @@ -38,7 +38,7 @@ from VirtualEnv.VirtualenvManager import VirtualenvManager self.__virtualenvManager = VirtualenvManager() - self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv.png")) + self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv")) self.debugClientPicker.setMode(E5PathPickerModes.OpenFileMode) self.debugClientPicker.setToolTip(self.tr(
--- a/eric6/Preferences/ConfigurationPages/NotificationsPage.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/NotificationsPage.py Sun Apr 12 19:07:49 2020 +0200 @@ -86,7 +86,7 @@ self.__notification = NotificationWidget( parent=self, setPosition=True) self.__notification.setPixmap( - UI.PixmapCache.getPixmap("notification48.png")) + UI.PixmapCache.getPixmap("notification48")) self.__notification.setHeading(self.tr("Visual Selection")) self.__notification.setText( self.tr("Drag the notification window to"
--- a/eric6/Preferences/ConfigurationPages/TrayStarterPage.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/TrayStarterPage.py Sun Apr 12 19:07:49 2020 +0200 @@ -7,6 +7,7 @@ Module implementing the tray starter configuration page. """ +import os from .ConfigurationPageBase import ConfigurationPageBase from .Ui_TrayStarterPage import Ui_TrayStarterPage @@ -27,21 +28,22 @@ self.setupUi(self) self.setObjectName("TrayStarterPage") - self.standardButton.setIcon(UI.PixmapCache.getIcon("erict.png")) - self.highContrastButton.setIcon(UI.PixmapCache.getIcon("erict-hc.png")) - self.blackWhiteButton.setIcon(UI.PixmapCache.getIcon("erict-bw.png")) + self.standardButton.setIcon(UI.PixmapCache.getIcon("erict")) + self.highContrastButton.setIcon(UI.PixmapCache.getIcon("erict-hc")) + self.blackWhiteButton.setIcon(UI.PixmapCache.getIcon("erict-bw")) self.blackWhiteInverseButton.setIcon( - UI.PixmapCache.getIcon("erict-bwi.png")) + UI.PixmapCache.getIcon("erict-bwi")) # set initial values - iconName = Preferences.getTrayStarter("TrayStarterIcon") - if iconName == "erict.png": + iconName = os.path.splitext( + Preferences.getTrayStarter("TrayStarterIcon"))[0] + if iconName == "erict": self.standardButton.setChecked(True) - elif iconName == "erict-hc.png": + elif iconName == "erict-hc": self.highContrastButton.setChecked(True) - elif iconName == "erict-bw.png": + elif iconName == "erict-bw": self.blackWhiteButton.setChecked(True) - elif iconName == "erict-bwi.png": + elif iconName == "erict-bwi": self.blackWhiteInverseButton.setChecked(True) def save(self): @@ -49,13 +51,13 @@ Public slot to save the Python configuration. """ if self.standardButton.isChecked(): - iconName = "erict.png" + iconName = "erict" elif self.highContrastButton.isChecked(): - iconName = "erict-hc.png" + iconName = "erict-hc" elif self.blackWhiteButton.isChecked(): - iconName = "erict-bw.png" + iconName = "erict-bw" elif self.blackWhiteInverseButton.isChecked(): - iconName = "erict-bwi.png" + iconName = "erict-bwi" Preferences.setTrayStarter("TrayStarterIcon", iconName)
--- a/eric6/Preferences/ConfigurationPages/WebBrowserPage.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserPage.py Sun Apr 12 19:07:49 2020 +0200 @@ -190,7 +190,7 @@ ): self.imageSearchComboBox.addItem( UI.PixmapCache.getIcon( - "{0}.png".format(engineName.lower())), + "{0}".format(engineName.lower())), engineName) index = self.imageSearchComboBox.findText( Preferences.getWebBrowser("ImageSearchEngine"))
--- a/eric6/Preferences/__init__.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Preferences/__init__.py Sun Apr 12 19:07:49 2020 +0200 @@ -1338,9 +1338,9 @@ # defaults for tray starter trayStarterDefaults = { - "TrayStarterIcon": "erict.png", - # valid values are: erict.png, erict-hc.png, - # erict-bw.png, erict-bwi.png + "TrayStarterIcon": "erict", + # valid values are: erict, erict-hc, + # erict-bw, erict-bwi } # defaults for geometry
--- a/eric6/Project/DebuggerPropertiesDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/DebuggerPropertiesDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -52,7 +52,7 @@ QComboBox.AdjustToMinimumContentsLength) self.debugClientPicker.setPathsList(debugClientsHistory) self.debugClientClearHistoryButton.setIcon( - UI.PixmapCache.getIcon("editDelete.png")) + UI.PixmapCache.getIcon("editDelete")) venvManager = e5App().getObject("VirtualEnvManager")
--- a/eric6/Project/IdlCompilerOptionsDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/IdlCompilerOptionsDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -47,17 +47,17 @@ self.__project = project - self.idAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.idDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.idEditButton.setIcon(UI.PixmapCache.getIcon("edit.png")) + self.idAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.idDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.idEditButton.setIcon(UI.PixmapCache.getIcon("edit")) - self.dnAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.dnDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.dnEditButton.setIcon(UI.PixmapCache.getIcon("edit.png")) + self.dnAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.dnDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.dnEditButton.setIcon(UI.PixmapCache.getIcon("edit")) - self.unAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.unDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.unEditButton.setIcon(UI.PixmapCache.getIcon("edit.png")) + self.unAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.unDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.unEditButton.setIcon(UI.PixmapCache.getIcon("edit")) self.__populateIncludeDirectoriesList(includeDirectories) self.__populateDefineNamesList(definedNames)
--- a/eric6/Project/Project.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/Project.py Sun Apr 12 19:07:49 2020 +0200 @@ -3865,7 +3865,7 @@ act = E5Action( self.tr('New project'), - UI.PixmapCache.getIcon("projectNew.png"), + UI.PixmapCache.getIcon("projectNew"), self.tr('&New...'), 0, 0, self.actGrp1, 'project_new') act.setStatusTip(self.tr('Generate a new project')) @@ -3879,7 +3879,7 @@ act = E5Action( self.tr('Open project'), - UI.PixmapCache.getIcon("projectOpen.png"), + UI.PixmapCache.getIcon("projectOpen"), self.tr('&Open...'), 0, 0, self.actGrp1, 'project_open') act.setStatusTip(self.tr('Open an existing project')) @@ -3892,7 +3892,7 @@ self.closeAct = E5Action( self.tr('Close project'), - UI.PixmapCache.getIcon("projectClose.png"), + UI.PixmapCache.getIcon("projectClose"), self.tr('&Close'), 0, 0, self, 'project_close') self.closeAct.setStatusTip(self.tr('Close the current project')) self.closeAct.setWhatsThis(self.tr( @@ -3904,7 +3904,7 @@ self.saveAct = E5Action( self.tr('Save project'), - UI.PixmapCache.getIcon("projectSave.png"), + UI.PixmapCache.getIcon("projectSave"), self.tr('&Save'), 0, 0, self, 'project_save') self.saveAct.setStatusTip(self.tr('Save the current project')) self.saveAct.setWhatsThis(self.tr( @@ -3916,7 +3916,7 @@ self.saveasAct = E5Action( self.tr('Save project as'), - UI.PixmapCache.getIcon("projectSaveAs.png"), + UI.PixmapCache.getIcon("projectSaveAs"), self.tr('Save &as...'), 0, 0, self, 'project_save_as') self.saveasAct.setStatusTip(self.tr( 'Save the current project to a new file')) @@ -3931,7 +3931,7 @@ self.addFilesAct = E5Action( self.tr('Add files to project'), - UI.PixmapCache.getIcon("fileMisc.png"), + UI.PixmapCache.getIcon("fileMisc"), self.tr('Add &files...'), 0, 0, self.actGrp2, 'project_add_file') self.addFilesAct.setStatusTip(self.tr( @@ -3947,7 +3947,7 @@ self.addDirectoryAct = E5Action( self.tr('Add directory to project'), - UI.PixmapCache.getIcon("dirOpen.png"), + UI.PixmapCache.getIcon("dirOpen"), self.tr('Add directory...'), 0, 0, self.actGrp2, 'project_add_directory') self.addDirectoryAct.setStatusTip( @@ -3962,7 +3962,7 @@ self.addLanguageAct = E5Action( self.tr('Add translation to project'), - UI.PixmapCache.getIcon("linguist4.png"), + UI.PixmapCache.getIcon("linguist4"), self.tr('Add &translation...'), 0, 0, self.actGrp2, 'project_add_translation') self.addLanguageAct.setStatusTip( @@ -4007,7 +4007,7 @@ self.propsAct = E5Action( self.tr('Project properties'), - UI.PixmapCache.getIcon("projectProps.png"), + UI.PixmapCache.getIcon("projectProps"), self.tr('&Properties...'), 0, 0, self, 'project_properties') self.propsAct.setStatusTip(self.tr('Show the project properties')) @@ -4020,7 +4020,7 @@ self.userPropsAct = E5Action( self.tr('User project properties'), - UI.PixmapCache.getIcon("projectUserProps.png"), + UI.PixmapCache.getIcon("projectUserProps"), self.tr('&User Properties...'), 0, 0, self, 'project_user_properties') self.userPropsAct.setStatusTip(self.tr( @@ -4257,7 +4257,7 @@ self.pluginPkgListAct = E5Action( self.tr('Create Package List'), - UI.PixmapCache.getIcon("pluginArchiveList.png"), + UI.PixmapCache.getIcon("pluginArchiveList"), self.tr('Create &Package List'), 0, 0, self.pluginGrp, 'project_plugin_pkglist') self.pluginPkgListAct.setStatusTip( @@ -4273,7 +4273,7 @@ self.pluginArchiveAct = E5Action( self.tr('Create Plugin Archives'), - UI.PixmapCache.getIcon("pluginArchive.png"), + UI.PixmapCache.getIcon("pluginArchive"), self.tr('Create Plugin &Archives'), 0, 0, self.pluginGrp, 'project_plugin_archive') self.pluginArchiveAct.setStatusTip( @@ -4290,7 +4290,7 @@ self.pluginSArchiveAct = E5Action( self.tr('Create Plugin Archives (Snapshot)'), - UI.PixmapCache.getIcon("pluginArchiveSnapshot.png"), + UI.PixmapCache.getIcon("pluginArchiveSnapshot"), self.tr('Create Plugin Archives (&Snapshot)'), 0, 0, self.pluginGrp, 'project_plugin_sarchive') self.pluginSArchiveAct.setStatusTip(self.tr( @@ -5518,7 +5518,7 @@ "created successfully.</p>") if self.ui.notificationsEnabled(): self.ui.showNotification( - UI.PixmapCache.getPixmap("pluginArchive48.png"), + UI.PixmapCache.getPixmap("pluginArchive48"), self.tr("Create Plugin Archive"), message) else: @@ -5786,7 +5786,7 @@ if self.ui.notificationsEnabled() and not interactive: self.ui.showNotification( - UI.PixmapCache.getPixmap("makefile48.png"), + UI.PixmapCache.getPixmap("makefile48"), title, message) else:
--- a/eric6/Project/ProjectBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -46,7 +46,7 @@ E5TabWidget.__init__(self, parent) self.project = project - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setUsesScrollButtons(True) @@ -180,43 +180,43 @@ if browserFlags & SourcesBrowserFlag: index = self.addTab( self.psBrowser, - UI.PixmapCache.getIcon("projectSources.png"), '') + UI.PixmapCache.getIcon("projectSources"), '') self.setTabToolTip(index, self.psBrowser.windowTitle()) if browserFlags & FormsBrowserFlag: index = self.addTab( self.pfBrowser, - UI.PixmapCache.getIcon("projectForms.png"), '') + UI.PixmapCache.getIcon("projectForms"), '') self.setTabToolTip(index, self.pfBrowser.windowTitle()) if browserFlags & ResourcesBrowserFlag: index = self.addTab( self.prBrowser, - UI.PixmapCache.getIcon("projectResources.png"), '') + UI.PixmapCache.getIcon("projectResources"), '') self.setTabToolTip(index, self.prBrowser.windowTitle()) if browserFlags & TranslationsBrowserFlag: index = self.addTab( self.ptBrowser, - UI.PixmapCache.getIcon("projectTranslations.png"), '') + UI.PixmapCache.getIcon("projectTranslations"), '') self.setTabToolTip(index, self.ptBrowser.windowTitle()) if browserFlags & InterfacesBrowserFlag: index = self.addTab( self.piBrowser, - UI.PixmapCache.getIcon("projectInterfaces.png"), '') + UI.PixmapCache.getIcon("projectInterfaces"), '') self.setTabToolTip(index, self.piBrowser.windowTitle()) if browserFlags & ProtocolsBrowserFlag: index = self.addTab( self.ppBrowser, - UI.PixmapCache.getIcon("protobuf.png"), '') + UI.PixmapCache.getIcon("protobuf"), '') self.setTabToolTip(index, self.ppBrowser.windowTitle()) if browserFlags & OthersBrowserFlag: index = self.addTab( self.poBrowser, - UI.PixmapCache.getIcon("projectOthers.png"), '') + UI.PixmapCache.getIcon("projectOthers"), '') self.setTabToolTip(index, self.poBrowser.windowTitle()) QApplication.processEvents() @@ -281,26 +281,26 @@ Private method to set the right icon for the sources browser tab. """ if not self.project.isOpen(): - icon = UI.PixmapCache.getIcon("projectSources.png") + icon = UI.PixmapCache.getIcon("projectSources") else: if self.project.getProjectLanguage() in [ "Python", "Python2", "Python3" ]: if self.project.isMixedLanguageProject(): - icon = UI.PixmapCache.getIcon("projectSourcesPyMixed.png") + icon = UI.PixmapCache.getIcon("projectSourcesPyMixed") else: - icon = UI.PixmapCache.getIcon("projectSourcesPy.png") + icon = UI.PixmapCache.getIcon("projectSourcesPy") elif self.project.getProjectLanguage() == "MicroPython": icon = UI.PixmapCache.getIcon("micropython") elif self.project.getProjectLanguage() == "Ruby": if self.project.isMixedLanguageProject(): - icon = UI.PixmapCache.getIcon("projectSourcesRbMixed.png") + icon = UI.PixmapCache.getIcon("projectSourcesRbMixed") else: - icon = UI.PixmapCache.getIcon("projectSourcesRb.png") + icon = UI.PixmapCache.getIcon("projectSourcesRb") elif self.project.getProjectLanguage() == "JavaScript": - icon = UI.PixmapCache.getIcon("projectSourcesJavaScript.png") + icon = UI.PixmapCache.getIcon("projectSourcesJavaScript") else: - icon = UI.PixmapCache.getIcon("projectSources.png") + icon = UI.PixmapCache.getIcon("projectSources") self.setTabIcon(self.indexOf(self.psBrowser), icon) def handleEditorChanged(self, fn):
--- a/eric6/Project/ProjectBrowserModel.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectBrowserModel.py Sun Apr 12 19:07:49 2020 +0200 @@ -131,9 +131,9 @@ self.type_ = ProjectBrowserItemSimpleDirectory if os.path.lexists(self._dirName) and os.path.islink(self._dirName): self.symlink = True - self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed.png") + self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed") else: - self.icon = UI.PixmapCache.getIcon("dirClosed.png") + self.icon = UI.PixmapCache.getIcon("dirClosed") def setName(self, dinfo, full=True): """
--- a/eric6/Project/ProjectFormsBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectFormsBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -789,7 +789,7 @@ " was successful.")) else: ui.showNotification( - UI.PixmapCache.getPixmap("designer48.png"), + UI.PixmapCache.getPixmap("designer48"), self.tr("Form Compilation"), self.tr("The compilation of the form file" " was successful.")) @@ -804,7 +804,7 @@ "<p>Reason: {0}</p>").format(str(msg))) else: ui.showNotification( - UI.PixmapCache.getPixmap("designer48.png"), + UI.PixmapCache.getPixmap("designer48"), self.tr("Form Compilation"), self.tr( "<p>The compilation of the form file failed.</p>" @@ -817,7 +817,7 @@ self.tr("The compilation of the form file failed.")) else: ui.showNotification( - UI.PixmapCache.getPixmap("designer48.png"), + UI.PixmapCache.getPixmap("designer48"), self.tr("Form Compilation"), self.tr("The compilation of the form file failed.")) self.compileProc = None
--- a/eric6/Project/ProjectInterfacesBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectInterfacesBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -534,7 +534,7 @@ " successful.")) else: ui.showNotification( - UI.PixmapCache.getPixmap("corba48.png"), + UI.PixmapCache.getPixmap("corba48"), self.tr("Interface Compilation"), self.tr( "The compilation of the interface file was" @@ -548,7 +548,7 @@ "The compilation of the interface file failed.")) else: ui.showNotification( - UI.PixmapCache.getPixmap("corba48.png"), + UI.PixmapCache.getPixmap("corba48"), self.tr("Interface Compilation"), self.tr( "The compilation of the interface file failed."))
--- a/eric6/Project/ProjectProtocolsBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectProtocolsBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -557,9 +557,9 @@ " successful.")) else: if grpc: - icon = UI.PixmapCache.getPixmap("gRPC48.png") + icon = UI.PixmapCache.getPixmap("gRPC48") else: - icon = UI.PixmapCache.getPixmap("protobuf48.png") + icon = UI.PixmapCache.getPixmap("protobuf48") ui.showNotification( icon, self.tr("Protocol Compilation"), @@ -575,9 +575,9 @@ "The compilation of the protocol file failed.")) else: if grpc: - icon = UI.PixmapCache.getPixmap("gRPC48.png") + icon = UI.PixmapCache.getPixmap("gRPC48") else: - icon = UI.PixmapCache.getPixmap("protobuf48.png") + icon = UI.PixmapCache.getPixmap("protobuf48") ui.showNotification( icon, self.tr("Protocol Compilation"),
--- a/eric6/Project/ProjectResourcesBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectResourcesBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -616,7 +616,7 @@ " was successful.")) else: ui.showNotification( - UI.PixmapCache.getPixmap("resourcesCompiler48.png"), + UI.PixmapCache.getPixmap("resourcesCompiler48"), self.tr("Resource Compilation"), self.tr("The compilation of the resource file" " was successful.")) @@ -637,7 +637,7 @@ "The compilation of the resource file failed.")) else: ui.showNotification( - UI.PixmapCache.getPixmap("resourcesCompiler48.png"), + UI.PixmapCache.getPixmap("resourcesCompiler48"), self.tr("Resource Compilation"), self.tr( "The compilation of the resource file failed."))
--- a/eric6/Project/ProjectSourcesBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectSourcesBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -135,7 +135,7 @@ self.__showApplicationDiagram) self.graphicsMenu.addSeparator() self.graphicsMenu.addAction( - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr("Load Diagram..."), self.__loadDiagram) self.graphicsMenu.aboutToShow.connect(self.__showContextMenuGraphics) @@ -305,7 +305,7 @@ self.__showApplicationDiagram) self.graphicsMenu.addSeparator() self.graphicsMenu.addAction( - UI.PixmapCache.getIcon("fileOpen.png"), + UI.PixmapCache.getIcon("fileOpen"), self.tr("Load Diagram..."), self.__loadDiagram) self.sourceMenu.addSeparator()
--- a/eric6/Project/ProjectTranslationsBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/ProjectTranslationsBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -939,7 +939,7 @@ ui = e5App().getObject("UserInterface") if ui.notificationsEnabled(): ui.showNotification( - UI.PixmapCache.getPixmap("linguist48.png"), + UI.PixmapCache.getPixmap("linguist48"), self.tr("Translation file generation"), self.tr( "The generation of the translation files (*.ts)" @@ -1136,7 +1136,7 @@ ui = e5App().getObject("UserInterface") if ui.notificationsEnabled(): ui.showNotification( - UI.PixmapCache.getPixmap("linguist48.png"), + UI.PixmapCache.getPixmap("linguist48"), self.tr("Translation file release"), self.tr("The release of the translation files (*.qm)" " was successful."))
--- a/eric6/Project/PropertiesDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Project/PropertiesDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -44,7 +44,7 @@ self.dirPicker.setMode(E5PathPickerModes.DirectoryMode) self.mainscriptPicker.setMode(E5PathPickerModes.OpenFileMode) - self.makeButton.setIcon(UI.PixmapCache.getIcon("makefile.png")) + self.makeButton.setIcon(UI.PixmapCache.getIcon("makefile")) self.project = project self.newProject = new
--- a/eric6/PyUnit/UnittestDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/PyUnit/UnittestDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -120,7 +120,7 @@ self.setWindowFlags( self.windowFlags() | Qt.WindowFlags( Qt.WindowContextHelpButtonHint)) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setWindowTitle(self.tr("Unittest")) if dbs: self.ui = ui
--- a/eric6/QScintilla/Editor.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/Editor.py Sun Apr 12 19:07:49 2020 +0200 @@ -288,25 +288,25 @@ self.__createChangeMarkerPixmap( "OnlineChangeTraceMarkerUnsaved")) self.breakpoint = self.markerDefine( - UI.PixmapCache.getPixmap("break.png")) + UI.PixmapCache.getPixmap("break")) self.cbreakpoint = self.markerDefine( - UI.PixmapCache.getPixmap("cBreak.png")) + UI.PixmapCache.getPixmap("cBreak")) self.tbreakpoint = self.markerDefine( - UI.PixmapCache.getPixmap("tBreak.png")) + UI.PixmapCache.getPixmap("tBreak")) self.tcbreakpoint = self.markerDefine( - UI.PixmapCache.getPixmap("tCBreak.png")) + UI.PixmapCache.getPixmap("tCBreak")) self.dbreakpoint = self.markerDefine( - UI.PixmapCache.getPixmap("breakDisabled.png")) + UI.PixmapCache.getPixmap("breakDisabled")) self.bookmark = self.markerDefine( - UI.PixmapCache.getPixmap("bookmark16.png")) + UI.PixmapCache.getPixmap("bookmark16")) self.syntaxerror = self.markerDefine( - UI.PixmapCache.getPixmap("syntaxError.png")) + UI.PixmapCache.getPixmap("syntaxError")) self.notcovered = self.markerDefine( - UI.PixmapCache.getPixmap("notcovered.png")) + UI.PixmapCache.getPixmap("notcovered")) self.taskmarker = self.markerDefine( - UI.PixmapCache.getPixmap("task.png")) + UI.PixmapCache.getPixmap("task")) self.warning = self.markerDefine( - UI.PixmapCache.getPixmap("warning.png")) + UI.PixmapCache.getPixmap("warning")) # define the line markers if Preferences.getEditor("LineMarkersBackground"): @@ -315,9 +315,9 @@ self.__setLineMarkerColours() else: self.currentline = self.markerDefine( - UI.PixmapCache.getPixmap("currentLineMarker.png")) + UI.PixmapCache.getPixmap("currentLineMarker")) self.errorline = self.markerDefine( - UI.PixmapCache.getPixmap("errorLineMarker.png")) + UI.PixmapCache.getPixmap("errorLineMarker")) self.breakpointMask = ( (1 << self.breakpoint) | @@ -557,35 +557,35 @@ Private method to register images for autocompletion lists. """ self.registerImage(self.ClassID, - UI.PixmapCache.getPixmap("class.png")) + UI.PixmapCache.getPixmap("class")) self.registerImage(self.ClassProtectedID, - UI.PixmapCache.getPixmap("class_protected.png")) + UI.PixmapCache.getPixmap("class_protected")) self.registerImage(self.ClassPrivateID, - UI.PixmapCache.getPixmap("class_private.png")) + UI.PixmapCache.getPixmap("class_private")) self.registerImage(self.MethodID, - UI.PixmapCache.getPixmap("method.png")) + UI.PixmapCache.getPixmap("method")) self.registerImage(self.MethodProtectedID, - UI.PixmapCache.getPixmap("method_protected.png")) + UI.PixmapCache.getPixmap("method_protected")) self.registerImage(self.MethodPrivateID, - UI.PixmapCache.getPixmap("method_private.png")) + UI.PixmapCache.getPixmap("method_private")) self.registerImage(self.AttributeID, - UI.PixmapCache.getPixmap("attribute.png")) + UI.PixmapCache.getPixmap("attribute")) self.registerImage(self.AttributeProtectedID, - UI.PixmapCache.getPixmap("attribute_protected.png")) + UI.PixmapCache.getPixmap("attribute_protected")) self.registerImage(self.AttributePrivateID, - UI.PixmapCache.getPixmap("attribute_private.png")) + UI.PixmapCache.getPixmap("attribute_private")) self.registerImage(self.EnumID, - UI.PixmapCache.getPixmap("enum.png")) + UI.PixmapCache.getPixmap("enum")) self.registerImage(self.KeywordsID, - UI.PixmapCache.getPixmap("keywords.png")) + UI.PixmapCache.getPixmap("keywords")) self.registerImage(self.ModuleID, - UI.PixmapCache.getPixmap("module.png")) + UI.PixmapCache.getPixmap("module")) self.registerImage(self.FromDocumentID, - UI.PixmapCache.getPixmap("editor.png")) + UI.PixmapCache.getPixmap("editor")) self.registerImage(self.TemplateImageID, - UI.PixmapCache.getPixmap("templateViewer.png")) + UI.PixmapCache.getPixmap("templateViewer")) def addClone(self, editor): """ @@ -777,23 +777,23 @@ self.__menus["SpellLanguages"] = self.spellLanguagesMenu self.menuActs["Undo"] = self.menu.addAction( - UI.PixmapCache.getIcon("editUndo.png"), + UI.PixmapCache.getIcon("editUndo"), self.tr('Undo'), self.undo) self.menuActs["Redo"] = self.menu.addAction( - UI.PixmapCache.getIcon("editRedo.png"), + UI.PixmapCache.getIcon("editRedo"), self.tr('Redo'), self.redo) self.menuActs["Revert"] = self.menu.addAction( self.tr("Revert to last saved state"), self.revertToUnmodified) self.menu.addSeparator() self.menuActs["Cut"] = self.menu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr('Cut'), self.cut) self.menuActs["Copy"] = self.menu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr('Copy'), self.copy) self.menuActs["Paste"] = self.menu.addAction( - UI.PixmapCache.getIcon("editPaste.png"), + UI.PixmapCache.getIcon("editPaste"), self.tr('Paste'), self.paste) if not self.miniMenu: self.menuActs["ExecuteSelection"] = self.menu.addAction( @@ -801,16 +801,16 @@ self.__executeSelection) self.menu.addSeparator() self.menu.addAction( - UI.PixmapCache.getIcon("editIndent.png"), + UI.PixmapCache.getIcon("editIndent"), self.tr('Indent'), self.indentLineOrSelection) self.menu.addAction( - UI.PixmapCache.getIcon("editUnindent.png"), + UI.PixmapCache.getIcon("editUnindent"), self.tr('Unindent'), self.unindentLineOrSelection) self.menuActs["Comment"] = self.menu.addAction( - UI.PixmapCache.getIcon("editComment.png"), + UI.PixmapCache.getIcon("editComment"), self.tr('Comment'), self.commentLineOrSelection) self.menuActs["Uncomment"] = self.menu.addAction( - UI.PixmapCache.getIcon("editUncomment.png"), + UI.PixmapCache.getIcon("editUncomment"), self.tr('Uncomment'), self.uncommentLineOrSelection) self.menuActs["StreamComment"] = self.menu.addAction( self.tr('Stream Comment'), @@ -828,10 +828,10 @@ self.menuActs["ExecuteSelection"] = None self.menu.addSeparator() self.menuActs["SpellCheck"] = self.menu.addAction( - UI.PixmapCache.getIcon("spellchecking.png"), + UI.PixmapCache.getIcon("spellchecking"), self.tr('Check spelling...'), self.checkSpelling) self.menuActs["SpellCheckSelection"] = self.menu.addAction( - UI.PixmapCache.getIcon("spellchecking.png"), + UI.PixmapCache.getIcon("spellchecking"), self.tr('Check spelling of selection...'), self.__checkSpellingSelection) self.menuActs["SpellCheckRemove"] = self.menu.addAction( @@ -888,27 +888,27 @@ self.menuActs["Tools"] = self.menu.addMenu(self.toolsMenu) self.menu.addSeparator() self.menu.addAction( - UI.PixmapCache.getIcon("documentNewView.png"), + UI.PixmapCache.getIcon("documentNewView"), self.tr('New Document View'), self.__newView) self.menuActs["NewSplit"] = self.menu.addAction( - UI.PixmapCache.getIcon("splitVertical.png"), + UI.PixmapCache.getIcon("splitVertical"), self.tr('New Document View (with new split)'), self.__newViewNewSplit) self.menuActs["NewSplit"].setEnabled(self.vm.canSplit()) self.menu.addAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr('Close'), self.__contextClose) self.menu.addSeparator() self.reopenEncodingMenu = self.__initContextMenuReopenWithEncoding() self.menuActs["Reopen"] = self.menu.addMenu(self.reopenEncodingMenu) self.menuActs["Save"] = self.menu.addAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr('Save'), self.__contextSave) self.menu.addAction( - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr('Save As...'), self.__contextSaveAs) self.menu.addAction( - UI.PixmapCache.getIcon("fileSaveCopy.png"), + UI.PixmapCache.getIcon("fileSaveCopy"), self.tr('Save Copy...'), self.__contextSaveCopy) if not self.miniMenu: self.menu.addMenu(self.exportersMenu) @@ -918,10 +918,10 @@ self.__contextOpenRejections) self.menu.addSeparator() self.menu.addAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self.printPreviewFile) self.menu.addAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr('Print'), self.printFile) else: self.menuActs["OpenRejections"] = None @@ -1024,7 +1024,7 @@ self.__showApplicationDiagram) menu.addSeparator() menu.addAction( - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr("Load Diagram..."), self.__loadDiagram) menu.aboutToShow.connect(self.__showContextMenuGraphics) @@ -1041,7 +1041,7 @@ self.languagesActGrp = QActionGroup(self) self.noLanguageAct = menu.addAction( - UI.PixmapCache.getIcon("fileText.png"), + UI.PixmapCache.getIcon("fileText"), self.tr("No Language")) self.noLanguageAct.setCheckable(True) self.noLanguageAct.setData("None") @@ -1109,7 +1109,7 @@ @return reference to the generated menu (QMenu) """ menu = QMenu(self.tr("Re-Open With Encoding")) - menu.setIcon(UI.PixmapCache.getIcon("open.png")) + menu.setIcon(UI.PixmapCache.getIcon("open")) for encoding in sorted(Utilities.supportedCodecs): act = menu.addAction(encoding) @@ -1131,21 +1131,21 @@ self.eolActGrp = QActionGroup(self) - act = menu.addAction(UI.PixmapCache.getIcon("eolLinux.png"), + act = menu.addAction(UI.PixmapCache.getIcon("eolLinux"), self.tr("Unix")) act.setCheckable(True) act.setData('\n') self.supportedEols['\n'] = act self.eolActGrp.addAction(act) - act = menu.addAction(UI.PixmapCache.getIcon("eolWindows.png"), + act = menu.addAction(UI.PixmapCache.getIcon("eolWindows"), self.tr("Windows")) act.setCheckable(True) act.setData('\r\n') self.supportedEols['\r\n'] = act self.eolActGrp.addAction(act) - act = menu.addAction(UI.PixmapCache.getIcon("eolMac.png"), + act = menu.addAction(UI.PixmapCache.getIcon("eolMac"), self.tr("Macintosh")) act.setCheckable(True) act.setData('\r') @@ -4343,10 +4343,10 @@ self.__setLineMarkerColours() else: self.markerDefine( - UI.PixmapCache.getPixmap("currentLineMarker.png"), + UI.PixmapCache.getPixmap("currentLineMarker"), self.currentline) self.markerDefine( - UI.PixmapCache.getPixmap("errorLineMarker.png"), + UI.PixmapCache.getPixmap("errorLineMarker"), self.errorline) # set the text display @@ -5479,10 +5479,10 @@ splitOrientation = self.vm.getSplitOrientation() if splitOrientation == Qt.Horizontal: self.menuActs["NewSplit"].setIcon( - UI.PixmapCache.getIcon("splitHorizontal.png")) + UI.PixmapCache.getIcon("splitHorizontal")) else: self.menuActs["NewSplit"].setIcon( - UI.PixmapCache.getIcon("splitVertical.png")) + UI.PixmapCache.getIcon("splitVertical")) self.menuActs["Tools"].setEnabled(not self.toolsMenu.isEmpty()) @@ -7833,7 +7833,7 @@ if suggestions: self.spellingMenu.addSeparator() self.spellingMenu.addAction( - UI.PixmapCache.getIcon("spellchecking.png"), + UI.PixmapCache.getIcon("spellchecking"), self.tr("Check spelling..."), self.__checkSpellingWord) self.spellingMenu.addAction( self.tr("Add to dictionary"), self.__addToSpellingDictionary)
--- a/eric6/QScintilla/EditorAssembly.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/EditorAssembly.py Sun Apr 12 19:07:49 2020 +0200 @@ -129,12 +129,12 @@ items = {} for cl in entry.classes.values(): if cl.isPrivate(): - icon = UI.PixmapCache.getIcon("class_private.png") + icon = UI.PixmapCache.getIcon("class_private") elif cl.isProtected(): icon = UI.PixmapCache.getIcon( - "class_protected.png") + "class_protected") else: - icon = UI.PixmapCache.getIcon("class.png") + icon = UI.PixmapCache.getIcon("class") items[cl.name] = (icon, cl.lineno, cl.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -151,15 +151,15 @@ items = {} for meth in entry.methods.values(): if meth.modifier == Function.Static: - icon = UI.PixmapCache.getIcon("method_static.png") + icon = UI.PixmapCache.getIcon("method_static") elif meth.modifier == Function.Class: - icon = UI.PixmapCache.getIcon("method_class.png") + icon = UI.PixmapCache.getIcon("method_class") elif meth.isPrivate(): - icon = UI.PixmapCache.getIcon("method_private.png") + icon = UI.PixmapCache.getIcon("method_private") elif meth.isProtected(): - icon = UI.PixmapCache.getIcon("method_protected.png") + icon = UI.PixmapCache.getIcon("method_protected") else: - icon = UI.PixmapCache.getIcon("method.png") + icon = UI.PixmapCache.getIcon("method") items[meth.name] = (icon, meth.lineno, meth.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -171,12 +171,12 @@ items = {} for attr in entry.attributes.values(): if attr.isPrivate(): - icon = UI.PixmapCache.getIcon("attribute_private.png") + icon = UI.PixmapCache.getIcon("attribute_private") elif attr.isProtected(): icon = UI.PixmapCache.getIcon( - "attribute_protected.png") + "attribute_protected") else: - icon = UI.PixmapCache.getIcon("attribute.png") + icon = UI.PixmapCache.getIcon("attribute") items[attr.name] = (icon, attr.lineno) for key in sorted(items.keys()): itm = items[key] @@ -184,7 +184,7 @@ # step 2.3: add class attributes items = {} - icon = UI.PixmapCache.getIcon("attribute_class.png") + icon = UI.PixmapCache.getIcon("attribute_class") for glob in entry.globals.values(): items[glob.name] = (icon, glob.lineno) for key in sorted(items.keys()): @@ -247,7 +247,7 @@ # step 1: add modules items = {} for module in self.__module.modules.values(): - items[module.name] = (UI.PixmapCache.getIcon("module.png"), + items[module.name] = (UI.PixmapCache.getIcon("module"), module.lineno, module.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -259,11 +259,11 @@ items = {} for cl in self.__module.classes.values(): if cl.isPrivate(): - icon = UI.PixmapCache.getIcon("class_private.png") + icon = UI.PixmapCache.getIcon("class_private") elif cl.isProtected(): - icon = UI.PixmapCache.getIcon("class_protected.png") + icon = UI.PixmapCache.getIcon("class_protected") else: - icon = UI.PixmapCache.getIcon("class.png") + icon = UI.PixmapCache.getIcon("class") items[cl.name] = (icon, cl.lineno, cl.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -275,11 +275,11 @@ items = {} for func in self.__module.functions.values(): if func.isPrivate(): - icon = UI.PixmapCache.getIcon("method_private.png") + icon = UI.PixmapCache.getIcon("method_private") elif func.isProtected(): - icon = UI.PixmapCache.getIcon("method_protected.png") + icon = UI.PixmapCache.getIcon("method_protected") else: - icon = UI.PixmapCache.getIcon("method.png") + icon = UI.PixmapCache.getIcon("method") items[func.name] = (icon, func.lineno, func.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -291,12 +291,12 @@ items = {} for glob in self.__module.globals.values(): if glob.isPrivate(): - icon = UI.PixmapCache.getIcon("attribute_private.png") + icon = UI.PixmapCache.getIcon("attribute_private") elif glob.isProtected(): icon = UI.PixmapCache.getIcon( - "attribute_protected.png") + "attribute_protected") else: - icon = UI.PixmapCache.getIcon("attribute.png") + icon = UI.PixmapCache.getIcon("attribute") items[glob.name] = (icon, glob.lineno) for key in sorted(items.keys()): itm = items[key]
--- a/eric6/QScintilla/EditorButtonsWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/EditorButtonsWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -172,41 +172,41 @@ self.__separators = [] self.__headerMenu = QMenu() - self.__addButton("bold", "formatTextBold.png", + self.__addButton("bold", "formatTextBold", self.tr("Bold")) - self.__addButton("italic", "formatTextItalic.png", + self.__addButton("italic", "formatTextItalic", self.tr("Italic")) - self.__addButton("strikethrough", "formatTextStrikethrough.png", + self.__addButton("strikethrough", "formatTextStrikethrough", self.tr("Strike Through")) self.__addSeparator() - self.__addButton("header1", "formatTextHeader1.png", + self.__addButton("header1", "formatTextHeader1", self.tr("Header 1")) - self.__addButton("header2", "formatTextHeader2.png", + self.__addButton("header2", "formatTextHeader2", self.tr("Header 2")) - self.__addButton("header3", "formatTextHeader3.png", + self.__addButton("header3", "formatTextHeader3", self.tr("Header 3")) - button = self.__addButton("header", "formatTextHeader.png", + button = self.__addButton("header", "formatTextHeader", self.tr("Header")) button.setPopupMode(QToolButton.InstantPopup) button.setMenu(self.__headerMenu) self.__addSeparator() - self.__addButton("code", "formatTextInlineCode.png", + self.__addButton("code", "formatTextInlineCode", self.tr("Inline Code")) - self.__addButton("codeBlock", "formatTextCodeBlock.png", + self.__addButton("codeBlock", "formatTextCodeBlock", self.tr("Code Block")) - self.__addButton("quote", "formatTextQuote.png", + self.__addButton("quote", "formatTextQuote", self.tr("Quote")) self.__addSeparator() - self.__addButton("hyperlink", "formatTextHyperlink.png", + self.__addButton("hyperlink", "formatTextHyperlink", self.tr("Add Hyperlink")) - self.__addButton("line", "formatTextHorizontalLine.png", + self.__addButton("line", "formatTextHorizontalLine", self.tr("Add Horizontal Line")) - self.__addButton("image", "formatTextImage.png", + self.__addButton("image", "formatTextImage", self.tr("Add Image")) self.__addSeparator() - self.__addButton("bulletedList", "formatTextBulletedList.png", + self.__addButton("bulletedList", "formatTextBulletedList", self.tr("Add Bulleted List")) - self.__addButton("numberedList", "formatTextNumberedList.png", + self.__addButton("numberedList", "formatTextNumberedList", self.tr("Add Numbered List")) self.__headerMenu.triggered.connect(self.__headerMenuTriggered)
--- a/eric6/QScintilla/Lexers/__init__.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/Lexers/__init__.py Sun Apr 12 19:07:49 2020 +0200 @@ -84,94 +84,94 @@ """ supportedLanguages = { "Bash": [QCoreApplication.translate('Lexers', "Bash"), 'dummy.sh', - "lexerBash.png"], + "lexerBash"], "Batch": [QCoreApplication.translate('Lexers', "Batch"), 'dummy.bat', - "lexerBatch.png"], + "lexerBatch"], "C++": [QCoreApplication.translate('Lexers', "C/C++"), 'dummy.cpp', - "lexerCPP.png"], + "lexerCPP"], "C#": [QCoreApplication.translate('Lexers', "C#"), 'dummy.cs', - "lexerCsharp.png"], + "lexerCsharp"], "CMake": [QCoreApplication.translate('Lexers', "CMake"), 'dummy.cmake', - "lexerCMake.png"], + "lexerCMake"], "CSS": [QCoreApplication.translate('Lexers', "CSS"), 'dummy.css', - "lexerCSS.png"], + "lexerCSS"], "Cython": [QCoreApplication.translate('Lexers', "Cython"), 'dummy.pyx', - "lexerCython.png"], + "lexerCython"], "D": [QCoreApplication.translate('Lexers', "D"), 'dummy.d', - "lexerD.png"], + "lexerD"], "Diff": [QCoreApplication.translate('Lexers', "Diff"), 'dummy.diff', - "lexerDiff.png"], + "lexerDiff"], "Fortran": [QCoreApplication.translate('Lexers', "Fortran"), - 'dummy.f95', "lexerFortran.png"], + 'dummy.f95', "lexerFortran"], "Fortran77": [QCoreApplication.translate('Lexers', "Fortran77"), - 'dummy.f', "lexerFortran.png"], + 'dummy.f', "lexerFortran"], "HTML": [QCoreApplication.translate('Lexers', "HTML/PHP/XML"), - 'dummy.html', "lexerHTML.png"], + 'dummy.html', "lexerHTML"], "IDL": [QCoreApplication.translate('Lexers', "IDL"), 'dummy.idl', - "lexerIDL.png"], + "lexerIDL"], "Java": [QCoreApplication.translate('Lexers', "Java"), 'dummy.java', - "lexerJava.png"], + "lexerJava"], "JavaScript": [QCoreApplication.translate('Lexers', "JavaScript"), - 'dummy.js', "lexerJavaScript.png"], + 'dummy.js', "lexerJavaScript"], "Lua": [QCoreApplication.translate('Lexers', "Lua"), 'dummy.lua', - "lexerLua.png"], + "lexerLua"], "Makefile": [QCoreApplication.translate('Lexers', "Makefile"), - 'dummy.mak', "lexerMakefile.png"], + 'dummy.mak', "lexerMakefile"], "Matlab": [QCoreApplication.translate('Lexers', "Matlab"), - 'dummy.m.matlab', "lexerMatlab.png"], + 'dummy.m.matlab', "lexerMatlab"], "Octave": [QCoreApplication.translate('Lexers', "Octave"), - 'dummy.m.octave', "lexerOctave.png"], + 'dummy.m.octave', "lexerOctave"], "Pascal": [QCoreApplication.translate('Lexers', "Pascal"), 'dummy.pas', - "lexerPascal.png"], + "lexerPascal"], "Perl": [QCoreApplication.translate('Lexers', "Perl"), 'dummy.pl', - "lexerPerl.png"], + "lexerPerl"], "PostScript": [QCoreApplication.translate('Lexers', "PostScript"), - 'dummy.ps', "lexerPostscript.png"], + 'dummy.ps', "lexerPostscript"], "Povray": [QCoreApplication.translate('Lexers', "Povray"), 'dummy.pov', - "lexerPOV.png"], + "lexerPOV"], "Properties": [QCoreApplication.translate('Lexers', "Properties"), - 'dummy.ini', "lexerProperties.png"], + 'dummy.ini', "lexerProperties"], "Protocol": [QCoreApplication.translate('Lexers', "Protocol (protobuf)"), - 'dummy.proto', "protobuf.png"], + 'dummy.proto', "protobuf"], "Python2": [QCoreApplication.translate('Lexers', "Python2"), - 'dummy.py', "lexerPython.png"], + 'dummy.py', "lexerPython"], "Python3": [QCoreApplication.translate('Lexers', "Python3"), - 'dummy.py', "lexerPython3.png"], + 'dummy.py', "lexerPython3"], "MicroPython": [QCoreApplication.translate('Lexers', "MicroPython"), 'dummy.py', "micropython"], "QSS": [QCoreApplication.translate('Lexers', "QSS"), 'dummy.qss', - "lexerCSS.png"], + "lexerCSS"], "Ruby": [QCoreApplication.translate('Lexers', "Ruby"), 'dummy.rb', - "lexerRuby.png"], + "lexerRuby"], "SQL": [QCoreApplication.translate('Lexers', "SQL"), 'dummy.sql', - "lexerSQL.png"], + "lexerSQL"], "TCL": [QCoreApplication.translate('Lexers', "TCL"), 'dummy.tcl', - "lexerTCL.png"], + "lexerTCL"], "TeX": [QCoreApplication.translate('Lexers', "TeX"), 'dummy.tex', - "lexerTeX.png"], + "lexerTeX"], "VHDL": [QCoreApplication.translate('Lexers', "VHDL"), 'dummy.vhd', - "lexerVHDL.png"], + "lexerVHDL"], "XML": [QCoreApplication.translate('Lexers', "XML"), 'dummy.xml', - "lexerXML.png"], + "lexerXML"], "YAML": [QCoreApplication.translate('Lexers', "YAML"), 'dummy.yml', - "lexerYAML.png"], + "lexerYAML"], "Gettext": [QCoreApplication.translate('Lexers', "Gettext"), - 'dummy.po', "lexerGettext.png"], + 'dummy.po', "lexerGettext"], "CoffeeScript": [QCoreApplication.translate('Lexers', "CoffeeScript"), - 'dummy.coffee', "lexerCoffeeScript.png"], + 'dummy.coffee', "lexerCoffeeScript"], } if QSCINTILLA_VERSION() >= 0x020a00: supportedLanguages["JSON"] = [ QCoreApplication.translate('Lexers', "JSON"), 'dummy.json', - "lexerJSON.png" + "lexerJSON" ] supportedLanguages["Markdown"] = [ QCoreApplication.translate('Lexers', "Markdown"), 'dummy.md', - "lexerMarkdown.png" + "lexerMarkdown" ] for name in LexerRegistry:
--- a/eric6/QScintilla/MiniEditor.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/MiniEditor.py Sun Apr 12 19:07:49 2020 +0200 @@ -129,7 +129,7 @@ super(MiniEditor, self).__init__(parent) if name is not None: self.setObjectName(name) - self.setWindowIcon(UI.PixmapCache.getIcon("editor.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("editor")) self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) @@ -399,7 +399,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, 'vm_file_new') @@ -413,7 +413,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, 'vm_file_open') @@ -427,7 +427,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, 'vm_file_save') @@ -441,7 +441,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, 'vm_file_save_as') @@ -457,7 +457,7 @@ self.saveCopyAct = E5Action( self.tr('Save Copy'), - UI.PixmapCache.getIcon("fileSaveCopy.png"), + UI.PixmapCache.getIcon("fileSaveCopy"), self.tr('Save &Copy...'), 0, 0, self, 'vm_file_save_copy') self.saveCopyAct.setStatusTip(self.tr( @@ -472,7 +472,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, 'vm_file_close') @@ -486,7 +486,7 @@ self.printAct = E5Action( self.tr('Print'), - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr('&Print'), QKeySequence(self.tr("Ctrl+P", "File|Print")), 0, self, 'vm_file_print') @@ -500,7 +500,7 @@ self.printPreviewAct = E5Action( self.tr('Print Preview'), - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), QCoreApplication.translate('ViewManager', 'Print Preview'), 0, 0, self, 'vm_file_print_preview') self.printPreviewAct.setStatusTip(self.tr( @@ -518,7 +518,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")), @@ -533,7 +533,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, 'vm_edit_redo') @@ -547,7 +547,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")), @@ -563,7 +563,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")), @@ -579,7 +579,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")), @@ -596,7 +596,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, @@ -1957,7 +1957,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")), @@ -1977,7 +1977,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")), @@ -1997,7 +1997,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")), @@ -2018,7 +2018,7 @@ self.searchClearMarkersAct = E5Action( QCoreApplication.translate('ViewManager', 'Clear search markers'), - UI.PixmapCache.getIcon("findClear.png"), + UI.PixmapCache.getIcon("findClear"), QCoreApplication.translate('ViewManager', 'Clear search markers'), QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+3", "Search|Clear search markers")), @@ -2057,7 +2057,7 @@ self.replaceAndSearchAct = E5Action( QCoreApplication.translate( 'ViewManager', 'Replace and Search'), - UI.PixmapCache.getIcon("editReplaceSearch.png"), + UI.PixmapCache.getIcon("editReplaceSearch"), QCoreApplication.translate( 'ViewManager', 'Replace and Search'), QKeySequence(QCoreApplication.translate( @@ -2081,7 +2081,7 @@ self.replaceSelectionAct = E5Action( QCoreApplication.translate( 'ViewManager', 'Replace Occurrence'), - UI.PixmapCache.getIcon("editReplace.png"), + UI.PixmapCache.getIcon("editReplace"), QCoreApplication.translate( 'ViewManager', 'Replace Occurrence'), QKeySequence(QCoreApplication.translate( @@ -2103,7 +2103,7 @@ self.replaceAllAct = E5Action( QCoreApplication.translate( 'ViewManager', 'Replace All'), - UI.PixmapCache.getIcon("editReplaceAll.png"), + UI.PixmapCache.getIcon("editReplaceAll"), QCoreApplication.translate( 'ViewManager', 'Replace All'), QKeySequence(QCoreApplication.translate( @@ -2153,7 +2153,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')
--- a/eric6/QScintilla/SearchReplaceWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/SearchReplaceWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -127,19 +127,19 @@ self.setWhatsThis(whatsThis) # set icons - self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) + self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close")) self.ui.findPrevButton.setIcon( - UI.PixmapCache.getIcon("1leftarrow.png")) + UI.PixmapCache.getIcon("1leftarrow")) self.ui.findNextButton.setIcon( - UI.PixmapCache.getIcon("1rightarrow.png")) + UI.PixmapCache.getIcon("1rightarrow")) if replace: self.ui.replaceButton.setIcon( - UI.PixmapCache.getIcon("editReplace.png")) + UI.PixmapCache.getIcon("editReplace")) self.ui.replaceSearchButton.setIcon( - UI.PixmapCache.getIcon("editReplaceSearch.png")) + UI.PixmapCache.getIcon("editReplaceSearch")) self.ui.replaceAllButton.setIcon( - UI.PixmapCache.getIcon("editReplaceAll.png")) + UI.PixmapCache.getIcon("editReplaceAll")) # set line edit completers self.ui.findtextCombo.setCompleter(None)
--- a/eric6/QScintilla/Shell.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/Shell.py Sun Apr 12 19:07:49 2020 +0200 @@ -327,7 +327,7 @@ self.__setAutoCompletion() self.__setCallTips() - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.incrementalSearchString = "" self.incrementalSearchActive = False
--- 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(
--- a/eric6/Snapshot/SnapWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Snapshot/SnapWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -45,11 +45,11 @@ super(SnapWidget, self).__init__(parent) self.setupUi(self) - self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSaveAs.png")) - self.takeButton.setIcon(UI.PixmapCache.getIcon("cameraPhoto.png")) - self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png")) - self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy.png")) - self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap.png")) + self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSaveAs")) + self.takeButton.setIcon(UI.PixmapCache.getIcon("cameraPhoto")) + self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy")) + self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy")) + self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap")) if Globals.isWaylandSession(): from .SnapshotWaylandGrabber import SnapshotWaylandGrabber
--- a/eric6/SqlBrowser/SqlBrowser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/SqlBrowser/SqlBrowser.py Sun Apr 12 19:07:49 2020 +0200 @@ -42,7 +42,7 @@ connections = [] self.setWindowTitle(self.tr("SQL Browser")) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) @@ -101,7 +101,7 @@ self.addConnectionAct = E5Action( self.tr('Add Connection'), - UI.PixmapCache.getIcon("databaseConnection.png"), + UI.PixmapCache.getIcon("databaseConnection"), self.tr('Add &Connection...'), 0, 0, self, 'sql_file_add_connection') self.addConnectionAct.setStatusTip(self.tr( @@ -117,7 +117,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, 'sql_file_quit')
--- a/eric6/Tasks/Task.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Tasks/Task.py Sun Apr 12 19:07:49 2020 +0200 @@ -81,10 +81,10 @@ self.setData(4, Qt.DisplayRole, self.lineno or "") if self.completed: - self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png")) + self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted")) strikeOut = True else: - self.setIcon(0, UI.PixmapCache.getIcon("empty.png")) + self.setIcon(0, UI.PixmapCache.getIcon("empty")) strikeOut = False for column in range(2, 5): f = self.font(column) @@ -92,22 +92,22 @@ self.setFont(column, f) if self.priority == 1: - self.setIcon(1, UI.PixmapCache.getIcon("empty.png")) + self.setIcon(1, UI.PixmapCache.getIcon("empty")) elif self.priority == 0: - self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png")) + self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh")) elif self.priority == 2: - self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png")) + self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow")) else: - self.setIcon(1, UI.PixmapCache.getIcon("empty.png")) + self.setIcon(1, UI.PixmapCache.getIcon("empty")) if self.taskType == Task.TypeFixme: - self.setIcon(2, UI.PixmapCache.getIcon("taskFixme.png")) + self.setIcon(2, UI.PixmapCache.getIcon("taskFixme")) elif self.taskType == Task.TypeWarning: - self.setIcon(2, UI.PixmapCache.getIcon("taskWarning.png")) + self.setIcon(2, UI.PixmapCache.getIcon("taskWarning")) elif self.taskType == Task.TypeTodo: - self.setIcon(2, UI.PixmapCache.getIcon("taskTodo.png")) + self.setIcon(2, UI.PixmapCache.getIcon("taskTodo")) else: - self.setIcon(2, UI.PixmapCache.getIcon("taskNote.png")) + self.setIcon(2, UI.PixmapCache.getIcon("taskNote")) self.colorizeTask() self.setTextAlignment(4, Qt.AlignRight) @@ -167,13 +167,13 @@ self.priority = 1 if self.priority == 1: - self.setIcon(1, UI.PixmapCache.getIcon("empty.png")) + self.setIcon(1, UI.PixmapCache.getIcon("empty")) elif self.priority == 0: - self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png")) + self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh")) elif self.priority == 2: - self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png")) + self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow")) else: - self.setIcon(1, UI.PixmapCache.getIcon("empty.png")) + self.setIcon(1, UI.PixmapCache.getIcon("empty")) def setCompleted(self, completed): """ @@ -183,10 +183,10 @@ """ self.completed = completed if self.completed: - self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png")) + self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted")) strikeOut = True else: - self.setIcon(0, UI.PixmapCache.getIcon("empty.png")) + self.setIcon(0, UI.PixmapCache.getIcon("empty")) strikeOut = False for column in range(2, 5): f = self.font(column)
--- a/eric6/Tasks/TaskViewer.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Tasks/TaskViewer.py Sun Apr 12 19:07:49 2020 +0200 @@ -60,9 +60,9 @@ ["", "", self.tr("Summary"), self.tr("Filename"), self.tr("Line"), ""]) self.__headerItem.setIcon( - 0, UI.PixmapCache.getIcon("taskCompleted.png")) + 0, UI.PixmapCache.getIcon("taskCompleted")) self.__headerItem.setIcon( - 1, UI.PixmapCache.getIcon("taskPriority.png")) + 1, UI.PixmapCache.getIcon("taskPriority")) self.setHeaderItem(self.__headerItem) self.header().setSortIndicator(2, Qt.AscendingOrder) @@ -168,7 +168,7 @@ self.customContextMenuRequested.connect(self.__showContextMenu) self.itemActivated.connect(self.__taskItemActivated) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__generateTopLevelItems()
--- a/eric6/Templates/TemplateViewer.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Templates/TemplateViewer.py Sun Apr 12 19:07:49 2020 +0200 @@ -437,7 +437,7 @@ self.customContextMenuRequested.connect(self.__showContextMenu) self.itemActivated.connect(self.__templateItemActivated) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) def __resort(self): """
--- a/eric6/Toolbox/Startup.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Toolbox/Startup.py Sun Apr 12 19:07:49 2020 +0200 @@ -259,7 +259,7 @@ import Preferences initializeResourceSearchPath(app) - QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric")) qtTransDir = Preferences.getQtTranslationsDir() if not qtTransDir:
--- a/eric6/Tools/TRPreviewer.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Tools/TRPreviewer.py Sun Apr 12 19:07:49 2020 +0200 @@ -62,7 +62,7 @@ self.resize(QSize(800, 600).expandedTo(self.minimumSizeHint())) self.statusBar() - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setWindowTitle(self.tr("Translations Previewer")) self.cw = QWidget(self) @@ -162,7 +162,7 @@ Private method to define the user interface actions. """ self.openUIAct = QAction( - UI.PixmapCache.getIcon("openUI.png"), + UI.PixmapCache.getIcon("openUI"), self.tr('&Open UI Files...'), self) self.openUIAct.setStatusTip(self.tr('Open UI files for display')) self.openUIAct.setWhatsThis(self.tr( @@ -172,7 +172,7 @@ self.openUIAct.triggered.connect(self.__openWidget) self.openQMAct = QAction( - UI.PixmapCache.getIcon("openQM.png"), + UI.PixmapCache.getIcon("openQM"), self.tr('Open &Translation Files...'), self) self.openQMAct.setStatusTip(self.tr( 'Open Translation files for display')) @@ -183,7 +183,7 @@ self.openQMAct.triggered.connect(self.__openTranslation) self.reloadAct = QAction( - UI.PixmapCache.getIcon("reload.png"), + UI.PixmapCache.getIcon("reload"), self.tr('&Reload Translations'), self) self.reloadAct.setStatusTip(self.tr( 'Reload the loaded translations')) @@ -195,7 +195,7 @@ self.reloadAct.triggered.connect(self.translations.reload) self.exitAct = QAction( - UI.PixmapCache.getIcon("exit.png"), self.tr('&Quit'), self) + UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), self) self.exitAct.setShortcut(QKeySequence( self.tr("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.tr('Quit the application')) @@ -206,7 +206,7 @@ self.exitAct.triggered.connect(qApp.closeAllWindows) self.whatsThisAct = QAction( - UI.PixmapCache.getIcon("whatsThis.png"), + UI.PixmapCache.getIcon("whatsThis"), self.tr('&What\'s This?'), self) self.whatsThisAct.setShortcut(QKeySequence(self.tr("Shift+F1"))) self.whatsThisAct.setStatusTip(self.tr('Context sensitive help')) @@ -257,7 +257,7 @@ self.cascadeAct.triggered.connect(self.preview.cascadeSubWindows) self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), self.tr('&Close'), self) + UI.PixmapCache.getIcon("close"), self.tr('&Close'), self) self.closeAct.setShortcut(QKeySequence(self.tr( "Ctrl+W", "File|Close"))) self.closeAct.setStatusTip(self.tr('Close the current window'))
--- a/eric6/Tools/TrayStarter.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Tools/TrayStarter.py Sun Apr 12 19:07:49 2020 +0200 @@ -97,72 +97,72 @@ self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("uiPreviewer.png"), + UI.PixmapCache.getIcon("uiPreviewer"), self.tr("UI Previewer"), self.__startUIPreviewer) self.__menu.addAction( - UI.PixmapCache.getIcon("trPreviewer.png"), + UI.PixmapCache.getIcon("trPreviewer"), self.tr("Translations Previewer"), self.__startTRPreviewer) self.__menu.addAction( - UI.PixmapCache.getIcon("unittest.png"), + UI.PixmapCache.getIcon("unittest"), self.tr("Unittest"), self.__startUnittest) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("diffFiles.png"), + UI.PixmapCache.getIcon("diffFiles"), self.tr("Compare Files"), self.__startDiff) self.__menu.addAction( - UI.PixmapCache.getIcon("compareFiles.png"), + UI.PixmapCache.getIcon("compareFiles"), self.tr("Compare Files side by side"), self.__startCompare) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("sqlBrowser.png"), + UI.PixmapCache.getIcon("sqlBrowser"), self.tr("SQL Browser"), self.__startSqlBrowser) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("ericSnap.png"), + UI.PixmapCache.getIcon("ericSnap"), self.tr("Snapshot"), self.__startSnapshot) self.__menu.addAction( - UI.PixmapCache.getIcon("iconEditor.png"), + UI.PixmapCache.getIcon("iconEditor"), self.tr("Icon Editor"), self.__startIconEditor) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("pluginInstall.png"), + UI.PixmapCache.getIcon("pluginInstall"), self.tr("Install Plugin"), self.__startPluginInstall) self.__menu.addAction( - UI.PixmapCache.getIcon("pluginUninstall.png"), + UI.PixmapCache.getIcon("pluginUninstall"), self.tr("Uninstall Plugin"), self.__startPluginUninstall) self.__menu.addAction( - UI.PixmapCache.getIcon("pluginRepository.png"), + UI.PixmapCache.getIcon("pluginRepository"), self.tr("Plugin Repository"), self.__startPluginRepository) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("configure.png"), + UI.PixmapCache.getIcon("configure"), self.tr('Preferences'), self.__startPreferences) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("erict.png"), + UI.PixmapCache.getIcon("erict"), self.tr("eric6 IDE"), self.__startEric) self.__menu.addAction( - UI.PixmapCache.getIcon("editor.png"), + UI.PixmapCache.getIcon("editor"), self.tr("eric6 Mini Editor"), self.__startMiniEditor) self.__menu.addAction( - UI.PixmapCache.getIcon("hexEditor.png"), + UI.PixmapCache.getIcon("hexEditor"), self.tr("eric6 Hex Editor"), self.__startHexEditor) self.__menu.addAction( - UI.PixmapCache.getIcon("ericWeb.png"), + UI.PixmapCache.getIcon("ericWeb"), self.tr("eric6 Web Browser"), self.__startHelpViewer) self.__menu.addAction( - UI.PixmapCache.getIcon("shell.png"), + UI.PixmapCache.getIcon("shell"), self.tr("eric6 Shell Window"), self.__startShell) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("configure.png"), + UI.PixmapCache.getIcon("configure"), self.tr('Configure Tray Starter'), self.__showPreferences) self.__menu.addSeparator() @@ -177,7 +177,7 @@ self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("exit.png"), + UI.PixmapCache.getIcon("exit"), self.tr('Quit'), qApp.quit) def __loadRecentProjects(self):
--- a/eric6/Tools/UIPreviewer.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/Tools/UIPreviewer.py Sun Apr 12 19:07:49 2020 +0200 @@ -54,7 +54,7 @@ self.resize(QSize(600, 480).expandedTo(self.minimumSizeHint())) self.statusBar() - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setWindowTitle(self.tr("UI Previewer")) self.cw = QWidget(self) @@ -128,7 +128,7 @@ Private method to define the user interface actions. """ self.openAct = QAction( - UI.PixmapCache.getIcon("openUI.png"), + UI.PixmapCache.getIcon("openUI"), self.tr('&Open File'), self) self.openAct.setShortcut( QKeySequence(self.tr("Ctrl+O", "File|Open"))) @@ -140,7 +140,7 @@ self.openAct.triggered.connect(self.__openFile) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr('&Print'), self) self.printAct.setShortcut( QKeySequence(self.tr("Ctrl+P", "File|Print"))) @@ -152,7 +152,7 @@ self.printAct.triggered.connect(self.__printImage) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr('Print Preview'), self) self.printPreviewAct.setStatusTip(self.tr( 'Print preview a screen capture')) @@ -163,7 +163,7 @@ self.printPreviewAct.triggered.connect(self.__printPreviewImage) self.imageAct = QAction( - UI.PixmapCache.getIcon("screenCapture.png"), + UI.PixmapCache.getIcon("screenCapture"), self.tr('&Screen Capture'), self) self.imageAct.setShortcut( QKeySequence(self.tr("Ctrl+S", "File|Screen Capture"))) @@ -176,7 +176,7 @@ self.imageAct.triggered.connect(self.__saveImage) self.exitAct = QAction( - UI.PixmapCache.getIcon("exit.png"), self.tr('&Quit'), self) + UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), self) self.exitAct.setShortcut( QKeySequence(self.tr("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.tr('Quit the application')) @@ -187,7 +187,7 @@ self.exitAct.triggered.connect(qApp.closeAllWindows) self.copyAct = QAction( - UI.PixmapCache.getIcon("editCopy.png"), self.tr('&Copy'), self) + UI.PixmapCache.getIcon("editCopy"), self.tr('&Copy'), self) self.copyAct.setShortcut( QKeySequence(self.tr("Ctrl+C", "Edit|Copy"))) self.copyAct.setStatusTip( @@ -199,7 +199,7 @@ self.copyAct.triggered.connect(self.__copyImageToClipboard) self.whatsThisAct = QAction( - UI.PixmapCache.getIcon("whatsThis.png"), + UI.PixmapCache.getIcon("whatsThis"), self.tr('&What\'s This?'), self) self.whatsThisAct.setShortcut(QKeySequence(self.tr("Shift+F1"))) self.whatsThisAct.setStatusTip(self.tr('Context sensitive help'))
--- a/eric6/UI/Browser.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/Browser.py Sun Apr 12 19:07:49 2020 +0200 @@ -89,7 +89,7 @@ self.setWindowTitle(QCoreApplication.translate('Browser', 'File-Browser')) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__model = BrowserModel() self.__sortModel = BrowserSortFilterProxyModel()
--- a/eric6/UI/BrowserModel.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/BrowserModel.py Sun Apr 12 19:07:49 2020 +0200 @@ -826,7 +826,7 @@ self.parentItem = parent self.itemData = [data] self.type_ = BrowserItemRoot - self.icon = UI.PixmapCache.getIcon("empty.png") + self.icon = UI.PixmapCache.getIcon("empty") self._populated = True self._lazyPopulation = False self.symlink = False @@ -1006,9 +1006,9 @@ os.path.islink(self._dirName) ): self.symlink = True - self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed.png") + self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed") else: - self.icon = UI.PixmapCache.getIcon("dirClosed.png") + self.icon = UI.PixmapCache.getIcon("dirClosed") self._populated = False self._lazyPopulation = True @@ -1072,7 +1072,7 @@ BrowserItem.__init__(self, parent, "sys.path") self.type_ = BrowserItemSysPath - self.icon = UI.PixmapCache.getIcon("filePython.png") + self.icon = UI.PixmapCache.getIcon("filePython") self._populated = False self._lazyPopulation = True @@ -1111,58 +1111,58 @@ pixName = "" if self.isPython2File(): if self.fileext == '.py': - pixName = "filePython.png" + pixName = "filePython" else: - pixName = "filePython2.png" + pixName = "filePython2" self._populated = False self._lazyPopulation = True self._moduleName = os.path.basename(finfo) elif self.isPython3File(): - pixName = "filePython.png" + pixName = "filePython" self._populated = False self._lazyPopulation = True self._moduleName = os.path.basename(finfo) elif self.isRubyFile(): - pixName = "fileRuby.png" + pixName = "fileRuby" self._populated = False self._lazyPopulation = True self._moduleName = os.path.basename(finfo) elif self.isDesignerFile(): - pixName = "fileDesigner.png" + pixName = "fileDesigner" elif self.isLinguistFile(): if self.fileext == '.ts': - pixName = "fileLinguist.png" + pixName = "fileLinguist" else: - pixName = "fileLinguist2.png" + pixName = "fileLinguist2" elif self.isResourcesFile(): - pixName = "fileResource.png" + pixName = "fileResource" elif self.isProjectFile(): - pixName = "fileProject.png" + pixName = "fileProject" elif self.isMultiProjectFile(): - pixName = "fileMultiProject.png" + pixName = "fileMultiProject" elif self.isIdlFile(): - pixName = "fileIDL.png" + pixName = "fileIDL" self._populated = False self._lazyPopulation = True self._moduleName = os.path.basename(finfo) elif self.isProtobufFile(): - pixName = "protobuf.png" + pixName = "protobuf" self._populated = False self._lazyPopulation = True self._moduleName = os.path.basename(finfo) elif self.isSvgFile(): - pixName = "fileSvg.png" + pixName = "fileSvg" elif self.isPixmapFile(): - pixName = "filePixmap.png" + pixName = "filePixmap" elif self.isDFile(): - pixName = "fileD.png" + pixName = "fileD" elif self.isJavaScriptFile(): - pixName = "fileJavascript.png" + pixName = "fileJavascript" self._populated = False self._lazyPopulation = True self._moduleName = os.path.basename(finfo) else: - pixName = "fileMisc.png" + pixName = "fileMisc" if os.path.lexists(self._filename) and os.path.islink(self._filename): self.symlink = True @@ -1424,11 +1424,11 @@ Utilities.ClassBrowsers.ClbrBaseClasses.Enum) if self.isfunction: if cl.isPrivate(): - self.icon = UI.PixmapCache.getIcon("method_private.png") + self.icon = UI.PixmapCache.getIcon("method_private") elif cl.isProtected(): - self.icon = UI.PixmapCache.getIcon("method_protected.png") + self.icon = UI.PixmapCache.getIcon("method_protected") else: - self.icon = UI.PixmapCache.getIcon("method.png") + self.icon = UI.PixmapCache.getIcon("method") self.itemData[0] = "{0}({1})".format( name, ", ".join(self._classObject.parameters)) if self._classObject.annotation: @@ -1439,16 +1439,16 @@ ## ", ".join([e.split('=')[0].strip() \ ## for e in self._classObject.parameters])) elif self.ismodule: - self.icon = UI.PixmapCache.getIcon("module.png") + self.icon = UI.PixmapCache.getIcon("module") elif self.isenum: - self.icon = UI.PixmapCache.getIcon("attribute.png") + self.icon = UI.PixmapCache.getIcon("attribute") else: if cl.isPrivate(): - self.icon = UI.PixmapCache.getIcon("class_private.png") + self.icon = UI.PixmapCache.getIcon("class_private") elif cl.isProtected(): - self.icon = UI.PixmapCache.getIcon("class_protected.png") + self.icon = UI.PixmapCache.getIcon("class_protected") else: - self.icon = UI.PixmapCache.getIcon("class.png") + self.icon = UI.PixmapCache.getIcon("class") if ( self._classObject and (self._classObject.methods or @@ -1557,18 +1557,18 @@ self._functionObject.modifier == Utilities.ClassBrowsers.ClbrBaseClasses.Function.Static ): - self.icon = UI.PixmapCache.getIcon("method_static.png") + self.icon = UI.PixmapCache.getIcon("method_static") elif ( self._functionObject.modifier == Utilities.ClassBrowsers.ClbrBaseClasses.Function.Class ): - self.icon = UI.PixmapCache.getIcon("method_class.png") + self.icon = UI.PixmapCache.getIcon("method_class") elif self._functionObject.isPrivate(): - self.icon = UI.PixmapCache.getIcon("method_private.png") + self.icon = UI.PixmapCache.getIcon("method_private") elif self._functionObject.isProtected(): - self.icon = UI.PixmapCache.getIcon("method_protected.png") + self.icon = UI.PixmapCache.getIcon("method_protected") else: - self.icon = UI.PixmapCache.getIcon("method.png") + self.icon = UI.PixmapCache.getIcon("method") self.itemData[0] = "{0}({1})".format( name, ", ".join(self._functionObject.parameters)) if self._functionObject.annotation: @@ -1682,9 +1682,9 @@ self._populated = False self._lazyPopulation = True if isClass: - self.icon = UI.PixmapCache.getIcon("attributes_class.png") + self.icon = UI.PixmapCache.getIcon("attributes_class") else: - self.icon = UI.PixmapCache.getIcon("attributes.png") + self.icon = UI.PixmapCache.getIcon("attributes") self.__isClass = isClass def name(self): @@ -1749,13 +1749,13 @@ self._attributeObject = attribute self.__public = attribute.isPublic() if isClass: - self.icon = UI.PixmapCache.getIcon("attribute_class.png") + self.icon = UI.PixmapCache.getIcon("attribute_class") elif attribute.isPrivate(): - self.icon = UI.PixmapCache.getIcon("attribute_private.png") + self.icon = UI.PixmapCache.getIcon("attribute_private") elif attribute.isProtected(): - self.icon = UI.PixmapCache.getIcon("attribute_protected.png") + self.icon = UI.PixmapCache.getIcon("attribute_protected") else: - self.icon = UI.PixmapCache.getIcon("attribute.png") + self.icon = UI.PixmapCache.getIcon("attribute") def isPublic(self): """ @@ -1847,7 +1847,7 @@ BrowserItem.__init__(self, parent, text) self.type_ = BrowserItemCoding - self.icon = UI.PixmapCache.getIcon("textencoding.png") + self.icon = UI.PixmapCache.getIcon("textencoding") def lessThan(self, other, column, order): """ @@ -1881,7 +1881,7 @@ BrowserItem.__init__(self, parent, text) self.type_ = BrowserItemImports - self.icon = UI.PixmapCache.getIcon("imports.png") + self.icon = UI.PixmapCache.getIcon("imports") def lessThan(self, other, column, order): """ @@ -1924,9 +1924,9 @@ self.type_ = BrowserItemImport if isModule: - self.icon = UI.PixmapCache.getIcon("importedModule.png") + self.icon = UI.PixmapCache.getIcon("importedModule") else: - self.icon = UI.PixmapCache.getIcon("importedName.png") + self.icon = UI.PixmapCache.getIcon("importedName") def fileName(self): """
--- a/eric6/UI/CompareDialog.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/CompareDialog.py Sun Apr 12 19:07:49 2020 +0200 @@ -111,10 +111,10 @@ self.diffButton.setEnabled(False) self.diffButton.setDefault(True) - self.firstButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png")) - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) - self.lastButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png")) + self.firstButton.setIcon(UI.PixmapCache.getIcon("2uparrow")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) + self.lastButton.setIcon(UI.PixmapCache.getIcon("2downarrow")) self.totalLabel.setText(self.tr('Total: {0}').format(0)) self.changedLabel.setText(self.tr('Changed: {0}').format(0))
--- a/eric6/UI/LogView.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/LogView.py Sun Apr 12 19:07:49 2020 +0200 @@ -34,7 +34,7 @@ """ super(LogViewer, self).__init__(parent) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__ui = ui
--- a/eric6/UI/NumbersWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/NumbersWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -169,18 +169,18 @@ super(NumbersWidget, self).__init__(parent) self.setupUi(self) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__badNumberSheet = "background-color: #ffa0a0;" - self.binInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png")) - self.binOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png")) - self.octInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png")) - self.octOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png")) - self.decInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png")) - self.decOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png")) - self.hexInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png")) - self.hexOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png")) + self.binInButton.setIcon(UI.PixmapCache.getIcon("2downarrow")) + self.binOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow")) + self.octInButton.setIcon(UI.PixmapCache.getIcon("2downarrow")) + self.octOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow")) + self.decInButton.setIcon(UI.PixmapCache.getIcon("2downarrow")) + self.decOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow")) + self.hexInButton.setIcon(UI.PixmapCache.getIcon("2downarrow")) + self.hexOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow")) self.formatBox.addItem(self.tr("Auto"), 0) self.formatBox.addItem(self.tr("Dec"), 10)
--- a/eric6/UI/PixmapCache.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/PixmapCache.py Sun Apr 12 19:07:49 2020 +0200 @@ -140,7 +140,7 @@ @rtype QIcon """ pix1 = QPixmap(cache.getPixmap(key, size=size)) - pix2 = cache.getPixmap("symlink.png") + pix2 = cache.getPixmap("symlink") painter = QPainter(pix1) painter.drawPixmap(0, 10, pix2) painter.end()
--- a/eric6/UI/Previewers/PreviewerQSS.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/Previewers/PreviewerQSS.py Sun Apr 12 19:07:49 2020 +0200 @@ -53,9 +53,9 @@ # icon list widget for iconName, labelText in ( - ("filePython.png", self.tr("Python")), - ("fileRuby.png", self.tr("Ruby")), - ("fileJavascript.png", self.tr("JavaScript")), + ("filePython", self.tr("Python")), + ("fileRuby", self.tr("Ruby")), + ("fileJavascript", self.tr("JavaScript")), ): self.iconsListWidget.addItem(QListWidgetItem( UI.PixmapCache.getIcon(iconName), labelText))
--- a/eric6/UI/SearchWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/SearchWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -66,11 +66,11 @@ self.__findBackwards = True self.__ui.closeButton.setIcon( - UI.PixmapCache.getIcon("close.png")) + UI.PixmapCache.getIcon("close")) self.__ui.findPrevButton.setIcon( - UI.PixmapCache.getIcon("1leftarrow.png")) + UI.PixmapCache.getIcon("1leftarrow")) self.__ui.findNextButton.setIcon( - UI.PixmapCache.getIcon("1rightarrow.png")) + UI.PixmapCache.getIcon("1rightarrow")) self.findHistory = []
--- a/eric6/UI/SymbolsWidget.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/SymbolsWidget.py Sun Apr 12 19:07:49 2020 +0200 @@ -494,7 +494,7 @@ super(SymbolsWidget, self).__init__(parent) self.setupUi(self) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__model = SymbolsModel(self) self.symbolsTable.setModel(self.__model)
--- a/eric6/UI/UserInterface.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/UI/UserInterface.py Sun Apr 12 19:07:49 2020 +0200 @@ -225,8 +225,8 @@ self.capEditor = "" self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename") - QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__setWindowCaption() # load the view profiles @@ -834,7 +834,7 @@ from Project.ProjectBrowser import ProjectBrowser self.projectBrowser = ProjectBrowser(self.project) self.lToolbox.addItem(self.projectBrowser, - UI.PixmapCache.getIcon("projectViewer.png"), + UI.PixmapCache.getIcon("projectViewer"), self.tr("Project-Viewer")) # Create the multi project browser @@ -843,7 +843,7 @@ self.multiProjectBrowser = MultiProjectBrowser(self.multiProject, self.project) self.lToolbox.addItem(self.multiProjectBrowser, - UI.PixmapCache.getIcon("multiProjectViewer.png"), + UI.PixmapCache.getIcon("multiProjectViewer"), self.tr("Multiproject-Viewer")) if Preferences.getUI("ShowTemplateViewer"): @@ -853,7 +853,7 @@ self.templateViewer = TemplateViewer(None, self.viewmanager) self.lToolbox.addItem(self.templateViewer, - UI.PixmapCache.getIcon("templateViewer.png"), + UI.PixmapCache.getIcon("templateViewer"), self.tr("Template-Viewer")) #################################################### @@ -866,7 +866,7 @@ from .CodeDocumentationViewer import CodeDocumentationViewer self.codeDocumentationViewer = CodeDocumentationViewer(self) self.rToolbox.addItem(self.codeDocumentationViewer, - UI.PixmapCache.getIcon("codeDocuViewer.png"), + UI.PixmapCache.getIcon("codeDocuViewer"), self.tr("Code Documentation Viewer")) # Create the debug viewer @@ -874,7 +874,7 @@ from Debugger.DebugViewer import DebugViewer self.debugViewer = DebugViewer(debugServer) self.rToolbox.addItem(self.debugViewer, - UI.PixmapCache.getIcon("debugViewer.png"), + UI.PixmapCache.getIcon("debugViewer"), self.tr("Debug-Viewer")) if Preferences.getUI("ShowPyPIPackageManager"): @@ -892,7 +892,7 @@ from CondaInterface.CondaPackagesWidget import CondaPackagesWidget self.condaWidget = CondaPackagesWidget(self.condaInterface) self.rToolbox.addItem(self.condaWidget, - UI.PixmapCache.getIcon("miniconda.png"), + UI.PixmapCache.getIcon("miniconda"), self.tr("Conda")) if Preferences.getUI("ShowCooperation"): @@ -901,7 +901,7 @@ from Cooperation.ChatWidget import ChatWidget self.cooperation = ChatWidget(self) self.rToolbox.addItem(self.cooperation, - UI.PixmapCache.getIcon("cooperation.png"), + UI.PixmapCache.getIcon("cooperation"), self.tr("Cooperation")) if Preferences.getUI("ShowIrc"): @@ -910,7 +910,7 @@ from Network.IRC.IrcWidget import IrcWidget self.irc = IrcWidget(self) self.rToolbox.addItem(self.irc, - UI.PixmapCache.getIcon("irc.png"), + UI.PixmapCache.getIcon("irc"), self.tr("IRC")) if Preferences.getUI("ShowMicroPython"): @@ -931,7 +931,7 @@ from Tasks.TaskViewer import TaskViewer self.taskViewer = TaskViewer(None, self.project) self.hToolbox.addItem(self.taskViewer, - UI.PixmapCache.getIcon("task.png"), + UI.PixmapCache.getIcon("task"), self.tr("Task-Viewer")) # Create the log viewer part of the user interface @@ -939,7 +939,7 @@ from .LogView import LogViewer self.logViewer = LogViewer(self) self.hToolbox.addItem(self.logViewer, - UI.PixmapCache.getIcon("logViewer.png"), + UI.PixmapCache.getIcon("logViewer"), self.tr("Log-Viewer")) if Preferences.getUI("ShowFileBrowser"): @@ -948,7 +948,7 @@ from .Browser import Browser self.browser = Browser() self.lToolbox.addItem(self.browser, - UI.PixmapCache.getIcon("browser.png"), + UI.PixmapCache.getIcon("browser"), self.tr("File-Browser")) if Preferences.getUI("ShowSymbolsViewer"): @@ -957,7 +957,7 @@ from .SymbolsWidget import SymbolsWidget self.symbolsViewer = SymbolsWidget() self.lToolbox.addItem(self.symbolsViewer, - UI.PixmapCache.getIcon("symbols.png"), + UI.PixmapCache.getIcon("symbols"), self.tr("Symbols")) if Preferences.getUI("ShowNumbersViewer"): @@ -966,7 +966,7 @@ from .NumbersWidget import NumbersWidget self.numbersViewer = NumbersWidget() self.hToolbox.addItem(self.numbersViewer, - UI.PixmapCache.getIcon("numbers.png"), + UI.PixmapCache.getIcon("numbers"), self.tr("Numbers")) #################################################### @@ -987,7 +987,7 @@ debugServer, self.viewmanager, self.project, True) self.shell = self.shellAssembly.shell() self.__shellParent.widget().insertItem( - 0, self.shellAssembly, UI.PixmapCache.getIcon("shell.png"), + 0, self.shellAssembly, UI.PixmapCache.getIcon("shell"), self.tr("Shell")) #################################################### @@ -1028,7 +1028,7 @@ self.projectBrowser = ProjectBrowser(self.project) self.leftSidebar.addTab( self.projectBrowser, - UI.PixmapCache.getIcon("projectViewer.png"), + UI.PixmapCache.getIcon("projectViewer"), self.tr("Project-Viewer")) # Create the multi project browser @@ -1038,7 +1038,7 @@ self.project) self.leftSidebar.addTab( self.multiProjectBrowser, - UI.PixmapCache.getIcon("multiProjectViewer.png"), + UI.PixmapCache.getIcon("multiProjectViewer"), self.tr("Multiproject-Viewer")) if Preferences.getUI("ShowTemplateViewer"): @@ -1049,7 +1049,7 @@ self.viewmanager) self.leftSidebar.addTab( self.templateViewer, - UI.PixmapCache.getIcon("templateViewer.png"), + UI.PixmapCache.getIcon("templateViewer"), self.tr("Template-Viewer")) #################################################### @@ -1063,7 +1063,7 @@ self.codeDocumentationViewer = CodeDocumentationViewer(self) self.rightSidebar.addTab( self.codeDocumentationViewer, - UI.PixmapCache.getIcon("codeDocuViewer.png"), + UI.PixmapCache.getIcon("codeDocuViewer"), self.tr("Code Documentation Viewer")) # Create the debug viewer @@ -1071,7 +1071,7 @@ from Debugger.DebugViewer import DebugViewer self.debugViewer = DebugViewer(debugServer) self.rightSidebar.addTab( - self.debugViewer, UI.PixmapCache.getIcon("debugViewer.png"), + self.debugViewer, UI.PixmapCache.getIcon("debugViewer"), self.tr("Debug-Viewer")) if Preferences.getUI("ShowPyPIPackageManager"): @@ -1089,7 +1089,7 @@ from CondaInterface.CondaPackagesWidget import CondaPackagesWidget self.condaWidget = CondaPackagesWidget(self.condaInterface) self.rightSidebar.addTab( - self.condaWidget, UI.PixmapCache.getIcon("miniconda.png"), + self.condaWidget, UI.PixmapCache.getIcon("miniconda"), self.tr("Conda")) if Preferences.getUI("ShowCooperation"): @@ -1098,7 +1098,7 @@ from Cooperation.ChatWidget import ChatWidget self.cooperation = ChatWidget(self) self.rightSidebar.addTab( - self.cooperation, UI.PixmapCache.getIcon("cooperation.png"), + self.cooperation, UI.PixmapCache.getIcon("cooperation"), self.tr("Cooperation")) if Preferences.getUI("ShowIrc"): @@ -1107,7 +1107,7 @@ from Network.IRC.IrcWidget import IrcWidget self.irc = IrcWidget(self) self.rightSidebar.addTab( - self.irc, UI.PixmapCache.getIcon("irc.png"), + self.irc, UI.PixmapCache.getIcon("irc"), self.tr("IRC")) if Preferences.getUI("ShowMicroPython"): @@ -1128,7 +1128,7 @@ from Tasks.TaskViewer import TaskViewer self.taskViewer = TaskViewer(None, self.project) self.bottomSidebar.addTab(self.taskViewer, - UI.PixmapCache.getIcon("task.png"), + UI.PixmapCache.getIcon("task"), self.tr("Task-Viewer")) # Create the log viewer part of the user interface @@ -1136,7 +1136,7 @@ from .LogView import LogViewer self.logViewer = LogViewer(self) self.bottomSidebar.addTab(self.logViewer, - UI.PixmapCache.getIcon("logViewer.png"), + UI.PixmapCache.getIcon("logViewer"), self.tr("Log-Viewer")) if Preferences.getUI("ShowFileBrowser"): @@ -1145,7 +1145,7 @@ from .Browser import Browser self.browser = Browser() self.leftSidebar.addTab(self.browser, - UI.PixmapCache.getIcon("browser.png"), + UI.PixmapCache.getIcon("browser"), self.tr("File-Browser")) if Preferences.getUI("ShowSymbolsViewer"): @@ -1154,7 +1154,7 @@ from .SymbolsWidget import SymbolsWidget self.symbolsViewer = SymbolsWidget() self.leftSidebar.addTab(self.symbolsViewer, - UI.PixmapCache.getIcon("symbols.png"), + UI.PixmapCache.getIcon("symbols"), self.tr("Symbols")) if Preferences.getUI("ShowNumbersViewer"): @@ -1163,7 +1163,7 @@ from .NumbersWidget import NumbersWidget self.numbersViewer = NumbersWidget() self.bottomSidebar.addTab(self.numbersViewer, - UI.PixmapCache.getIcon("numbers.png"), + UI.PixmapCache.getIcon("numbers"), self.tr("Numbers")) #################################################### @@ -1184,7 +1184,7 @@ debugServer, self.viewmanager, self.project, True) self.shell = self.shellAssembly.shell() self.__shellParent.insertTab(0, self.shellAssembly, - UI.PixmapCache.getIcon("shell.png"), + UI.PixmapCache.getIcon("shell"), self.tr("Shell")) #################################################### @@ -1521,7 +1521,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') @@ -1538,7 +1538,7 @@ self.restartAct = E5Action( self.tr('Restart'), - UI.PixmapCache.getIcon("restart.png"), + UI.PixmapCache.getIcon("restart"), self.tr('Restart'), QKeySequence(self.tr("Ctrl+Shift+Q", "File|Quit")), 0, self, 'restart_eric') @@ -1580,7 +1580,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') @@ -1599,7 +1599,7 @@ self.setEditProfileAct = E5Action( self.tr('Edit Profile'), - UI.PixmapCache.getIcon("viewProfileEdit.png"), + UI.PixmapCache.getIcon("viewProfileEdit"), self.tr('Edit Profile'), 0, 0, self.viewProfileActGrp, 'edit_profile', True) @@ -1616,7 +1616,7 @@ self.setDebugProfileAct = E5Action( self.tr('Debug Profile'), - UI.PixmapCache.getIcon("viewProfileDebug.png"), + UI.PixmapCache.getIcon("viewProfileDebug"), self.tr('Debug Profile'), 0, 0, self.viewProfileActGrp, 'debug_profile', True) @@ -2005,7 +2005,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")), 0, self, 'whatsThis') @@ -2023,7 +2023,7 @@ self.helpviewerAct = E5Action( self.tr('Helpviewer'), - UI.PixmapCache.getIcon("help.png"), + UI.PixmapCache.getIcon("help"), self.tr('&Helpviewer...'), QKeySequence(self.tr("F1")), 0, self, 'helpviewer') @@ -2127,7 +2127,7 @@ self.utDialogAct = E5Action( self.tr('Unittest'), - UI.PixmapCache.getIcon("unittest.png"), + UI.PixmapCache.getIcon("unittest"), self.tr('&Unittest...'), 0, 0, self.utActGrp, 'unittest') self.utDialogAct.setStatusTip(self.tr('Start unittest dialog')) @@ -2141,7 +2141,7 @@ self.utRestartAct = E5Action( self.tr('Unittest Restart'), - UI.PixmapCache.getIcon("unittestRestart.png"), + UI.PixmapCache.getIcon("unittestRestart"), self.tr('&Restart Unittest...'), 0, 0, self.utActGrp, 'unittest_restart') self.utRestartAct.setStatusTip(self.tr('Restart last unittest')) @@ -2155,7 +2155,7 @@ self.utRerunFailedAct = E5Action( self.tr('Unittest Rerun Failed'), - UI.PixmapCache.getIcon("unittestRerunFailed.png"), + UI.PixmapCache.getIcon("unittestRerunFailed"), self.tr('Rerun Failed Tests...'), 0, 0, self.utActGrp, 'unittest_rerun_failed') self.utRerunFailedAct.setStatusTip(self.tr( @@ -2171,7 +2171,7 @@ self.utScriptAct = E5Action( self.tr('Unittest Script'), - UI.PixmapCache.getIcon("unittestScript.png"), + UI.PixmapCache.getIcon("unittestScript"), self.tr('Unittest &Script...'), 0, 0, self.utActGrp, 'unittest_script') self.utScriptAct.setStatusTip(self.tr( @@ -2186,7 +2186,7 @@ self.utProjectAct = E5Action( self.tr('Unittest Project'), - UI.PixmapCache.getIcon("unittestProject.png"), + UI.PixmapCache.getIcon("unittestProject"), self.tr('Unittest &Project...'), 0, 0, self.utActGrp, 'unittest_project') self.utProjectAct.setStatusTip(self.tr( @@ -2213,7 +2213,7 @@ if os.path.exists(designerExe): self.designer4Act = E5Action( self.tr('Qt-Designer'), - UI.PixmapCache.getIcon("designer4.png"), + UI.PixmapCache.getIcon("designer4"), self.tr('Qt-&Designer...'), 0, 0, self, 'qt_designer4') self.designer4Act.setStatusTip(self.tr('Start Qt-Designer')) @@ -2239,7 +2239,7 @@ if os.path.exists(linguistExe): self.linguist4Act = E5Action( self.tr('Qt-Linguist'), - UI.PixmapCache.getIcon("linguist4.png"), + UI.PixmapCache.getIcon("linguist4"), self.tr('Qt-&Linguist...'), 0, 0, self, 'qt_linguist4') self.linguist4Act.setStatusTip(self.tr('Start Qt-Linguist')) @@ -2254,7 +2254,7 @@ self.uipreviewerAct = E5Action( self.tr('UI Previewer'), - UI.PixmapCache.getIcon("uiPreviewer.png"), + UI.PixmapCache.getIcon("uiPreviewer"), self.tr('&UI Previewer...'), 0, 0, self, 'ui_previewer') self.uipreviewerAct.setStatusTip(self.tr('Start the UI Previewer')) @@ -2267,7 +2267,7 @@ self.trpreviewerAct = E5Action( self.tr('Translations Previewer'), - UI.PixmapCache.getIcon("trPreviewer.png"), + UI.PixmapCache.getIcon("trPreviewer"), self.tr('&Translations Previewer...'), 0, 0, self, 'tr_previewer') self.trpreviewerAct.setStatusTip(self.tr( @@ -2281,7 +2281,7 @@ self.diffAct = E5Action( self.tr('Compare Files'), - UI.PixmapCache.getIcon("diffFiles.png"), + UI.PixmapCache.getIcon("diffFiles"), self.tr('&Compare Files...'), 0, 0, self, 'diff_files') self.diffAct.setStatusTip(self.tr('Compare two files')) @@ -2294,7 +2294,7 @@ self.compareAct = E5Action( self.tr('Compare Files side by side'), - UI.PixmapCache.getIcon("compareFiles.png"), + UI.PixmapCache.getIcon("compareFiles"), self.tr('Compare &Files side by side...'), 0, 0, self, 'compare_files') self.compareAct.setStatusTip(self.tr('Compare two files')) @@ -2308,7 +2308,7 @@ self.sqlBrowserAct = E5Action( self.tr('SQL Browser'), - UI.PixmapCache.getIcon("sqlBrowser.png"), + UI.PixmapCache.getIcon("sqlBrowser"), self.tr('SQL &Browser...'), 0, 0, self, 'sql_browser') self.sqlBrowserAct.setStatusTip(self.tr('Browse a SQL database')) @@ -2321,7 +2321,7 @@ self.miniEditorAct = E5Action( self.tr('Mini Editor'), - UI.PixmapCache.getIcon("editor.png"), + UI.PixmapCache.getIcon("editor"), self.tr('Mini &Editor...'), 0, 0, self, 'mini_editor') self.miniEditorAct.setStatusTip(self.tr('Mini Editor')) @@ -2334,7 +2334,7 @@ self.hexEditorAct = E5Action( self.tr('Hex Editor'), - UI.PixmapCache.getIcon("hexEditor.png"), + UI.PixmapCache.getIcon("hexEditor"), self.tr('&Hex Editor...'), 0, 0, self, 'hex_editor') self.hexEditorAct.setStatusTip(self.tr( @@ -2349,7 +2349,7 @@ self.webBrowserAct = E5Action( self.tr('eric6 Web Browser'), - UI.PixmapCache.getIcon("ericWeb.png"), + UI.PixmapCache.getIcon("ericWeb"), self.tr('eric6 &Web Browser...'), 0, 0, self, 'web_browser') self.webBrowserAct.setStatusTip(self.tr( @@ -2365,7 +2365,7 @@ self.iconEditorAct = E5Action( self.tr('Icon Editor'), - UI.PixmapCache.getIcon("iconEditor.png"), + UI.PixmapCache.getIcon("iconEditor"), self.tr('&Icon Editor...'), 0, 0, self, 'icon_editor') self.iconEditorAct.setStatusTip(self.tr( @@ -2379,7 +2379,7 @@ self.snapshotAct = E5Action( self.tr('Snapshot'), - UI.PixmapCac