Mercurial Repositories > eric / file diff

diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Preferences/ShortcutsFile.py
--- a/eric7/Preferences/ShortcutsFile.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Preferences/ShortcutsFile.py	Sat May 22 18:51:46 2021 +0200
@@ -13,9 +13,9 @@
 
 from PyQt6.QtCore import QObject
 
-from E5Gui import E5MessageBox
-from E5Gui.E5OverrideCursor import E5OverridenCursor
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricOverrideCursor import EricOverridenCursor
+from E5Gui.EricApplication import ericApp
 
 import Preferences
 
@@ -76,66 +76,66 @@
         if helpViewer is None:
             self.__addActionsToDict(
                 "Project",
-                e5App().getObject("Project").getActions(),
+                ericApp().getObject("Project").getActions(),
                 actionsDict
             )
             self.__addActionsToDict(
                 "General",
-                e5App().getObject("UserInterface").getActions('ui'),
+                ericApp().getObject("UserInterface").getActions('ui'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Wizards",
-                e5App().getObject("UserInterface").getActions('wizards'),
+                ericApp().getObject("UserInterface").getActions('wizards'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Debug",
-                e5App().getObject("DebugUI").getActions(),
+                ericApp().getObject("DebugUI").getActions(),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Edit",
-                e5App().getObject("ViewManager").getActions('edit'),
+                ericApp().getObject("ViewManager").getActions('edit'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "File",
-                e5App().getObject("ViewManager").getActions('file'),
+                ericApp().getObject("ViewManager").getActions('file'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Search",
-                e5App().getObject("ViewManager").getActions('search'),
+                ericApp().getObject("ViewManager").getActions('search'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "View",
-                e5App().getObject("ViewManager").getActions('view'),
+                ericApp().getObject("ViewManager").getActions('view'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Macro",
-                e5App().getObject("ViewManager").getActions('macro'),
+                ericApp().getObject("ViewManager").getActions('macro'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Bookmarks",
-                e5App().getObject("ViewManager").getActions('bookmark'),
+                ericApp().getObject("ViewManager").getActions('bookmark'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Spelling",
-                e5App().getObject("ViewManager").getActions('spelling'),
+                ericApp().getObject("ViewManager").getActions('spelling'),
                 actionsDict
             )
             self.__addActionsToDict(
                 "Window",
-                e5App().getObject("ViewManager").getActions('window'),
+                ericApp().getObject("ViewManager").getActions('window'),
                 actionsDict
             )
             
-            for category, ref in e5App().getPluginObjects():
+            for category, ref in ericApp().getPluginObjects():
                 if hasattr(ref, "getActions"):
                     self.__addActionsToDict(
                         category, ref.getActions(), actionsDict
@@ -164,8 +164,8 @@
             with open(filename, "w") as f:
                 f.write(jsonString)
         except (TypeError, OSError) as err:
-            with E5OverridenCursor():
-                E5MessageBox.critical(
+            with EricOverridenCursor():
+                EricMessageBox.critical(
                     None,
                     self.tr("Export Keyboard Shortcuts"),
                     self.tr(
@@ -194,7 +194,7 @@
                 jsonString = f.read()
             shortcutsDict = json.loads(jsonString)
         except (OSError, json.JSONDecodeError) as err:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Import Keyboard Shortcuts"),
                 self.tr(