diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py --- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Tue Oct 18 16:06:21 2022 +0200 @@ -26,19 +26,19 @@ QInputDialog, ) -from EricWidgets.EricApplication import ericApp -from EricWidgets import EricMessageBox, EricFileDialog -from EricGui.EricOverrideCursor import EricOverrideCursorProcess +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets import EricMessageBox, EricFileDialog +from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess -from Globals import strToQByteArray +from eric7.Globals import strToQByteArray from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog from .GitDiffHighlighter import GitDiffHighlighter from .GitDiffGenerator import GitDiffGenerator -import UI.PixmapCache -import Preferences +from eric7.EricGui import EricPixmapCache +from eric7 import Preferences COLORNAMES = [ "red", @@ -117,8 +117,8 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(1, 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 @@ -126,8 +126,8 @@ self.refreshButton.setToolTip(self.tr("Press to refresh the list of commits")) 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") @@ -374,7 +374,7 @@ self.tr("Show the most recent tag reachable from a commit") ) - self.actionsButton.setIcon(UI.PixmapCache.getIcon("actionsToolButton")) + self.actionsButton.setIcon(EricPixmapCache.getIcon("actionsToolButton")) self.actionsButton.setMenu(self.__actionsMenu) def __initData(self):