diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Oct 18 16:06:21 2022 +0200
@@ -35,18 +35,17 @@
QInputDialog,
)
-from EricWidgets.EricApplication import ericApp
-from EricWidgets import EricMessageBox, EricFileDialog
-from EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog
from .HgDiffHighlighter import HgDiffHighlighter
from .HgDiffGenerator import HgDiffGenerator
-import UI.PixmapCache
-import Preferences
-import Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7 import Preferences, Utilities
COLORNAMES = [
"blue",
@@ -153,8 +152,8 @@
self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
self.filesTree.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder)
- self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
- self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
+ self.upButton.setIcon(EricPixmapCache.getIcon("1uparrow"))
+ self.downButton.setIcon(EricPixmapCache.getIcon("1downarrow"))
self.refreshButton = self.buttonBox.addButton(
self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole
@@ -164,8 +163,8 @@
)
self.refreshButton.setEnabled(False)
- self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
- self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
+ self.findPrevButton.setIcon(EricPixmapCache.getIcon("1leftarrow"))
+ self.findNextButton.setIcon(EricPixmapCache.getIcon("1rightarrow"))
self.__findBackwards = False
self.modeComboBox.addItem(self.tr("Find"), "find")
@@ -298,7 +297,7 @@
self.__actionsMenu.setToolTipsVisible(True)
self.__graftAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsGraft"),
+ EricPixmapCache.getIcon("vcsGraft"),
self.tr("Copy Changesets"),
self.__graftActTriggered,
)
@@ -307,7 +306,7 @@
)
self.__mergeAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsMerge"),
+ EricPixmapCache.getIcon("vcsMerge"),
self.tr("Merge with Changeset"),
self.__mergeActTriggered,
)
@@ -330,19 +329,19 @@
)
self.__tagAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsTag"), self.tr("Tag"), self.__tagActTriggered
+ EricPixmapCache.getIcon("vcsTag"), self.tr("Tag"), self.__tagActTriggered
)
self.__tagAct.setToolTip(self.tr("Tag the selected revision"))
self.__closeHeadsAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("closehead"),
+ EricPixmapCache.getIcon("closehead"),
self.tr("Close Heads"),
self.__closeHeadsActTriggered,
)
self.__closeHeadsAct.setToolTip(self.tr("Close the selected heads"))
self.__switchAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsSwitch"),
+ EricPixmapCache.getIcon("vcsSwitch"),
self.tr("Switch"),
self.__switchActTriggered,
)
@@ -353,13 +352,13 @@
self.__actionsMenu.addSeparator()
self.__bookmarkAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("addBookmark"),
+ EricPixmapCache.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"),
+ EricPixmapCache.getIcon("moveBookmark"),
self.tr("Move Bookmark..."),
self.__bookmarkMoveActTriggered,
)
@@ -370,7 +369,7 @@
self.__actionsMenu.addSeparator()
self.__pullAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsUpdate"),
+ EricPixmapCache.getIcon("vcsUpdate"),
self.tr("Pull Changes"),
self.__pullActTriggered,
)
@@ -383,7 +382,7 @@
self.__actionsMenu.addSeparator()
self.__pushAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsCommit"),
+ EricPixmapCache.getIcon("vcsCommit"),
self.tr("Push Selected Changes"),
self.__pushActTriggered,
)
@@ -394,7 +393,7 @@
)
)
self.__pushAllAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsCommit"),
+ EricPixmapCache.getIcon("vcsCommit"),
self.tr("Push All Changes"),
self.__pushAllActTriggered,
)
@@ -403,7 +402,7 @@
self.__actionsMenu.addSeparator()
self.__bundleAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsCreateChangegroup"),
+ EricPixmapCache.getIcon("vcsCreateChangegroup"),
self.tr("Create Changegroup"),
self.__bundleActTriggered,
)
@@ -423,7 +422,7 @@
)
)
self.__unbundleAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("vcsApplyChangegroup"),
+ EricPixmapCache.getIcon("vcsApplyChangegroup"),
self.tr("Apply Changegroup"),
self.__unbundleActTriggered,
)
@@ -434,7 +433,7 @@
self.__actionsMenu.addSeparator()
self.__gpgSignAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("changesetSign"),
+ EricPixmapCache.getIcon("changesetSign"),
self.tr("Sign Revisions"),
self.__gpgSignActTriggered,
)
@@ -442,7 +441,7 @@
self.tr("Add a signature for the selected revisions")
)
self.__gpgVerifyAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("changesetSignVerify"),
+ EricPixmapCache.getIcon("changesetSignVerify"),
self.tr("Verify Signatures"),
self.__gpgVerifyActTriggered,
)
@@ -453,7 +452,7 @@
self.__actionsMenu.addSeparator()
self.__stripAct = self.__actionsMenu.addAction(
- UI.PixmapCache.getIcon("fileDelete"),
+ EricPixmapCache.getIcon("fileDelete"),
self.tr("Strip Changesets"),
self.__stripActTriggered,
)
@@ -468,7 +467,7 @@
self.tr("Deselect All Entries"), lambda: self.__selectAllActTriggered(False)
)
- self.actionsButton.setIcon(UI.PixmapCache.getIcon("actionsToolButton"))
+ self.actionsButton.setIcon(EricPixmapCache.getIcon("actionsToolButton"))
self.actionsButton.setMenu(self.__actionsMenu)
def __initData(self):
