Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/PluginWizardQFileDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/PluginWizardQFileDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -12,9 +12,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
-from E5Gui.E5Application import e5App
-from E5Gui.E5Action import E5Action
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricAction import EricAction
+from E5Gui import EricMessageBox
 
 import UI.Info
 
@@ -68,16 +68,16 @@
         menu = self.__ui.getMenu("wizards")
         if menu:
             menu.removeAction(self.qFileDialogAction)
-            menu.removeAction(self.e5FileDialogAction)
-        self.__ui.removeE5Actions(
-            [self.qFileDialogAction, self.e5FileDialogAction],
+            menu.removeAction(self.ericFileDialogAction)
+        self.__ui.removeEricActions(
+            [self.qFileDialogAction, self.ericFileDialogAction],
             'wizards')
     
     def __initActions(self):
         """
         Private method to initialize the actions.
         """
-        self.qFileDialogAction = E5Action(
+        self.qFileDialogAction = EricAction(
             self.tr('QFileDialog Wizard'),
             self.tr('Q&FileDialog Wizard...'), 0, 0, self,
             'wizards_qfiledialog')
@@ -90,21 +90,21 @@
         ))
         self.qFileDialogAction.triggered.connect(self.__handleQFileDialog)
         
-        self.e5FileDialogAction = E5Action(
-            self.tr('E5FileDialog Wizard'),
+        self.ericFileDialogAction = EricAction(
+            self.tr('EricFileDialog Wizard'),
             self.tr('E&5FileDialog Wizard...'), 0, 0, self,
             'wizards_e5filedialog')
-        self.e5FileDialogAction.setStatusTip(self.tr('E5FileDialog Wizard'))
-        self.e5FileDialogAction.setWhatsThis(self.tr(
-            """<b>E5FileDialog Wizard</b>"""
+        self.ericFileDialogAction.setStatusTip(self.tr('EricFileDialog Wizard'))
+        self.ericFileDialogAction.setWhatsThis(self.tr(
+            """<b>EricFileDialog Wizard</b>"""
             """<p>This wizard opens a dialog for entering all the parameters"""
-            """ needed to create an E5FileDialog. The generated code is"""
+            """ needed to create an EricFileDialog. The generated code is"""
             """ inserted at the current cursor position.</p>"""
         ))
-        self.e5FileDialogAction.triggered.connect(self.__handleE5FileDialog)
+        self.ericFileDialogAction.triggered.connect(self.__handleEricFileDialog)
         
-        self.__ui.addE5Actions(
-            [self.qFileDialogAction, self.e5FileDialogAction],
+        self.__ui.addEricActions(
+            [self.qFileDialogAction, self.ericFileDialogAction],
             'wizards')
 
     def __initMenu(self):
@@ -113,7 +113,7 @@
         """
         menu = self.__ui.getMenu("wizards")
         if menu:
-            menu.addAction(self.e5FileDialogAction)
+            menu.addAction(self.ericFileDialogAction)
             menu.addAction(self.qFileDialogAction)
     
     def __callForm(self, editor, variant):
@@ -123,7 +123,7 @@
         @param editor reference to the current editor
         @type Editor
         @param variant variant of code to be generated
-            (-1 = E5FileDialog, 0 = unknown, 5 = PyQt5)
+            (-1 = EricFileDialog, 0 = unknown, 5 = PyQt5)
         @type int
         @return the generated code (string)
         """
@@ -147,19 +147,19 @@
         Private method to handle the wizards action.
         
         @param variant dialog variant to be generated
-            (E5FileDialog or QFileDialog)
+            (EricFileDialog or QFileDialog)
         @type str
         @exception ValueError raised to indicate an illegal file dialog variant
         """
-        editor = e5App().getObject("ViewManager").activeWindow()
+        editor = ericApp().getObject("ViewManager").activeWindow()
         
         if editor is None:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self.__ui,
                 self.tr('No current editor'),
                 self.tr('Please open or create a file first.'))
         else:
-            if variant not in ("QFileDialog", "E5FileDialog"):
+            if variant not in ("QFileDialog", "EricFileDialog"):
                 raise ValueError("Illegal dialog variant given")
             
             if variant == "QFileDialog":
@@ -171,7 +171,7 @@
                     # PyQt5/PyQt6
                     dialogVariant = int(match.group(1))
             else:
-                # E5FileDialog
+                # EricFileDialog
                 dialogVariant = -1
             
             code, ok = self.__callForm(editor, dialogVariant)
@@ -188,8 +188,8 @@
         """
         self.__handle("QFileDialog")
     
-    def __handleE5FileDialog(self):
+    def __handleEricFileDialog(self):
         """
-        Private slot to handle the wizard E5FileDialog action.
+        Private slot to handle the wizard EricFileDialog action.
         """
-        self.__handle("E5FileDialog")
+        self.__handle("EricFileDialog")