--- 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):