diff -r 1358e9d67a1c -r 88261c96484b eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py --- 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()