diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/PluginSyntaxChecker.py
--- a/eric7/Plugins/PluginSyntaxChecker.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/PluginSyntaxChecker.py Sat May 22 18:51:46 2021 +0200
@@ -12,8 +12,8 @@
from PyQt6.QtCore import QObject
-from E5Gui.E5Action import E5Action
-from E5Gui.E5Application import e5App
+from E5Gui.EricAction import EricAction
+from E5Gui.EricApplication import ericApp
from eric7config import getConfig
from Project.ProjectBrowserModel import ProjectBrowserFileItem
@@ -59,7 +59,7 @@
SyntaxCheckService
)
self.syntaxCheckService = SyntaxCheckService()
- e5App().registerObject("SyntaxCheckService", self.syntaxCheckService)
+ ericApp().registerObject("SyntaxCheckService", self.syntaxCheckService)
ericPath = getConfig('ericDir')
path = os.path.join(ericPath, 'Plugins', 'CheckerPlugins',
@@ -169,9 +169,9 @@
@return tuple of None and activation status (boolean)
"""
- menu = e5App().getObject("Project").getMenu("Checks")
+ menu = ericApp().getObject("Project").getMenu("Checks")
if menu:
- self.__projectAct = E5Action(
+ self.__projectAct = EricAction(
self.tr('Check Syntax'),
self.tr('&Syntax...'), 0, 0,
self, 'project_check_syntax')
@@ -182,10 +182,10 @@
"""<p>This checks Python files for syntax errors.</p>"""
))
self.__projectAct.triggered.connect(self.__projectSyntaxCheck)
- e5App().getObject("Project").addE5Actions([self.__projectAct])
+ ericApp().getObject("Project").addEricActions([self.__projectAct])
menu.addAction(self.__projectAct)
- self.__editorAct = E5Action(
+ self.__editorAct = EricAction(
self.tr('Check Syntax'),
self.tr('&Syntax...'), 0, 0,
self, "")
@@ -195,15 +195,15 @@
))
self.__editorAct.triggered.connect(self.__editorSyntaxCheck)
- e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
- e5App().getObject("ProjectBrowser").getProjectBrowser(
+ ericApp().getObject("Project").showMenu.connect(self.__projectShowMenu)
+ ericApp().getObject("ProjectBrowser").getProjectBrowser(
"sources").showMenu.connect(self.__projectBrowserShowMenu)
- e5App().getObject("ViewManager").editorOpenedEd.connect(
+ ericApp().getObject("ViewManager").editorOpenedEd.connect(
self.__editorOpened)
- e5App().getObject("ViewManager").editorClosedEd.connect(
+ ericApp().getObject("ViewManager").editorClosedEd.connect(
self.__editorClosed)
- for editor in e5App().getObject("ViewManager").getOpenEditors():
+ for editor in ericApp().getObject("ViewManager").getOpenEditors():
self.__editorOpened(editor)
return None, True
@@ -212,16 +212,16 @@
"""
Public method to deactivate this plugin.
"""
- e5App().getObject("Project").showMenu.disconnect(
+ ericApp().getObject("Project").showMenu.disconnect(
self.__projectShowMenu)
- e5App().getObject("ProjectBrowser").getProjectBrowser(
+ ericApp().getObject("ProjectBrowser").getProjectBrowser(
"sources").showMenu.disconnect(self.__projectBrowserShowMenu)
- e5App().getObject("ViewManager").editorOpenedEd.disconnect(
+ ericApp().getObject("ViewManager").editorOpenedEd.disconnect(
self.__editorOpened)
- e5App().getObject("ViewManager").editorClosedEd.disconnect(
+ ericApp().getObject("ViewManager").editorClosedEd.disconnect(
self.__editorClosed)
- menu = e5App().getObject("Project").getMenu("Checks")
+ menu = ericApp().getObject("Project").getMenu("Checks")
if menu:
menu.removeAction(self.__projectAct)
@@ -247,7 +247,7 @@
"""
if menuName == "Checks" and self.__projectAct is not None:
self.__projectAct.setEnabled(
- e5App().getObject("Project").getProjectLanguage() in
+ ericApp().getObject("Project").getProjectLanguage() in
self.syntaxCheckService.getLanguages())
def __projectBrowserShowMenu(self, menuName, menu):
@@ -260,12 +260,12 @@
"""
if (
menuName == "Checks" and
- e5App().getObject("Project").getProjectLanguage() in
+ ericApp().getObject("Project").getProjectLanguage() in
self.syntaxCheckService.getLanguages()
):
self.__projectBrowserMenu = menu
if self.__projectBrowserAct is None:
- self.__projectBrowserAct = E5Action(
+ self.__projectBrowserAct = EricAction(
self.tr('Check Syntax'),
self.tr('&Syntax...'), 0, 0,
self, "")
@@ -282,7 +282,7 @@
"""
Private slot used to check the project files for syntax errors.
"""
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
project.saveAllScripts()
ppath = project.getProjectPath()
extensions = tuple(self.syntaxCheckService.getExtensions())
@@ -302,7 +302,7 @@
Private method to handle the syntax check context menu action of the
project sources browser.
"""
- browser = e5App().getObject("ProjectBrowser").getProjectBrowser(
+ browser = ericApp().getObject("ProjectBrowser").getProjectBrowser(
"sources")
if browser.getSelectedItemsCount([ProjectBrowserFileItem]) > 1:
fn = []
@@ -363,7 +363,7 @@
Private slot to handle the syntax check context menu action of the
editors.
"""
- editor = e5App().getObject("ViewManager").activeWindow()
+ editor = ericApp().getObject("ViewManager").activeWindow()
if editor is not None:
from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import (
SyntaxCheckerDialog
