diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Project/ProjectBrowser.py --- a/src/eric7/Project/ProjectBrowser.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Project/ProjectBrowser.py Tue Oct 18 16:06:21 2022 +0200 @@ -11,11 +11,11 @@ from PyQt6.QtGui import QColor from PyQt6.QtWidgets import QApplication -from EricWidgets.EricTabWidget import EricTabWidget -from EricWidgets.EricLed import EricClickableLed +from eric7.EricWidgets.EricTabWidget import EricTabWidget +from eric7.EricWidgets.EricLed import EricClickableLed -import UI.PixmapCache -import Preferences +from eric7.EricGui import EricPixmapCache +from eric7 import Preferences from .ProjectBrowserFlags import ( SourcesBrowserFlag, @@ -51,7 +51,7 @@ EricTabWidget.__init__(self, parent) self.project = project - self.setWindowIcon(UI.PixmapCache.getIcon("eric")) + self.setWindowIcon(EricPixmapCache.getIcon("eric")) self.setUsesScrollButtons(True) @@ -176,41 +176,41 @@ # step 2: add browsers if browserFlags & SourcesBrowserFlag: index = self.addTab( - self.psBrowser, UI.PixmapCache.getIcon("projectSources"), "" + self.psBrowser, EricPixmapCache.getIcon("projectSources"), "" ) self.setTabToolTip(index, self.psBrowser.windowTitle()) if browserFlags & FormsBrowserFlag: index = self.addTab( - self.pfBrowser, UI.PixmapCache.getIcon("projectForms"), "" + self.pfBrowser, EricPixmapCache.getIcon("projectForms"), "" ) self.setTabToolTip(index, self.pfBrowser.windowTitle()) if browserFlags & ResourcesBrowserFlag: index = self.addTab( - self.prBrowser, UI.PixmapCache.getIcon("projectResources"), "" + self.prBrowser, EricPixmapCache.getIcon("projectResources"), "" ) self.setTabToolTip(index, self.prBrowser.windowTitle()) if browserFlags & TranslationsBrowserFlag: index = self.addTab( - self.ptBrowser, UI.PixmapCache.getIcon("projectTranslations"), "" + self.ptBrowser, EricPixmapCache.getIcon("projectTranslations"), "" ) self.setTabToolTip(index, self.ptBrowser.windowTitle()) if browserFlags & InterfacesBrowserFlag: index = self.addTab( - self.piBrowser, UI.PixmapCache.getIcon("projectInterfaces"), "" + self.piBrowser, EricPixmapCache.getIcon("projectInterfaces"), "" ) self.setTabToolTip(index, self.piBrowser.windowTitle()) if browserFlags & ProtocolsBrowserFlag: - index = self.addTab(self.ppBrowser, UI.PixmapCache.getIcon("protobuf"), "") + index = self.addTab(self.ppBrowser, EricPixmapCache.getIcon("protobuf"), "") self.setTabToolTip(index, self.ppBrowser.windowTitle()) if browserFlags & OthersBrowserFlag: index = self.addTab( - self.poBrowser, UI.PixmapCache.getIcon("projectOthers"), "" + self.poBrowser, EricPixmapCache.getIcon("projectOthers"), "" ) self.setTabToolTip(index, self.poBrowser.windowTitle()) @@ -276,24 +276,24 @@ Private method to set the right icon for the sources browser tab. """ if not self.project.isOpen(): - icon = UI.PixmapCache.getIcon("projectSources") + icon = EricPixmapCache.getIcon("projectSources") else: if self.project.getProjectLanguage() == "Python3": if self.project.isMixedLanguageProject(): - icon = UI.PixmapCache.getIcon("projectSourcesPyMixed") + icon = EricPixmapCache.getIcon("projectSourcesPyMixed") else: - icon = UI.PixmapCache.getIcon("projectSourcesPy") + icon = EricPixmapCache.getIcon("projectSourcesPy") elif self.project.getProjectLanguage() == "MicroPython": - icon = UI.PixmapCache.getIcon("micropython") + icon = EricPixmapCache.getIcon("micropython") elif self.project.getProjectLanguage() == "Ruby": if self.project.isMixedLanguageProject(): - icon = UI.PixmapCache.getIcon("projectSourcesRbMixed") + icon = EricPixmapCache.getIcon("projectSourcesRbMixed") else: - icon = UI.PixmapCache.getIcon("projectSourcesRb") + icon = EricPixmapCache.getIcon("projectSourcesRb") elif self.project.getProjectLanguage() == "JavaScript": - icon = UI.PixmapCache.getIcon("projectSourcesJavaScript") + icon = EricPixmapCache.getIcon("projectSourcesJavaScript") else: - icon = UI.PixmapCache.getIcon("projectSources") + icon = EricPixmapCache.getIcon("projectSources") self.setTabIcon(self.indexOf(self.psBrowser), icon) def handleEditorChanged(self, fn):