Mercurial Repositories > eric / file diff

diff -r 2f4b8212a151 -r 1436fd09d1e1 eric6/Project/ProjectSourcesBrowser.py
--- a/eric6/Project/ProjectSourcesBrowser.py	Sat May 01 15:08:38 2021 +0200
+++ b/eric6/Project/ProjectSourcesBrowser.py	Sat May 01 16:01:43 2021 +0200
@@ -123,6 +123,7 @@
             self.tr('Profile data...'), self.__showProfileData)
         self.menuShow.aboutToShow.connect(self.__showContextMenuShow)
         
+        # TODO: differentiate between file and directory/package
         self.graphicsMenu = QMenu(self.tr('Diagrams'))
         self.classDiagramAction = self.graphicsMenu.addAction(
             self.tr("Class Diagram..."), self.__showClassDiagram)
@@ -1077,9 +1078,11 @@
             self.tr("Class Diagram"),
             self.tr("""Include class attributes?"""),
             yesDefault=True)
-        from Graphics.UMLDialog import UMLDialog
-        self.classDiagram = UMLDialog(UMLDialog.ClassDiagram, self.project, fn,
-                                      self, noAttrs=not res)
+        
+        from Graphics.UMLDialog import UMLDialog, UMLDialogType
+        self.classDiagram = UMLDialog(
+            UMLDialogType.CLASS_DIAGRAM, self.project, fn,
+            self, noAttrs=not res)
         self.classDiagram.show()
         
     def __showImportsDiagram(self):
@@ -1096,9 +1099,10 @@
             self,
             self.tr("Imports Diagram"),
             self.tr("""Include imports from external modules?"""))
-        from Graphics.UMLDialog import UMLDialog
+        
+        from Graphics.UMLDialog import UMLDialog, UMLDialogType
         self.importsDiagram = UMLDialog(
-            UMLDialog.ImportsDiagram, self.project, package,
+            UMLDialogType.IMPORTS_DIAGRAM, self.project, package,
             self, showExternalImports=res)
         self.importsDiagram.show()
         
@@ -1117,9 +1121,10 @@
             self.tr("Package Diagram"),
             self.tr("""Include class attributes?"""),
             yesDefault=True)
-        from Graphics.UMLDialog import UMLDialog
+        
+        from Graphics.UMLDialog import UMLDialog, UMLDialogType
         self.packageDiagram = UMLDialog(
-            UMLDialog.PackageDiagram, self.project, package,
+            UMLDialogType.PACKAGE_DIAGRAM, self.project, package,
             self, noAttrs=not res)
         self.packageDiagram.show()
         
@@ -1132,9 +1137,10 @@
             self.tr("Application Diagram"),
             self.tr("""Include module names?"""),
             yesDefault=True)
-        from Graphics.UMLDialog import UMLDialog
+        
+        from Graphics.UMLDialog import UMLDialog, UMLDialogType
         self.applicationDiagram = UMLDialog(
-            UMLDialog.ApplicationDiagram, self.project,
+            UMLDialogType.APPLICATION_DIAGRAM, self.project,
             self, noModules=not res)
         self.applicationDiagram.show()
     
@@ -1142,10 +1148,10 @@
         """
         Private slot to load a diagram from file.
         """
-        from Graphics.UMLDialog import UMLDialog
+        from Graphics.UMLDialog import UMLDialog, UMLDialogType
         self.loadedDiagram = None
         loadedDiagram = UMLDialog(
-            UMLDialog.NoDiagram, self.project, parent=self)
+            UMLDialogType.NO_DIAGRAM, self.project, parent=self)
         if loadedDiagram.load():
             self.loadedDiagram = loadedDiagram
             self.loadedDiagram.show(fromFile=True)