--- 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(