Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/PluginEricdoc.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/PluginEricdoc.py	Sat May 22 18:51:46 2021 +0200
@@ -12,9 +12,9 @@
 from PyQt6.QtCore import QObject, QCoreApplication
 from PyQt6.QtWidgets import QDialog
 
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
 
-from E5Gui.E5Action import E5Action
+from E5Gui.EricAction import EricAction
 
 import Utilities
 import UI.Info
@@ -118,9 +118,9 @@
         
         @return tuple of None and activation status (boolean)
         """
-        menu = e5App().getObject("Project").getMenu("Apidoc")
+        menu = ericApp().getObject("Project").getMenu("Apidoc")
         if menu:
-            self.__projectAct = E5Action(
+            self.__projectAct = EricAction(
                 self.tr('Generate documentation (eric7_doc)'),
                 self.tr('Generate &documentation (eric7_doc)'), 0, 0,
                 self, 'doc_eric7_doc')
@@ -131,10 +131,10 @@
                 """<p>Generate API documentation using eric7_doc.</p>"""
             ))
             self.__projectAct.triggered.connect(self.__doEricdoc)
-            e5App().getObject("Project").addE5Actions([self.__projectAct])
+            ericApp().getObject("Project").addEricActions([self.__projectAct])
             menu.addAction(self.__projectAct)
         
-        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
+        ericApp().getObject("Project").showMenu.connect(self.__projectShowMenu)
         
         return None, True
 
@@ -142,13 +142,13 @@
         """
         Public method to deactivate this plugin.
         """
-        e5App().getObject("Project").showMenu.disconnect(
+        ericApp().getObject("Project").showMenu.disconnect(
             self.__projectShowMenu)
         
-        menu = e5App().getObject("Project").getMenu("Apidoc")
+        menu = ericApp().getObject("Project").getMenu("Apidoc")
         if menu:
             menu.removeAction(self.__projectAct)
-            e5App().getObject("Project").removeE5Actions([self.__projectAct])
+            ericApp().getObject("Project").removeEricActions([self.__projectAct])
         self.__initialize()
     
     def __projectShowMenu(self, menuName, menu):
@@ -161,7 +161,7 @@
         """
         if menuName == "Apidoc" and self.__projectAct is not None:
             self.__projectAct.setEnabled(
-                e5App().getObject("Project").getProjectLanguage() in
+                ericApp().getObject("Project").getProjectLanguage() in
                 ["Python", "Python3", "Ruby", "MicroPython"])
     
     def __doEricdoc(self):
@@ -176,7 +176,7 @@
             '\n': 'lf',
             '\r\n': 'crlf',
         }
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         parms = project.getData('DOCUMENTATIONPARMS', "ERIC4DOC")
         dlg = EricdocConfigDialog(project, parms)
         if dlg.exec() == QDialog.DialogCode.Accepted: