Mercurial Repositories > eric / file diff

--- a/src/eric7/Project/ProjectSourcesBrowser.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Project/ProjectSourcesBrowser.py	Tue Oct 18 16:06:21 2022 +0200
@@ -13,10 +13,10 @@
 from PyQt6.QtCore import pyqtSignal
 from PyQt6.QtWidgets import QDialog, QInputDialog, QMenu
 
-from EricWidgets import EricMessageBox
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 
-from UI.BrowserModel import (
+from eric7.UI.BrowserModel import (
     BrowserFileItem,
     BrowserClassItem,
     BrowserMethodItem,
@@ -32,10 +32,10 @@
 )
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-import Utilities
-import UI.PixmapCache
+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 
-from CodeFormatting.BlackFormattingAction import BlackFormattingAction
+from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
 
 
 class ProjectSourcesBrowser(ProjectBaseBrowser):
@@ -169,7 +169,7 @@
         )
         self.graphicsMenu.addSeparator()
         self.graphicsMenu.addAction(
-            UI.PixmapCache.getIcon("open"),
+            EricPixmapCache.getIcon("open"),
             self.tr("Load Diagram..."),
             self.__loadDiagram,
         )
@@ -177,22 +177,22 @@
 
         self.__startMenu = QMenu(self.tr("Start"), self)
         self.__startMenu.addAction(
-            UI.PixmapCache.getIcon("runScript"),
+            EricPixmapCache.getIcon("runScript"),
             self.tr("Run Script..."),
             self.__contextMenuRunScript,
         )
         self.__startMenu.addAction(
-            UI.PixmapCache.getIcon("debugScript"),
+            EricPixmapCache.getIcon("debugScript"),
             self.tr("Debug Script..."),
             self.__contextMenuDebugScript,
         )
         self.__startMenu.addAction(
-            UI.PixmapCache.getIcon("profileScript"),
+            EricPixmapCache.getIcon("profileScript"),
             self.tr("Profile Script..."),
             self.__contextMenuProfileScript,
         )
         self.__startMenu.addAction(
-            UI.PixmapCache.getIcon("coverageScript"),
+            EricPixmapCache.getIcon("coverageScript"),
             self.tr("Coverage run of Script..."),
             self.__contextMenuCoverageScript,
         )
@@ -364,7 +364,7 @@
         )
         self.graphicsMenu.addSeparator()
         self.graphicsMenu.addAction(
-            UI.PixmapCache.getIcon("fileOpen"),
+            EricPixmapCache.getIcon("fileOpen"),
             self.tr("Load Diagram..."),
             self.__loadDiagram,
         )
@@ -968,7 +968,7 @@
             fn = self.project.getRelativePath(fn2)
             files.append(fn)
 
-        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
+        from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 
         dlg = DeleteFilesConfirmationDialog(
             self.parent(),
@@ -1003,7 +1003,7 @@
         itm = self.model().item(self.currentIndex())
         fn = itm.fileName()
 
-        from DataViews.CodeMetricsDialog import CodeMetricsDialog
+        from eric7.DataViews.CodeMetricsDialog import CodeMetricsDialog
 
         self.codemetrics = CodeMetricsDialog()
         self.codemetrics.show()
@@ -1042,7 +1042,7 @@
         else:
             return
 
-        from DataViews.PyCoverageDialog import PyCoverageDialog
+        from eric7.DataViews.PyCoverageDialog import PyCoverageDialog
 
         self.codecoverage = PyCoverageDialog()
         self.codecoverage.show()
@@ -1081,7 +1081,7 @@
         else:
             return
 
-        from DataViews.PyProfileDialog import PyProfileDialog
+        from eric7.DataViews.PyProfileDialog import PyProfileDialog
 
         self.profiledata = PyProfileDialog()
         self.profiledata.show()
@@ -1113,7 +1113,7 @@
             yesDefault=True,
         )
 
-        from Graphics.UMLDialog import UMLDialog, UMLDialogType
+        from eric7.Graphics.UMLDialog import UMLDialog, UMLDialogType
 
         self.classDiagram = UMLDialog(
             UMLDialogType.CLASS_DIAGRAM, self.project, fn, self, noAttrs=not res
@@ -1136,7 +1136,7 @@
             self.tr("""Include imports from external modules?"""),
         )
 
-        from Graphics.UMLDialog import UMLDialog, UMLDialogType
+        from eric7.Graphics.UMLDialog import UMLDialog, UMLDialogType
 
         self.importsDiagram = UMLDialog(
             UMLDialogType.IMPORTS_DIAGRAM,
@@ -1164,7 +1164,7 @@
             yesDefault=True,
         )
 
-        from Graphics.UMLDialog import UMLDialog, UMLDialogType
+        from eric7.Graphics.UMLDialog import UMLDialog, UMLDialogType
 
         self.packageDiagram = UMLDialog(
             UMLDialogType.PACKAGE_DIAGRAM, self.project, package, self, noAttrs=not res
@@ -1182,7 +1182,7 @@
             yesDefault=True,
         )
 
-        from Graphics.UMLDialog import UMLDialog, UMLDialogType
+        from eric7.Graphics.UMLDialog import UMLDialog, UMLDialogType
 
         self.applicationDiagram = UMLDialog(
             UMLDialogType.APPLICATION_DIAGRAM, self.project, self, noModules=not res
@@ -1193,7 +1193,7 @@
         """
         Private slot to load a diagram from file.
         """
-        from Graphics.UMLDialog import UMLDialog, UMLDialogType
+        from eric7.Graphics.UMLDialog import UMLDialog, UMLDialogType
 
         self.loadedDiagram = None
         loadedDiagram = UMLDialog(UMLDialogType.NO_DIAGRAM, self.project, parent=self)
@@ -1259,8 +1259,10 @@
         @param action formatting operation to be performed
         @type BlackFormattingAction
         """
-        from CodeFormatting.BlackConfigurationDialog import BlackConfigurationDialog
-        from CodeFormatting.BlackFormattingDialog import BlackFormattingDialog
+        from eric7.CodeFormatting.BlackConfigurationDialog import (
+            BlackConfigurationDialog,
+        )
+        from eric7.CodeFormatting.BlackFormattingDialog import BlackFormattingDialog
 
         files = [
             itm.fileName()