eric7/QScintilla/MiniEditor.py

branch
eric7
changeset 8356
68ec9c3d4de5
parent 8322
b422b4e77d19
child 8358
144a6b854f70
--- a/eric7/QScintilla/MiniEditor.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/QScintilla/MiniEditor.py	Sat May 22 18:51:46 2021 +0200
@@ -25,12 +25,12 @@
 from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
 from PyQt6.Qsci import QsciScintilla
 
-from E5Gui.E5Action import E5Action, createActionGroup
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5ClickableLabel import E5ClickableLabel
-from E5Gui.E5ZoomWidget import E5ZoomWidget
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricAction import EricAction, createActionGroup
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricClickableLabel import EricClickableLabel
+from E5Gui.EricZoomWidget import EricZoomWidget
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from .QsciScintillaCompat import QsciScintillaCompat
 
@@ -185,7 +185,7 @@
         self.endUndoAction()
 
 
-class MiniEditor(E5MainWindow):
+class MiniEditor(EricMainWindow):
     """
     Class implementing an editor for simple editing tasks.
     
@@ -363,7 +363,7 @@
         Private slot to open a file.
         """
         if self.__maybeSave():
-            fileName = E5FileDialog.getOpenFileName(self)
+            fileName = EricFileDialog.getOpenFileName(self)
             if fileName:
                 self.__loadFile(fileName)
         self.__checkActions()
@@ -385,7 +385,7 @@
         
         @return flag indicating success (boolean)
         """
-        fileName = E5FileDialog.getSaveFileName(self)
+        fileName = EricFileDialog.getSaveFileName(self)
         if not fileName:
             return False
         
@@ -399,7 +399,7 @@
         """
         Private slot to save a copy of the file with a new name.
         """
-        fileName = E5FileDialog.getSaveFileName(self)
+        fileName = EricFileDialog.getSaveFileName(self)
         if not fileName:
             return
         
@@ -409,7 +409,7 @@
         """
         Private slot to show a little About message.
         """
-        E5MessageBox.about(
+        EricMessageBox.about(
             self,
             self.tr("About eric Mini Editor"),
             self.tr(
@@ -422,7 +422,7 @@
         """
         Private slot to handle the About Qt dialog.
         """
-        E5MessageBox.aboutQt(self, "eric Mini Editor")
+        EricMessageBox.aboutQt(self, "eric Mini Editor")
     
     def __whatsThis(self):
         """
@@ -510,7 +510,7 @@
         """
         Private function to read a single keyboard shortcut from the settings.
         
-        @param act reference to the action object (E5Action)
+        @param act reference to the action object (EricAction)
         @param category category the action belongs to (string)
         """
         if act.objectName():
@@ -557,7 +557,7 @@
         """
         Private method to create the File actions.
         """
-        self.newAct = E5Action(
+        self.newAct = EricAction(
             self.tr('New'),
             UI.PixmapCache.getIcon("new"),
             self.tr('&New'),
@@ -571,7 +571,7 @@
         self.newAct.triggered.connect(self.__newFile)
         self.fileActions.append(self.newAct)
         
-        self.openAct = E5Action(
+        self.openAct = EricAction(
             self.tr('Open'),
             UI.PixmapCache.getIcon("open"),
             self.tr('&Open...'),
@@ -585,7 +585,7 @@
         self.openAct.triggered.connect(self.__open)
         self.fileActions.append(self.openAct)
         
-        self.saveAct = E5Action(
+        self.saveAct = EricAction(
             self.tr('Save'),
             UI.PixmapCache.getIcon("fileSave"),
             self.tr('&Save'),
@@ -599,7 +599,7 @@
         self.saveAct.triggered.connect(self.__save)
         self.fileActions.append(self.saveAct)
         
-        self.saveAsAct = E5Action(
+        self.saveAsAct = EricAction(
             self.tr('Save as'),
             UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save &as...'),
@@ -615,7 +615,7 @@
         self.saveAsAct.triggered.connect(self.__saveAs)
         self.fileActions.append(self.saveAsAct)
         
-        self.saveCopyAct = E5Action(
+        self.saveCopyAct = EricAction(
             self.tr('Save Copy'),
             UI.PixmapCache.getIcon("fileSaveCopy"),
             self.tr('Save &Copy...'),
@@ -630,7 +630,7 @@
         self.saveCopyAct.triggered.connect(self.__saveCopy)
         self.fileActions.append(self.saveCopyAct)
         
-        self.closeAct = E5Action(
+        self.closeAct = EricAction(
             self.tr('Close'),
             UI.PixmapCache.getIcon("close"),
             self.tr('&Close'),
@@ -644,7 +644,7 @@
         self.closeAct.triggered.connect(self.close)
         self.fileActions.append(self.closeAct)
         
-        self.printAct = E5Action(
+        self.printAct = EricAction(
             self.tr('Print'),
             UI.PixmapCache.getIcon("print"),
             self.tr('&Print'),
@@ -658,7 +658,7 @@
         self.printAct.triggered.connect(self.__printFile)
         self.fileActions.append(self.printAct)
         
-        self.printPreviewAct = E5Action(
+        self.printPreviewAct = EricAction(
             self.tr('Print Preview'),
             UI.PixmapCache.getIcon("printPreview"),
             QCoreApplication.translate('ViewManager', 'Print Preview'),
@@ -676,7 +676,7 @@
         """
         Private method to create the Edit actions.
         """
-        self.undoAct = E5Action(
+        self.undoAct = EricAction(
             self.tr('Undo'),
             UI.PixmapCache.getIcon("editUndo"),
             self.tr('&Undo'),
@@ -691,7 +691,7 @@
         self.undoAct.triggered.connect(self.__undo)
         self.editActions.append(self.undoAct)
         
-        self.redoAct = E5Action(
+        self.redoAct = EricAction(
             self.tr('Redo'),
             UI.PixmapCache.getIcon("editRedo"),
             self.tr('&Redo'),
@@ -705,7 +705,7 @@
         self.redoAct.triggered.connect(self.__redo)
         self.editActions.append(self.redoAct)
         
-        self.cutAct = E5Action(
+        self.cutAct = EricAction(
             self.tr('Cut'),
             UI.PixmapCache.getIcon("editCut"),
             self.tr('Cu&t'),
@@ -721,7 +721,7 @@
         self.cutAct.triggered.connect(self.__textEdit.cut)
         self.editActions.append(self.cutAct)
         
-        self.copyAct = E5Action(
+        self.copyAct = EricAction(
             self.tr('Copy'),
             UI.PixmapCache.getIcon("editCopy"),
             self.tr('&Copy'),
@@ -737,7 +737,7 @@
         self.copyAct.triggered.connect(self.__textEdit.copy)
         self.editActions.append(self.copyAct)
         
-        self.pasteAct = E5Action(
+        self.pasteAct = EricAction(
             self.tr('Paste'),
             UI.PixmapCache.getIcon("editPaste"),
             self.tr('&Paste'),
@@ -754,7 +754,7 @@
         self.pasteAct.triggered.connect(self.__textEdit.paste)
         self.editActions.append(self.pasteAct)
         
-        self.deleteAct = E5Action(
+        self.deleteAct = EricAction(
             self.tr('Clear'),
             UI.PixmapCache.getIcon("editDelete"),
             self.tr('Cl&ear'),
@@ -787,7 +787,7 @@
         
         self.editorActGrp = createActionGroup(self)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move left one character'),
             QCoreApplication.translate('ViewManager',
@@ -801,7 +801,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move right one character'),
             QCoreApplication.translate('ViewManager',
@@ -815,7 +815,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move up one line'),
             QCoreApplication.translate('ViewManager', 'Move up one line'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'Up')), 0,
@@ -827,7 +827,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move down one line'),
             QCoreApplication.translate('ViewManager', 'Move down one line'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'Down')), 0,
@@ -839,7 +839,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move left one word part'),
             QCoreApplication.translate('ViewManager',
@@ -853,7 +853,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move right one word part'),
             QCoreApplication.translate('ViewManager',
@@ -867,7 +867,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move left one word'),
             QCoreApplication.translate('ViewManager', 'Move left one word'),
             0, 0,
@@ -882,7 +882,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move right one word'),
             QCoreApplication.translate('ViewManager', 'Move right one word'),
             0, 0,
@@ -897,7 +897,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Move to first visible character in document line'),
@@ -913,7 +913,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Move to start of display line'),
@@ -932,7 +932,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Move to end of document line'),
@@ -951,7 +951,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Scroll view down one line'),
             QCoreApplication.translate('ViewManager',
@@ -963,7 +963,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Scroll view up one line'),
             QCoreApplication.translate('ViewManager',
@@ -974,7 +974,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move up one paragraph'),
             QCoreApplication.translate('ViewManager', 'Move up one paragraph'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'Alt+Up')),
@@ -983,7 +983,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move down one paragraph'),
             QCoreApplication.translate('ViewManager',
@@ -995,7 +995,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move up one page'),
             QCoreApplication.translate('ViewManager', 'Move up one page'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'PgUp')), 0,
@@ -1004,7 +1004,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Move down one page'),
             QCoreApplication.translate('ViewManager', 'Move down one page'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'PgDown')),
@@ -1016,7 +1016,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move to start of document'),
             QCoreApplication.translate('ViewManager',
@@ -1033,7 +1033,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move to end of document'),
             QCoreApplication.translate('ViewManager',
@@ -1050,7 +1050,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Indent one level'),
             QCoreApplication.translate('ViewManager', 'Indent one level'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'Tab')), 0,
@@ -1059,7 +1059,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Unindent one level'),
             QCoreApplication.translate('ViewManager', 'Unindent one level'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1069,7 +1069,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection left one character'),
             QCoreApplication.translate(
@@ -1085,7 +1085,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection right one character'),
@@ -1102,7 +1102,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection up one line'),
@@ -1119,7 +1119,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection down one line'),
@@ -1136,7 +1136,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection left one word part'),
@@ -1152,7 +1152,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection right one word part'),
@@ -1168,7 +1168,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection left one word'),
             QCoreApplication.translate(
@@ -1185,7 +1185,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection right one word'),
             QCoreApplication.translate(
@@ -1202,7 +1202,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection to first visible character in document'
@@ -1220,7 +1220,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection to end of document line'),
             QCoreApplication.translate(
@@ -1237,7 +1237,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection up one paragraph'),
@@ -1251,7 +1251,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection down one paragraph'),
             QCoreApplication.translate(
@@ -1264,7 +1264,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection up one page'),
@@ -1278,7 +1278,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection down one page'),
@@ -1295,7 +1295,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection to start of document'),
             QCoreApplication.translate(
@@ -1312,7 +1312,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection to end of document'),
             QCoreApplication.translate(
@@ -1329,7 +1329,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Delete previous character'),
             QCoreApplication.translate('ViewManager',
@@ -1347,7 +1347,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Delete previous character if not at start of line'),
@@ -1360,7 +1360,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Delete current character'),
             QCoreApplication.translate('ViewManager',
@@ -1374,7 +1374,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete word to left'),
             QCoreApplication.translate('ViewManager', 'Delete word to left'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1384,7 +1384,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete word to right'),
             QCoreApplication.translate('ViewManager', 'Delete word to right'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1394,7 +1394,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete line to left'),
             QCoreApplication.translate('ViewManager', 'Delete line to left'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1404,7 +1404,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete line to right'),
             QCoreApplication.translate('ViewManager', 'Delete line to right'),
             0, 0,
@@ -1419,7 +1419,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Insert new line'),
             QCoreApplication.translate('ViewManager', 'Insert new line'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'Return')),
@@ -1429,7 +1429,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete current line'),
             QCoreApplication.translate('ViewManager', 'Delete current line'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1439,7 +1439,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Duplicate current line'),
             QCoreApplication.translate('ViewManager',
@@ -1450,7 +1450,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Swap current and previous lines'),
@@ -1463,7 +1463,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Reverse selected lines'),
             QCoreApplication.translate('ViewManager',
@@ -1475,7 +1475,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Cut current line'),
             QCoreApplication.translate('ViewManager', 'Cut current line'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1485,7 +1485,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Copy current line'),
             QCoreApplication.translate('ViewManager', 'Copy current line'),
             QKeySequence(QCoreApplication.translate('ViewManager',
@@ -1495,7 +1495,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Toggle insert/overtype'),
             QCoreApplication.translate('ViewManager',
@@ -1506,7 +1506,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Convert selection to lower case'),
@@ -1520,7 +1520,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Convert selection to upper case'),
@@ -1534,7 +1534,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Move to end of display line'),
             QCoreApplication.translate(
@@ -1551,7 +1551,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend selection to end of display line'),
@@ -1567,7 +1567,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Formfeed'),
             QCoreApplication.translate('ViewManager', 'Formfeed'),
             0, 0,
@@ -1576,7 +1576,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Escape'),
             QCoreApplication.translate('ViewManager', 'Escape'),
             QKeySequence(QCoreApplication.translate('ViewManager', 'Esc')), 0,
@@ -1585,7 +1585,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection down one line'),
@@ -1602,7 +1602,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection up one line'),
@@ -1619,7 +1619,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection left one character'),
@@ -1636,7 +1636,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection right one character'),
@@ -1653,7 +1653,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection to first'
@@ -1672,7 +1672,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection to end of document line'),
@@ -1691,7 +1691,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection up one page'),
@@ -1705,7 +1705,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection down one page'),
@@ -1722,7 +1722,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Duplicate current selection'),
@@ -1737,7 +1737,7 @@
         self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_SCROLLTOSTART"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Scroll to start of document'),
                 QCoreApplication.translate(
@@ -1752,7 +1752,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_SCROLLTOEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Scroll to end of document'),
                 QCoreApplication.translate(
@@ -1767,7 +1767,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_VERTICALCENTRECARET"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Scroll vertically to center current line'),
                 QCoreApplication.translate(
@@ -1782,7 +1782,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_WORDRIGHTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Move to end of next word'),
                 QCoreApplication.translate(
@@ -1797,7 +1797,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_WORDRIGHTENDEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Extend selection to end of next word'),
                 QCoreApplication.translate(
@@ -1813,7 +1813,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_WORDLEFTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Move to end of previous word'),
                 QCoreApplication.translate(
@@ -1825,7 +1825,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_WORDLEFTENDEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Extend selection to end of previous word'),
                 QCoreApplication.translate(
@@ -1837,7 +1837,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOME"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Move to start of document line'),
                 QCoreApplication.translate(
@@ -1852,7 +1852,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMEEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to start of document line'),
@@ -1870,7 +1870,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMERECTEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend rectangular selection to start of document line'),
@@ -1888,7 +1888,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMEDISPLAYEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to start of display line'),
@@ -1907,7 +1907,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMEWRAP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Move to start of display or document line'),
@@ -1921,7 +1921,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMEWRAPEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to start of display or document line'),
@@ -1936,7 +1936,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_VCHOMEWRAP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Move to first visible character in display'
@@ -1953,7 +1953,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_VCHOMEWRAPEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to first visible character in'
@@ -1970,7 +1970,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_LINEENDWRAP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Move to end of display or document line'),
@@ -1984,7 +1984,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_LINEENDWRAPEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to end of display or document line'),
@@ -1999,7 +1999,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Stuttered move up one page'),
                 QCoreApplication.translate(
@@ -2011,7 +2011,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUPEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Stuttered extend selection up one page'),
@@ -2026,7 +2026,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWN"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Stuttered move down one page'),
                 QCoreApplication.translate(
@@ -2038,7 +2038,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWNEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Stuttered extend selection down one page'),
@@ -2053,7 +2053,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_DELWORDRIGHTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Delete right to end of next word'),
@@ -2070,7 +2070,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESUP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Move selected lines up one line'),
@@ -2084,7 +2084,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESDOWN"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Move selected lines down one line'),
@@ -2097,7 +2097,7 @@
             act.triggered.connect(self.esm.map)
             self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Duplicate current selection'),
@@ -2118,7 +2118,7 @@
         Private method defining the user interface actions for the search
             commands.
         """
-        self.searchAct = E5Action(
+        self.searchAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Search'),
             UI.PixmapCache.getIcon("find"),
             QCoreApplication.translate('ViewManager', '&Search...'),
@@ -2138,7 +2138,7 @@
         self.searchAct.triggered.connect(self.showSearchWidget)
         self.searchActions.append(self.searchAct)
         
-        self.searchNextAct = E5Action(
+        self.searchNextAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Search next'),
             UI.PixmapCache.getIcon("findNext"),
             QCoreApplication.translate('ViewManager', 'Search &next'),
@@ -2158,7 +2158,7 @@
         self.searchNextAct.triggered.connect(self.__searchNext)
         self.searchActions.append(self.searchNextAct)
         
-        self.searchPrevAct = E5Action(
+        self.searchPrevAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Search previous'),
             UI.PixmapCache.getIcon("findPrev"),
             QCoreApplication.translate('ViewManager', 'Search &previous'),
@@ -2178,7 +2178,7 @@
         self.searchPrevAct.triggered.connect(self.__searchPrev)
         self.searchActions.append(self.searchPrevAct)
         
-        self.searchClearMarkersAct = E5Action(
+        self.searchClearMarkersAct = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Clear search markers'),
             UI.PixmapCache.getIcon("findClear"),
@@ -2198,7 +2198,7 @@
             self.__searchClearMarkers)
         self.searchActions.append(self.searchClearMarkersAct)
         
-        self.replaceAct = E5Action(
+        self.replaceAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Replace'),
             QCoreApplication.translate('ViewManager', '&Replace...'),
             QKeySequence(QCoreApplication.translate(
@@ -2217,7 +2217,7 @@
         self.replaceAct.triggered.connect(self.showReplaceWidget)
         self.searchActions.append(self.replaceAct)
         
-        self.replaceAndSearchAct = E5Action(
+        self.replaceAndSearchAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Replace and Search'),
             UI.PixmapCache.getIcon("editReplaceSearch"),
@@ -2241,7 +2241,7 @@
             self.__replaceWidget.replaceSearch)
         self.searchActions.append(self.replaceAndSearchAct)
         
-        self.replaceSelectionAct = E5Action(
+        self.replaceSelectionAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Replace Occurrence'),
             UI.PixmapCache.getIcon("editReplace"),
@@ -2263,7 +2263,7 @@
             self.__replaceWidget.replace)
         self.searchActions.append(self.replaceSelectionAct)
         
-        self.replaceAllAct = E5Action(
+        self.replaceAllAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Replace All'),
             UI.PixmapCache.getIcon("editReplaceAll"),
@@ -2289,7 +2289,7 @@
         """
         Private method to create the View actions.
         """
-        self.zoomInAct = E5Action(
+        self.zoomInAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Zoom in'),
             UI.PixmapCache.getIcon("zoomIn"),
             QCoreApplication.translate('ViewManager', 'Zoom &in'),
@@ -2308,7 +2308,7 @@
         self.zoomInAct.triggered.connect(self.__zoomIn)
         self.viewActions.append(self.zoomInAct)
         
-        self.zoomOutAct = E5Action(
+        self.zoomOutAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Zoom out'),
             UI.PixmapCache.getIcon("zoomOut"),
             QCoreApplication.translate('ViewManager', 'Zoom &out'),
@@ -2327,7 +2327,7 @@
         self.zoomOutAct.triggered.connect(self.__zoomOut)
         self.viewActions.append(self.zoomOutAct)
         
-        self.zoomResetAct = E5Action(
+        self.zoomResetAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Zoom reset'),
             UI.PixmapCache.getIcon("zoomReset"),
             QCoreApplication.translate('ViewManager', 'Zoom &reset'),
@@ -2346,7 +2346,7 @@
         self.zoomResetAct.triggered.connect(self.__zoomReset)
         self.viewActions.append(self.zoomResetAct)
         
-        self.zoomToAct = E5Action(
+        self.zoomToAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Zoom'),
             UI.PixmapCache.getIcon("zoomTo"),
             QCoreApplication.translate('ViewManager', '&Zoom'),
@@ -2369,7 +2369,7 @@
         """
         Private method to create the Help actions.
         """
-        self.aboutAct = E5Action(
+        self.aboutAct = EricAction(
             self.tr('About'),
             self.tr('&About'),
             0, 0, self, 'about_eric')
@@ -2381,7 +2381,7 @@
         self.aboutAct.triggered.connect(self.__about)
         self.helpActions.append(self.aboutAct)
         
-        self.aboutQtAct = E5Action(
+        self.aboutQtAct = EricAction(
             self.tr('About Qt'),
             self.tr('About &Qt'),
             0, 0, self, 'about_qt')
@@ -2394,7 +2394,7 @@
         self.aboutQtAct.triggered.connect(self.__aboutQt)
         self.helpActions.append(self.aboutQtAct)
         
-        self.whatsThisAct = E5Action(
+        self.whatsThisAct = EricAction(
             self.tr('What\'s This?'),
             UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
@@ -2515,7 +2515,7 @@
         self.__statusBar = self.statusBar()
         self.__statusBar.setSizeGripEnabled(True)
 
-        self.sbLanguage = E5ClickableLabel(self.__statusBar)
+        self.sbLanguage = EricClickableLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.sbLanguage)
         self.sbLanguage.setWhatsThis(self.tr(
             """<p>This part of the status bar displays the"""
@@ -2544,7 +2544,7 @@
             """ of the editor.</p>"""
         ))
         
-        self.sbZoom = E5ZoomWidget(
+        self.sbZoom = EricZoomWidget(
             UI.PixmapCache.getPixmap("zoomOut"),
             UI.PixmapCache.getPixmap("zoomIn"),
             UI.PixmapCache.getPixmap("zoomReset"),
@@ -2583,7 +2583,7 @@
         @return flag indicating, if it is ok to continue (boolean)
         """
         if self.__textEdit.isModified():
-            ret = E5MessageBox.okToClearData(
+            ret = EricMessageBox.okToClearData(
                 self,
                 self.tr("eric Mini Editor"),
                 self.tr("The document has unsaved changes."),
@@ -2601,7 +2601,7 @@
         self.__loadEditorConfig(fileName=fileName)
         
         try:
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 encoding = self.__getEditorConfig("DefaultEncoding",
                                                   nodefault=True)
                 if encoding:
@@ -2610,14 +2610,14 @@
                 else:
                     txt, self.encoding = Utilities.readEncodedFile(fileName)
         except (UnicodeDecodeError, OSError) as why:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self, self.tr('Open File'),
                 self.tr('<p>The file <b>{0}</b> could not be opened.</p>'
                         '<p>Reason: {1}</p>')
                 .format(fileName, str(why)))
             return
         
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             self.__textEdit.setText(txt)
             
             if filetype is None:
@@ -2710,14 +2710,14 @@
         
         # now write text to the file
         try:
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 editorConfigEncoding = self.__getEditorConfig(
                     "DefaultEncoding", nodefault=True, config=config)
                 self.encoding = Utilities.writeEncodedFile(
                     fileName, txt, self.encoding,
                     forcedEncoding=editorConfigEncoding)
         except (OSError, Utilities.CodingError, UnicodeError) as why:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self, self.tr('Save File'),
                 self.tr('<p>The file <b>{0}</b> could not be saved.<br/>'
                         'Reason: {1}</p>')
@@ -3731,7 +3731,7 @@
             try:
                 editorConfig = editorconfig.get_properties(fileName)
             except editorconfig.EditorConfigError:
-                E5MessageBox.warning(
+                EricMessageBox.warning(
                     self,
                     self.tr("EditorConfig Properties"),
                     self.tr("""<p>The EditorConfig properties for file"""

eric ide

mercurial