eric7/ViewManager/ViewManager.py

branch
eric7
changeset 8356
68ec9c3d4de5
parent 8318
962bce857696
child 8358
144a6b854f70
diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/ViewManager/ViewManager.py
--- a/eric7/ViewManager/ViewManager.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/ViewManager/ViewManager.py	Sat May 22 18:51:46 2021 +0200
@@ -21,8 +21,8 @@
 )
 from PyQt6.Qsci import QsciScintilla
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5FileDialog, E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricFileDialog, EricMessageBox
 
 from Globals import recentNameFiles, isMacPlatform
 
@@ -35,7 +35,7 @@
 import UI.PixmapCache
 import UI.Config
 
-from E5Gui.E5Action import E5Action, createActionGroup
+from E5Gui.EricAction import EricAction, createActionGroup
 
 
 class ViewManager(QWidget):
@@ -229,7 +229,7 @@
             statusbar (QLabel)
         @param sbEol reference to the eol indicator part of the statusbar
             (QLabel)
-        @param sbZoom reference to the zoom widget (E5ZoomWidget)
+        @param sbZoom reference to the zoom widget (EricZoomWidget)
         """
         self.sbLine = sbLine
         self.sbPos = sbPos
@@ -583,7 +583,7 @@
         """
         Private method defining the user interface actions for file handling.
         """
-        self.newAct = E5Action(
+        self.newAct = EricAction(
             QCoreApplication.translate('ViewManager', 'New'),
             UI.PixmapCache.getIcon("new"),
             QCoreApplication.translate('ViewManager', '&New'),
@@ -602,7 +602,7 @@
         self.newAct.triggered.connect(self.newEditor)
         self.fileActions.append(self.newAct)
         
-        self.openAct = E5Action(
+        self.openAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Open'),
             UI.PixmapCache.getIcon("open"),
             QCoreApplication.translate('ViewManager', '&Open...'),
@@ -623,7 +623,7 @@
         
         self.closeActGrp = createActionGroup(self)
         
-        self.closeAct = E5Action(
+        self.closeAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Close'),
             UI.PixmapCache.getIcon("closeEditor"),
             QCoreApplication.translate('ViewManager', '&Close'),
@@ -642,7 +642,7 @@
         self.closeAct.triggered.connect(self.closeCurrentWindow)
         self.fileActions.append(self.closeAct)
         
-        self.closeAllAct = E5Action(
+        self.closeAllAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Close All'),
             QCoreApplication.translate('ViewManager', 'Clos&e All'),
             0, 0, self.closeActGrp, 'vm_file_close_all')
@@ -661,7 +661,7 @@
         
         self.saveActGrp = createActionGroup(self)
         
-        self.saveAct = E5Action(
+        self.saveAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Save'),
             UI.PixmapCache.getIcon("fileSave"),
             QCoreApplication.translate('ViewManager', '&Save'),
@@ -678,7 +678,7 @@
         self.saveAct.triggered.connect(self.saveCurrentEditor)
         self.fileActions.append(self.saveAct)
         
-        self.saveAsAct = E5Action(
+        self.saveAsAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Save as'),
             UI.PixmapCache.getIcon("fileSaveAs"),
             QCoreApplication.translate('ViewManager', 'Save &as...'),
@@ -696,7 +696,7 @@
         self.saveAsAct.triggered.connect(self.saveAsCurrentEditor)
         self.fileActions.append(self.saveAsAct)
         
-        self.saveCopyAct = E5Action(
+        self.saveCopyAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Save Copy'),
             UI.PixmapCache.getIcon("fileSaveCopy"),
             QCoreApplication.translate('ViewManager', 'Save &Copy...'),
@@ -712,7 +712,7 @@
         self.saveCopyAct.triggered.connect(self.saveCopyCurrentEditor)
         self.fileActions.append(self.saveCopyAct)
         
-        self.saveAllAct = E5Action(
+        self.saveAllAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Save all'),
             UI.PixmapCache.getIcon("fileSaveAll"),
             QCoreApplication.translate('ViewManager', 'Save a&ll'),
@@ -729,7 +729,7 @@
         
         self.saveActGrp.setEnabled(False)
 
-        self.printAct = E5Action(
+        self.printAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Print'),
             UI.PixmapCache.getIcon("print"),
             QCoreApplication.translate('ViewManager', '&Print'),
@@ -747,7 +747,7 @@
         self.printAct.setEnabled(False)
         self.fileActions.append(self.printAct)
         
-        self.printPreviewAct = E5Action(
+        self.printPreviewAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Print Preview'),
             UI.PixmapCache.getIcon("printPreview"),
             QCoreApplication.translate('ViewManager', 'Print Preview'),
@@ -764,7 +764,7 @@
         self.printPreviewAct.setEnabled(False)
         self.fileActions.append(self.printPreviewAct)
         
-        self.findFileNameAct = E5Action(
+        self.findFileNameAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Search File'),
             QCoreApplication.translate('ViewManager', 'Search &File...'),
             QKeySequence(QCoreApplication.translate(
@@ -832,7 +832,7 @@
         Public method to create the File toolbar.
         
         @param toolbarManager reference to a toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         @return the generated toolbar
         """
         tb = QToolBar(QCoreApplication.translate('ViewManager', 'File'),
@@ -886,7 +886,7 @@
         """
         self.editActGrp = createActionGroup(self)
         
-        self.undoAct = E5Action(
+        self.undoAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Undo'),
             UI.PixmapCache.getIcon("editUndo"),
             QCoreApplication.translate('ViewManager', '&Undo'),
@@ -905,7 +905,7 @@
         self.undoAct.triggered.connect(self.__editUndo)
         self.editActions.append(self.undoAct)
         
-        self.redoAct = E5Action(
+        self.redoAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Redo'),
             UI.PixmapCache.getIcon("editRedo"),
             QCoreApplication.translate('ViewManager', '&Redo'),
@@ -923,7 +923,7 @@
         self.redoAct.triggered.connect(self.__editRedo)
         self.editActions.append(self.redoAct)
         
-        self.revertAct = E5Action(
+        self.revertAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Revert to last saved state'),
             QCoreApplication.translate(
@@ -945,7 +945,7 @@
         
         self.copyActGrp = createActionGroup(self.editActGrp)
         
-        self.cutAct = E5Action(
+        self.cutAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Cut'),
             UI.PixmapCache.getIcon("editCut"),
             QCoreApplication.translate('ViewManager', 'Cu&t'),
@@ -965,7 +965,7 @@
         self.cutAct.triggered.connect(self.__editCut)
         self.editActions.append(self.cutAct)
         
-        self.copyAct = E5Action(
+        self.copyAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Copy'),
             UI.PixmapCache.getIcon("editCopy"),
             QCoreApplication.translate('ViewManager', '&Copy'),
@@ -985,7 +985,7 @@
         self.copyAct.triggered.connect(self.__editCopy)
         self.editActions.append(self.copyAct)
         
-        self.pasteAct = E5Action(
+        self.pasteAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Paste'),
             UI.PixmapCache.getIcon("editPaste"),
             QCoreApplication.translate('ViewManager', '&Paste'),
@@ -1005,7 +1005,7 @@
         self.pasteAct.triggered.connect(self.__editPaste)
         self.editActions.append(self.pasteAct)
         
-        self.deleteAct = E5Action(
+        self.deleteAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Clear'),
             UI.PixmapCache.getIcon("editDelete"),
             QCoreApplication.translate('ViewManager', 'Clear'),
@@ -1023,7 +1023,7 @@
         self.deleteAct.triggered.connect(self.__editDelete)
         self.editActions.append(self.deleteAct)
         
-        self.joinAct = E5Action(
+        self.joinAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Join Lines'),
             QCoreApplication.translate('ViewManager', 'Join Lines'),
             QKeySequence(QCoreApplication.translate(
@@ -1040,7 +1040,7 @@
         self.joinAct.triggered.connect(self.__editJoin)
         self.editActions.append(self.joinAct)
         
-        self.indentAct = E5Action(
+        self.indentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Indent'),
             UI.PixmapCache.getIcon("editIndent"),
             QCoreApplication.translate('ViewManager', '&Indent'),
@@ -1059,7 +1059,7 @@
         self.indentAct.triggered.connect(self.__editIndent)
         self.editActions.append(self.indentAct)
         
-        self.unindentAct = E5Action(
+        self.unindentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Unindent'),
             UI.PixmapCache.getIcon("editUnindent"),
             QCoreApplication.translate('ViewManager', 'U&nindent'),
@@ -1078,7 +1078,7 @@
         self.unindentAct.triggered.connect(self.__editUnindent)
         self.editActions.append(self.unindentAct)
         
-        self.smartIndentAct = E5Action(
+        self.smartIndentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Smart indent'),
             UI.PixmapCache.getIcon("editSmartIndent"),
             QCoreApplication.translate('ViewManager', 'Smart indent'),
@@ -1095,7 +1095,7 @@
         self.smartIndentAct.triggered.connect(self.__editSmartIndent)
         self.editActions.append(self.smartIndentAct)
         
-        self.commentAct = E5Action(
+        self.commentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Comment'),
             UI.PixmapCache.getIcon("editComment"),
             QCoreApplication.translate('ViewManager', 'C&omment'),
@@ -1114,7 +1114,7 @@
         self.commentAct.triggered.connect(self.__editComment)
         self.editActions.append(self.commentAct)
         
-        self.uncommentAct = E5Action(
+        self.uncommentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Uncomment'),
             UI.PixmapCache.getIcon("editUncomment"),
             QCoreApplication.translate('ViewManager', 'Unco&mment'),
@@ -1133,7 +1133,7 @@
         self.uncommentAct.triggered.connect(self.__editUncomment)
         self.editActions.append(self.uncommentAct)
         
-        self.toggleCommentAct = E5Action(
+        self.toggleCommentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Toggle Comment'),
             UI.PixmapCache.getIcon("editToggleComment"),
             QCoreApplication.translate('ViewManager', 'Toggle Comment'),
@@ -1155,7 +1155,7 @@
         self.toggleCommentAct.triggered.connect(self.__editToggleComment)
         self.editActions.append(self.toggleCommentAct)
         
-        self.streamCommentAct = E5Action(
+        self.streamCommentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Stream Comment'),
             QCoreApplication.translate('ViewManager', 'Stream Comment'),
             0, 0,
@@ -1172,7 +1172,7 @@
         self.streamCommentAct.triggered.connect(self.__editStreamComment)
         self.editActions.append(self.streamCommentAct)
         
-        self.boxCommentAct = E5Action(
+        self.boxCommentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Box Comment'),
             QCoreApplication.translate('ViewManager', 'Box Comment'),
             0, 0,
@@ -1188,7 +1188,7 @@
         self.boxCommentAct.triggered.connect(self.__editBoxComment)
         self.editActions.append(self.boxCommentAct)
         
-        self.selectBraceAct = E5Action(
+        self.selectBraceAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Select to brace'),
             QCoreApplication.translate('ViewManager', 'Select to &brace'),
             QKeySequence(QCoreApplication.translate(
@@ -1206,7 +1206,7 @@
         self.selectBraceAct.triggered.connect(self.__editSelectBrace)
         self.editActions.append(self.selectBraceAct)
         
-        self.selectAllAct = E5Action(
+        self.selectAllAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Select all'),
             UI.PixmapCache.getIcon("editSelectAll"),
             QCoreApplication.translate('ViewManager', '&Select all'),
@@ -1224,7 +1224,7 @@
         self.selectAllAct.triggered.connect(self.__editSelectAll)
         self.editActions.append(self.selectAllAct)
         
-        self.deselectAllAct = E5Action(
+        self.deselectAllAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Deselect all'),
             QCoreApplication.translate('ViewManager', '&Deselect all'),
             QKeySequence(QCoreApplication.translate(
@@ -1241,7 +1241,7 @@
         self.deselectAllAct.triggered.connect(self.__editDeselectAll)
         self.editActions.append(self.deselectAllAct)
         
-        self.convertEOLAct = E5Action(
+        self.convertEOLAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Convert Line End Characters'),
             QCoreApplication.translate(
@@ -1259,7 +1259,7 @@
         self.convertEOLAct.triggered.connect(self.__convertEOL)
         self.editActions.append(self.convertEOLAct)
         
-        self.shortenEmptyAct = E5Action(
+        self.shortenEmptyAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Shorten empty lines'),
             QCoreApplication.translate('ViewManager', 'Shorten empty lines'),
             0, 0,
@@ -1275,7 +1275,7 @@
         self.shortenEmptyAct.triggered.connect(self.__shortenEmptyLines)
         self.editActions.append(self.shortenEmptyAct)
         
-        self.autoCompleteAct = E5Action(
+        self.autoCompleteAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Complete'),
             QCoreApplication.translate('ViewManager', '&Complete'),
             QKeySequence(QCoreApplication.translate(
@@ -1293,7 +1293,7 @@
         self.autoCompleteAct.triggered.connect(self.__editAutoComplete)
         self.editActions.append(self.autoCompleteAct)
         
-        self.autoCompleteFromDocAct = E5Action(
+        self.autoCompleteFromDocAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Complete from Document'),
             QCoreApplication.translate(
@@ -1316,7 +1316,7 @@
             self.__editAutoCompleteFromDoc)
         self.editActions.append(self.autoCompleteFromDocAct)
         
-        self.autoCompleteFromAPIsAct = E5Action(
+        self.autoCompleteFromAPIsAct = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Complete from APIs'),
             QCoreApplication.translate('ViewManager',
@@ -1339,7 +1339,7 @@
             self.__editAutoCompleteFromAPIs)
         self.editActions.append(self.autoCompleteFromAPIsAct)
         
-        self.autoCompleteFromAllAct = E5Action(
+        self.autoCompleteFromAllAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Complete from Document and APIs'),
             QCoreApplication.translate(
@@ -1362,7 +1362,7 @@
             self.__editAutoCompleteFromAll)
         self.editActions.append(self.autoCompleteFromAllAct)
         
-        self.calltipsAct = E5Action(
+        self.calltipsAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Calltip'),
             QCoreApplication.translate('ViewManager', '&Calltip'),
             QKeySequence(QCoreApplication.translate(
@@ -1380,7 +1380,7 @@
         self.calltipsAct.triggered.connect(self.__editShowCallTips)
         self.editActions.append(self.calltipsAct)
         
-        self.codeInfoAct = E5Action(
+        self.codeInfoAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Code Info'),
             UI.PixmapCache.getIcon("codeDocuViewer"),
             QCoreApplication.translate('ViewManager', 'Code Info'),
@@ -1398,7 +1398,7 @@
         self.codeInfoAct.triggered.connect(self.__editShowCodeInfo)
         self.editActions.append(self.codeInfoAct)
         
-        self.sortAct = E5Action(
+        self.sortAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Sort'),
             QCoreApplication.translate('ViewManager', 'Sort'),
             QKeySequence(QCoreApplication.translate(
@@ -1417,7 +1417,7 @@
         self.sortAct.triggered.connect(self.__editSortSelectedLines)
         self.editActions.append(self.sortAct)
         
-        self.docstringAct = E5Action(
+        self.docstringAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Generate Docstring'),
             QCoreApplication.translate('ViewManager', 'Generate Docstring'),
             QKeySequence(QCoreApplication.translate(
@@ -1451,7 +1451,7 @@
         
         self.editorActGrp = createActionGroup(self.editActGrp)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Move left one character'),
             QCoreApplication.translate('ViewManager',
@@ -1465,7 +1465,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',
@@ -1479,7 +1479,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,
@@ -1491,7 +1491,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,
@@ -1503,7 +1503,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',
@@ -1517,7 +1517,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',
@@ -1531,7 +1531,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,
@@ -1546,7 +1546,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,
@@ -1558,7 +1558,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'),
@@ -1574,7 +1574,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Move to start of display line'),
             QCoreApplication.translate(
@@ -1591,7 +1591,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Move to end of document line'),
             QCoreApplication.translate(
@@ -1608,7 +1608,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',
@@ -1620,7 +1620,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',
@@ -1631,7 +1631,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')),
@@ -1640,7 +1640,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',
@@ -1652,7 +1652,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,
@@ -1661,7 +1661,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')),
@@ -1673,7 +1673,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',
@@ -1690,7 +1690,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',
@@ -1707,7 +1707,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,
@@ -1716,7 +1716,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',
@@ -1726,7 +1726,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(
@@ -1741,7 +1741,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection right one character'),
             QCoreApplication.translate(
@@ -1756,7 +1756,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection up one line'),
             QCoreApplication.translate(
@@ -1771,7 +1771,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection down one line'),
             QCoreApplication.translate(
@@ -1786,7 +1786,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection left one word part'),
             QCoreApplication.translate(
@@ -1800,7 +1800,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection right one word part'),
             QCoreApplication.translate(
@@ -1814,7 +1814,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(
@@ -1831,7 +1831,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(
@@ -1848,7 +1848,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'
@@ -1866,7 +1866,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(
@@ -1883,7 +1883,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection up one paragraph'),
             QCoreApplication.translate(
@@ -1896,7 +1896,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(
@@ -1909,7 +1909,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection up one page'),
             QCoreApplication.translate(
@@ -1921,7 +1921,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend selection down one page'),
             QCoreApplication.translate(
@@ -1937,7 +1937,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(
@@ -1954,7 +1954,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(
@@ -1971,7 +1971,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Delete previous character'),
             QCoreApplication.translate('ViewManager',
@@ -1989,7 +1989,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'),
@@ -2002,7 +2002,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Delete current character'),
             QCoreApplication.translate('ViewManager',
@@ -2016,7 +2016,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(
@@ -2027,7 +2027,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',
@@ -2037,7 +2037,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(
@@ -2048,7 +2048,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,
@@ -2063,7 +2063,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')),
@@ -2073,7 +2073,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Insert new line below current line'),
             QCoreApplication.translate(
@@ -2086,7 +2086,7 @@
         act.triggered.connect(self.__newLineBelow)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete current line'),
             QCoreApplication.translate('ViewManager', 'Delete current line'),
             QKeySequence(QCoreApplication.translate(
@@ -2097,7 +2097,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Duplicate current line'),
             QCoreApplication.translate(
@@ -2108,7 +2108,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Swap current and previous lines'),
             QCoreApplication.translate(
@@ -2119,7 +2119,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate('ViewManager',
                                        'Reverse selected lines'),
             QCoreApplication.translate('ViewManager',
@@ -2131,7 +2131,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',
@@ -2141,7 +2141,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(
@@ -2152,7 +2152,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Toggle insert/overtype'),
             QCoreApplication.translate(
@@ -2163,7 +2163,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(
@@ -2180,7 +2180,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'),
             QCoreApplication.translate(
@@ -2194,7 +2194,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,
@@ -2203,7 +2203,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,
@@ -2212,7 +2212,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend rectangular selection down one line'),
             QCoreApplication.translate(
@@ -2228,7 +2228,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Extend rectangular selection up one line'),
             QCoreApplication.translate(
@@ -2243,7 +2243,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection left one character'),
@@ -2261,7 +2261,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection right one character'),
@@ -2279,7 +2279,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection to first visible character in'
@@ -2298,7 +2298,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'),
@@ -2317,7 +2317,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection up one page'),
@@ -2332,7 +2332,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager',
                 'Extend rectangular selection down one page'),
@@ -2350,7 +2350,7 @@
         act.triggered.connect(self.esm.map)
         self.editActions.append(act)
         
-        act = E5Action(
+        act = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Duplicate current selection'),
             QCoreApplication.translate(
@@ -2364,7 +2364,7 @@
         self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_SCROLLTOSTART"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Scroll to start of document'),
                 QCoreApplication.translate(
@@ -2379,7 +2379,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_SCROLLTOEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Scroll to end of document'),
                 QCoreApplication.translate(
@@ -2394,7 +2394,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(
@@ -2409,7 +2409,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(
@@ -2424,7 +2424,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(
@@ -2440,7 +2440,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(
@@ -2452,7 +2452,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(
@@ -2464,7 +2464,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(
@@ -2479,7 +2479,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMEEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to start of document line'),
@@ -2497,7 +2497,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'),
@@ -2515,7 +2515,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_HOMEDISPLAYEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to start of display line'),
@@ -2534,7 +2534,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'),
@@ -2548,7 +2548,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'),
@@ -2563,7 +2563,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_VCHOMEWRAP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Move to first visible character in display or document'
@@ -2580,7 +2580,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_VCHOMEWRAPEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager',
                     'Extend selection to first visible character in'
@@ -2597,7 +2597,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'),
@@ -2611,7 +2611,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'),
@@ -2626,7 +2626,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Stuttered move up one page'),
                 QCoreApplication.translate(
@@ -2638,7 +2638,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUPEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Stuttered extend selection up one page'),
                 QCoreApplication.translate(
@@ -2651,7 +2651,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWN"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Stuttered move down one page'),
                 QCoreApplication.translate(
@@ -2663,7 +2663,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWNEXTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Stuttered extend selection down one page'),
                 QCoreApplication.translate(
@@ -2676,7 +2676,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_DELWORDRIGHTEND"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Delete right to end of next word'),
                 QCoreApplication.translate(
@@ -2691,7 +2691,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESUP"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Move selected lines up one line'),
                 QCoreApplication.translate(
@@ -2703,7 +2703,7 @@
             self.editActions.append(act)
         
         if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESDOWN"):
-            act = E5Action(
+            act = EricAction(
                 QCoreApplication.translate(
                     'ViewManager', 'Move selected lines down one line'),
                 QCoreApplication.translate(
@@ -2716,7 +2716,7 @@
         
         self.editorActGrp.setEnabled(False)
         
-        self.editLowerCaseAct = E5Action(
+        self.editLowerCaseAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Convert selection to lower case'),
             QCoreApplication.translate(
@@ -2728,7 +2728,7 @@
         self.editLowerCaseAct.triggered.connect(self.esm.map)
         self.editActions.append(self.editLowerCaseAct)
         
-        self.editUpperCaseAct = E5Action(
+        self.editUpperCaseAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Convert selection to upper case'),
             QCoreApplication.translate(
@@ -2809,7 +2809,7 @@
         Public method to create the Edit toolbar.
         
         @param toolbarManager reference to a toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         @return the generated toolbar
         """
         tb = QToolBar(QCoreApplication.translate('ViewManager', 'Edit'),
@@ -2848,7 +2848,7 @@
         """
         self.searchActGrp = createActionGroup(self)
         
-        self.searchAct = E5Action(
+        self.searchAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Search'),
             UI.PixmapCache.getIcon("find"),
             QCoreApplication.translate('ViewManager', '&Search...'),
@@ -2868,7 +2868,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"),
@@ -2889,7 +2889,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'),
@@ -2909,7 +2909,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"),
             QCoreApplication.translate('ViewManager', 'Clear search markers'),
@@ -2928,7 +2928,7 @@
             self.__searchClearMarkers)
         self.searchActions.append(self.searchClearMarkersAct)
         
-        self.searchNextWordAct = E5Action(
+        self.searchNextWordAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Search current word forward'),
             UI.PixmapCache.getIcon("findWordNext"),
@@ -2951,7 +2951,7 @@
         self.searchNextWordAct.triggered.connect(self.__findNextWord)
         self.searchActions.append(self.searchNextWordAct)
         
-        self.searchPrevWordAct = E5Action(
+        self.searchPrevWordAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Search current word backward'),
             UI.PixmapCache.getIcon("findWordPrev"),
@@ -2974,7 +2974,7 @@
         self.searchPrevWordAct.triggered.connect(self.__findPrevWord)
         self.searchActions.append(self.searchPrevWordAct)
         
-        self.replaceAct = E5Action(
+        self.replaceAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Replace'),
             QCoreApplication.translate('ViewManager', '&Replace...'),
             QKeySequence(QCoreApplication.translate(
@@ -2993,7 +2993,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"),
@@ -3017,7 +3017,7 @@
             self.__replaceWidget.replaceSearch)
         self.searchActions.append(self.replaceAndSearchAct)
         
-        self.replaceSelectionAct = E5Action(
+        self.replaceSelectionAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Replace Occurrence'),
             UI.PixmapCache.getIcon("editReplace"),
@@ -3039,7 +3039,7 @@
             self.__replaceWidget.replace)
         self.searchActions.append(self.replaceSelectionAct)
         
-        self.replaceAllAct = E5Action(
+        self.replaceAllAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Replace All'),
             UI.PixmapCache.getIcon("editReplaceAll"),
@@ -3061,7 +3061,7 @@
             self.__replaceWidget.replaceAll)
         self.searchActions.append(self.replaceAllAct)
         
-        self.gotoAct = E5Action(
+        self.gotoAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Goto Line'),
             UI.PixmapCache.getIcon("goto"),
             QCoreApplication.translate('ViewManager', '&Goto Line...'),
@@ -3080,7 +3080,7 @@
         self.gotoAct.triggered.connect(self.__goto)
         self.searchActions.append(self.gotoAct)
         
-        self.gotoBraceAct = E5Action(
+        self.gotoBraceAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Goto Brace'),
             UI.PixmapCache.getIcon("gotoBrace"),
             QCoreApplication.translate('ViewManager', 'Goto &Brace'),
@@ -3098,7 +3098,7 @@
         self.gotoBraceAct.triggered.connect(self.__gotoBrace)
         self.searchActions.append(self.gotoBraceAct)
         
-        self.gotoLastEditAct = E5Action(
+        self.gotoLastEditAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Goto Last Edit Location'),
             UI.PixmapCache.getIcon("gotoLastEditPosition"),
@@ -3121,7 +3121,7 @@
         self.gotoLastEditAct.triggered.connect(self.__gotoLastEditPosition)
         self.searchActions.append(self.gotoLastEditAct)
         
-        self.gotoPreviousDefAct = E5Action(
+        self.gotoPreviousDefAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Goto Previous Method or Class'),
             QCoreApplication.translate(
@@ -3145,7 +3145,7 @@
             self.__gotoPreviousMethodClass)
         self.searchActions.append(self.gotoPreviousDefAct)
         
-        self.gotoNextDefAct = E5Action(
+        self.gotoNextDefAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Goto Next Method or Class'),
             QCoreApplication.translate(
@@ -3168,7 +3168,7 @@
         
         self.searchActGrp.setEnabled(False)
         
-        self.searchFilesAct = E5Action(
+        self.searchFilesAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Search in Files'),
             UI.PixmapCache.getIcon("projectFind"),
             QCoreApplication.translate('ViewManager', 'Search in &Files...'),
@@ -3188,7 +3188,7 @@
         self.searchFilesAct.triggered.connect(self.__searchFiles)
         self.searchActions.append(self.searchFilesAct)
         
-        self.replaceFilesAct = E5Action(
+        self.replaceFilesAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Replace in Files'),
             QCoreApplication.translate('ViewManager', 'Replace in F&iles...'),
             QKeySequence(QCoreApplication.translate(
@@ -3208,7 +3208,7 @@
         self.replaceFilesAct.triggered.connect(self.__replaceFiles)
         self.searchActions.append(self.replaceFilesAct)
         
-        self.searchOpenFilesAct = E5Action(
+        self.searchOpenFilesAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Search in Open Files'),
             UI.PixmapCache.getIcon("documentFind"),
@@ -3231,7 +3231,7 @@
         self.searchOpenFilesAct.triggered.connect(self.__searchOpenFiles)
         self.searchActions.append(self.searchOpenFilesAct)
         
-        self.replaceOpenFilesAct = E5Action(
+        self.replaceOpenFilesAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Replace in Open Files'),
             QCoreApplication.translate(
@@ -3287,7 +3287,7 @@
         Public method to create the Search toolbar.
         
         @param toolbarManager reference to a toolbar manager object
-        @type E5ToolBarManager
+        @type EricToolBarManager
         @return generated toolbar
         @rtype QToolBar
         """
@@ -3336,7 +3336,7 @@
         self.viewActGrp = createActionGroup(self)
         self.viewFoldActGrp = createActionGroup(self)
         
-        self.zoomInAct = E5Action(
+        self.zoomInAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Zoom in'),
             UI.PixmapCache.getIcon("zoomIn"),
             QCoreApplication.translate('ViewManager', 'Zoom &in'),
@@ -3355,7 +3355,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'),
@@ -3374,7 +3374,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'),
@@ -3393,7 +3393,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'),
@@ -3412,7 +3412,7 @@
         self.zoomToAct.triggered.connect(self.__zoom)
         self.viewActions.append(self.zoomToAct)
         
-        self.toggleAllAct = E5Action(
+        self.toggleAllAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Toggle all folds'),
             QCoreApplication.translate('ViewManager', '&Toggle all folds'),
             0, 0, self.viewFoldActGrp, 'vm_view_toggle_all_folds')
@@ -3426,7 +3426,7 @@
         self.toggleAllAct.triggered.connect(self.__toggleAll)
         self.viewActions.append(self.toggleAllAct)
         
-        self.toggleAllChildrenAct = E5Action(
+        self.toggleAllChildrenAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Toggle all folds (including children)'),
             QCoreApplication.translate(
@@ -3444,7 +3444,7 @@
             self.__toggleAllChildren)
         self.viewActions.append(self.toggleAllChildrenAct)
         
-        self.toggleCurrentAct = E5Action(
+        self.toggleCurrentAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Toggle current fold'),
             QCoreApplication.translate('ViewManager', 'Toggle &current fold'),
             0, 0, self.viewFoldActGrp, 'vm_view_toggle_current_fold')
@@ -3459,7 +3459,7 @@
         self.toggleCurrentAct.triggered.connect(self.__toggleCurrent)
         self.viewActions.append(self.toggleCurrentAct)
         
-        self.clearAllFoldsAct = E5Action(
+        self.clearAllFoldsAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Clear all folds'),
             QCoreApplication.translate('ViewManager', 'Clear &all folds'),
             0, 0, self.viewFoldActGrp, 'vm_view_clear_all_folds')
@@ -3474,7 +3474,7 @@
         self.clearAllFoldsAct.triggered.connect(self.__clearAllFolds)
         self.viewActions.append(self.clearAllFoldsAct)
         
-        self.unhighlightAct = E5Action(
+        self.unhighlightAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Remove all highlights'),
             UI.PixmapCache.getIcon("unhighlight"),
             QCoreApplication.translate('ViewManager', 'Remove all highlights'),
@@ -3490,7 +3490,7 @@
         self.unhighlightAct.triggered.connect(self.__unhighlight)
         self.viewActions.append(self.unhighlightAct)
         
-        self.newDocumentViewAct = E5Action(
+        self.newDocumentViewAct = EricAction(
             QCoreApplication.translate('ViewManager', 'New Document View'),
             UI.PixmapCache.getIcon("documentNewView"),
             QCoreApplication.translate('ViewManager', 'New &Document View'),
@@ -3507,7 +3507,7 @@
         self.newDocumentViewAct.triggered.connect(self.__newDocumentView)
         self.viewActions.append(self.newDocumentViewAct)
         
-        self.newDocumentSplitViewAct = E5Action(
+        self.newDocumentSplitViewAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'New Document View (with new split)'),
             UI.PixmapCache.getIcon("splitVertical"),
@@ -3528,7 +3528,7 @@
             self.__newDocumentSplitView)
         self.viewActions.append(self.newDocumentSplitViewAct)
         
-        self.splitViewAct = E5Action(
+        self.splitViewAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Split view'),
             UI.PixmapCache.getIcon("splitVertical"),
             QCoreApplication.translate('ViewManager', '&Split view'),
@@ -3543,7 +3543,7 @@
         self.splitViewAct.triggered.connect(self.__splitView)
         self.viewActions.append(self.splitViewAct)
         
-        self.splitOrientationAct = E5Action(
+        self.splitOrientationAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Arrange horizontally'),
             QCoreApplication.translate('ViewManager', 'Arrange &horizontally'),
             0, 0, self, 'vm_view_arrange_horizontally', True)
@@ -3558,7 +3558,7 @@
         self.splitOrientationAct.toggled[bool].connect(self.__splitOrientation)
         self.viewActions.append(self.splitOrientationAct)
         
-        self.splitRemoveAct = E5Action(
+        self.splitRemoveAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Remove split'),
             UI.PixmapCache.getIcon("remsplitVertical"),
             QCoreApplication.translate('ViewManager', '&Remove split'),
@@ -3573,7 +3573,7 @@
         self.splitRemoveAct.triggered.connect(self.removeSplit)
         self.viewActions.append(self.splitRemoveAct)
         
-        self.nextSplitAct = E5Action(
+        self.nextSplitAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Next split'),
             QCoreApplication.translate('ViewManager', '&Next split'),
             QKeySequence(QCoreApplication.translate(
@@ -3590,7 +3590,7 @@
         self.nextSplitAct.triggered.connect(self.nextSplit)
         self.viewActions.append(self.nextSplitAct)
         
-        self.prevSplitAct = E5Action(
+        self.prevSplitAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Previous split'),
             QCoreApplication.translate('ViewManager', '&Previous split'),
             QKeySequence(QCoreApplication.translate(
@@ -3606,7 +3606,7 @@
         self.prevSplitAct.triggered.connect(self.prevSplit)
         self.viewActions.append(self.prevSplitAct)
         
-        self.previewAct = E5Action(
+        self.previewAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Preview'),
             UI.PixmapCache.getIcon("previewer"),
             QCoreApplication.translate('ViewManager', 'Preview'),
@@ -3623,7 +3623,7 @@
         self.previewAct.toggled[bool].connect(self.__previewEditor)
         self.viewActions.append(self.previewAct)
         
-        self.astViewerAct = E5Action(
+        self.astViewerAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Python AST Viewer'),
             UI.PixmapCache.getIcon("astTree"),
             QCoreApplication.translate('ViewManager', 'Python AST Viewer'),
@@ -3640,7 +3640,7 @@
         self.astViewerAct.toggled[bool].connect(self.__astViewer)
         self.viewActions.append(self.astViewerAct)
         
-        self.disViewerAct = E5Action(
+        self.disViewerAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Python Disassembly Viewer'),
             UI.PixmapCache.getIcon("disassembly"),
@@ -3712,7 +3712,7 @@
         Public method to create the View toolbar.
         
         @param toolbarManager reference to a toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         @return the generated toolbar
         """
         tb = QToolBar(QCoreApplication.translate('ViewManager', 'View'),
@@ -3749,7 +3749,7 @@
         """
         self.macroActGrp = createActionGroup(self)
 
-        self.macroStartRecAct = E5Action(
+        self.macroStartRecAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Start Macro Recording'),
             QCoreApplication.translate(
@@ -3765,7 +3765,7 @@
         self.macroStartRecAct.triggered.connect(self.__macroStartRecording)
         self.macroActions.append(self.macroStartRecAct)
         
-        self.macroStopRecAct = E5Action(
+        self.macroStopRecAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Stop Macro Recording'),
             QCoreApplication.translate('ViewManager', 'Sto&p Macro Recording'),
             0, 0, self.macroActGrp, 'vm_macro_stop_recording')
@@ -3779,7 +3779,7 @@
         self.macroStopRecAct.triggered.connect(self.__macroStopRecording)
         self.macroActions.append(self.macroStopRecAct)
         
-        self.macroRunAct = E5Action(
+        self.macroRunAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Run Macro'),
             QCoreApplication.translate('ViewManager', '&Run Macro'),
             0, 0, self.macroActGrp, 'vm_macro_run')
@@ -3793,7 +3793,7 @@
         self.macroRunAct.triggered.connect(self.__macroRun)
         self.macroActions.append(self.macroRunAct)
         
-        self.macroDeleteAct = E5Action(
+        self.macroDeleteAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Delete Macro'),
             QCoreApplication.translate('ViewManager', '&Delete Macro'),
             0, 0, self.macroActGrp, 'vm_macro_delete')
@@ -3807,7 +3807,7 @@
         self.macroDeleteAct.triggered.connect(self.__macroDelete)
         self.macroActions.append(self.macroDeleteAct)
         
-        self.macroLoadAct = E5Action(
+        self.macroLoadAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Load Macro'),
             QCoreApplication.translate('ViewManager', '&Load Macro'),
             0, 0, self.macroActGrp, 'vm_macro_load')
@@ -3821,7 +3821,7 @@
         self.macroLoadAct.triggered.connect(self.__macroLoad)
         self.macroActions.append(self.macroLoadAct)
         
-        self.macroSaveAct = E5Action(
+        self.macroSaveAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Save Macro'),
             QCoreApplication.translate('ViewManager', '&Save Macro'),
             0, 0, self.macroActGrp, 'vm_macro_save')
@@ -3861,7 +3861,7 @@
         """
         self.bookmarkActGrp = createActionGroup(self)
 
-        self.bookmarkToggleAct = E5Action(
+        self.bookmarkToggleAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Toggle Bookmark'),
             UI.PixmapCache.getIcon("bookmarkToggle"),
             QCoreApplication.translate('ViewManager', '&Toggle Bookmark'),
@@ -3880,7 +3880,7 @@
         self.bookmarkToggleAct.triggered.connect(self.__toggleBookmark)
         self.bookmarkActions.append(self.bookmarkToggleAct)
         
-        self.bookmarkNextAct = E5Action(
+        self.bookmarkNextAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Next Bookmark'),
             UI.PixmapCache.getIcon("bookmarkNext"),
             QCoreApplication.translate('ViewManager', '&Next Bookmark'),
@@ -3898,7 +3898,7 @@
         self.bookmarkNextAct.triggered.connect(self.__nextBookmark)
         self.bookmarkActions.append(self.bookmarkNextAct)
         
-        self.bookmarkPreviousAct = E5Action(
+        self.bookmarkPreviousAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Previous Bookmark'),
             UI.PixmapCache.getIcon("bookmarkPrevious"),
             QCoreApplication.translate('ViewManager', '&Previous Bookmark'),
@@ -3916,7 +3916,7 @@
         self.bookmarkPreviousAct.triggered.connect(self.__previousBookmark)
         self.bookmarkActions.append(self.bookmarkPreviousAct)
         
-        self.bookmarkClearAct = E5Action(
+        self.bookmarkClearAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Clear Bookmarks'),
             QCoreApplication.translate('ViewManager', '&Clear Bookmarks'),
             QKeySequence(QCoreApplication.translate(
@@ -3933,7 +3933,7 @@
         self.bookmarkClearAct.triggered.connect(self.__clearAllBookmarks)
         self.bookmarkActions.append(self.bookmarkClearAct)
         
-        self.syntaxErrorGotoAct = E5Action(
+        self.syntaxErrorGotoAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Goto Syntax Error'),
             UI.PixmapCache.getIcon("syntaxErrorGoto"),
             QCoreApplication.translate('ViewManager', '&Goto Syntax Error'),
@@ -3949,7 +3949,7 @@
         self.syntaxErrorGotoAct.triggered.connect(self.__gotoSyntaxError)
         self.bookmarkActions.append(self.syntaxErrorGotoAct)
         
-        self.syntaxErrorClearAct = E5Action(
+        self.syntaxErrorClearAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Clear Syntax Errors'),
             QCoreApplication.translate('ViewManager', 'Clear &Syntax Errors'),
             0, 0,
@@ -3965,7 +3965,7 @@
             self.__clearAllSyntaxErrors)
         self.bookmarkActions.append(self.syntaxErrorClearAct)
         
-        self.warningsNextAct = E5Action(
+        self.warningsNextAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Next warning message'),
             UI.PixmapCache.getIcon("warningNext"),
             QCoreApplication.translate('ViewManager', '&Next warning message'),
@@ -3982,7 +3982,7 @@
         self.warningsNextAct.triggered.connect(self.__nextWarning)
         self.bookmarkActions.append(self.warningsNextAct)
         
-        self.warningsPreviousAct = E5Action(
+        self.warningsPreviousAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Previous warning message'),
             UI.PixmapCache.getIcon("warningPrev"),
@@ -4001,7 +4001,7 @@
         self.warningsPreviousAct.triggered.connect(self.__previousWarning)
         self.bookmarkActions.append(self.warningsPreviousAct)
         
-        self.warningsClearAct = E5Action(
+        self.warningsClearAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Clear Warning Messages'),
             QCoreApplication.translate(
@@ -4018,7 +4018,7 @@
         self.warningsClearAct.triggered.connect(self.__clearAllWarnings)
         self.bookmarkActions.append(self.warningsClearAct)
         
-        self.notcoveredNextAct = E5Action(
+        self.notcoveredNextAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Next uncovered line'),
             UI.PixmapCache.getIcon("notcoveredNext"),
             QCoreApplication.translate('ViewManager', '&Next uncovered line'),
@@ -4035,7 +4035,7 @@
         self.notcoveredNextAct.triggered.connect(self.__nextUncovered)
         self.bookmarkActions.append(self.notcoveredNextAct)
         
-        self.notcoveredPreviousAct = E5Action(
+        self.notcoveredPreviousAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Previous uncovered line'),
             UI.PixmapCache.getIcon("notcoveredPrev"),
@@ -4055,7 +4055,7 @@
             self.__previousUncovered)
         self.bookmarkActions.append(self.notcoveredPreviousAct)
         
-        self.taskNextAct = E5Action(
+        self.taskNextAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Next Task'),
             UI.PixmapCache.getIcon("taskNext"),
             QCoreApplication.translate('ViewManager', '&Next Task'),
@@ -4071,7 +4071,7 @@
         self.taskNextAct.triggered.connect(self.__nextTask)
         self.bookmarkActions.append(self.taskNextAct)
         
-        self.taskPreviousAct = E5Action(
+        self.taskPreviousAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Previous Task'),
             UI.PixmapCache.getIcon("taskPrev"),
             QCoreApplication.translate(
@@ -4089,7 +4089,7 @@
         self.taskPreviousAct.triggered.connect(self.__previousTask)
         self.bookmarkActions.append(self.taskPreviousAct)
         
-        self.changeNextAct = E5Action(
+        self.changeNextAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Next Change'),
             UI.PixmapCache.getIcon("changeNext"),
             QCoreApplication.translate('ViewManager', '&Next Change'),
@@ -4106,7 +4106,7 @@
         self.changeNextAct.triggered.connect(self.__nextChange)
         self.bookmarkActions.append(self.changeNextAct)
         
-        self.changePreviousAct = E5Action(
+        self.changePreviousAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Previous Change'),
             UI.PixmapCache.getIcon("changePrev"),
             QCoreApplication.translate(
@@ -4173,7 +4173,7 @@
         Public method to create the Bookmark toolbar.
         
         @param toolbarManager reference to a toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         @return the generated toolbar
         """
         tb = QToolBar(QCoreApplication.translate('ViewManager', 'Bookmarks'),
@@ -4213,7 +4213,7 @@
         """
         self.spellingActGrp = createActionGroup(self)
         
-        self.spellCheckAct = E5Action(
+        self.spellCheckAct = EricAction(
             QCoreApplication.translate('ViewManager', 'Check spelling'),
             UI.PixmapCache.getIcon("spellchecking"),
             QCoreApplication.translate(
@@ -4232,7 +4232,7 @@
         self.spellCheckAct.triggered.connect(self.__spellCheck)
         self.spellingActions.append(self.spellCheckAct)
         
-        self.autoSpellCheckAct = E5Action(
+        self.autoSpellCheckAct = EricAction(
             QCoreApplication.translate(
                 'ViewManager', 'Automatic spell checking'),
             UI.PixmapCache.getIcon("autospellchecking"),
@@ -4302,7 +4302,7 @@
         Public method to create the Spelling toolbar.
         
         @param toolbarManager reference to a toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         @return the generated toolbar
         """
         tb = QToolBar(QCoreApplication.translate('ViewManager', 'Spelling'),
@@ -4332,7 +4332,7 @@
         #     3: CWD
         import QScintilla.Lexers
         fileFilter = self._getOpenFileFilter()
-        progs = E5FileDialog.getOpenFileNamesAndFilter(
+        progs = EricFileDialog.getOpenFileNamesAndFilter(
             self.ui,
             QCoreApplication.translate('ViewManager', "Open files"),
             self._getOpenStartDir(),
@@ -4376,7 +4376,7 @@
             if autosave:
                 res = editor.saveFile()
             else:
-                res = E5MessageBox.okToClearData(
+                res = EricMessageBox.okToClearData(
                     self.ui,
                     QCoreApplication.translate('ViewManager', "File Modified"),
                     QCoreApplication.translate(
@@ -4680,7 +4680,7 @@
         from QScintilla.EditorAssembly import EditorAssembly
         assembly = EditorAssembly(self.dbs, fn, self, filetype=filetype,
                                   editor=caller,
-                                  tv=e5App().getObject("TaskViewer"))
+                                  tv=ericApp().getObject("TaskViewer"))
         editor = assembly.getEditor()
         self.editors.append(editor)
         self.__connectEditor(editor)
@@ -4810,8 +4810,8 @@
             .format(eol))
         
         if zoom is None:
-            if QApplication.focusWidget() == e5App().getObject("Shell"):
-                aw = e5App().getObject("Shell")
+            if QApplication.focusWidget() == ericApp().getObject("Shell"):
+                aw = ericApp().getObject("Shell")
             else:
                 aw = self.activeWindow()
             if aw:
@@ -4903,7 +4903,7 @@
                 from QScintilla.EditorAssembly import EditorAssembly
                 assembly = EditorAssembly(self.dbs, fn, self,
                                           filetype=filetype,
-                                          tv=e5App().getObject("TaskViewer"))
+                                          tv=ericApp().getObject("TaskViewer"))
                 editor = assembly.getEditor()
                 self.editors.append(editor)
                 self.__connectEditor(editor)
@@ -5110,7 +5110,7 @@
         """
         from QScintilla.EditorAssembly import EditorAssembly
         assembly = EditorAssembly(self.dbs, "", self,
-                                  tv=e5App().getObject("TaskViewer"))
+                                  tv=ericApp().getObject("TaskViewer"))
         editor = assembly.getEditor()
         self.editors.append(editor)
         self.__connectEditor(editor)
@@ -5357,8 +5357,8 @@
         """
         Private method to handle the cut action.
         """
-        if QApplication.focusWidget() == e5App().getObject("Shell"):
-            e5App().getObject("Shell").cut()
+        if QApplication.focusWidget() == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").cut()
         else:
             self.activeWindow().cut()
         
@@ -5366,8 +5366,8 @@
         """
         Private method to handle the copy action.
         """
-        if QApplication.focusWidget() == e5App().getObject("Shell"):
-            e5App().getObject("Shell").copy()
+        if QApplication.focusWidget() == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").copy()
         else:
             self.activeWindow().copy()
         
@@ -5375,8 +5375,8 @@
         """
         Private method to handle the paste action.
         """
-        if QApplication.focusWidget() == e5App().getObject("Shell"):
-            e5App().getObject("Shell").paste()
+        if QApplication.focusWidget() == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").paste()
         else:
             self.activeWindow().paste()
         
@@ -5384,8 +5384,8 @@
         """
         Private method to handle the delete action.
         """
-        if QApplication.focusWidget() == e5App().getObject("Shell"):
-            e5App().getObject("Shell").clear()
+        if QApplication.focusWidget() == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").clear()
         else:
             self.activeWindow().clear()
         
@@ -5684,8 +5684,8 @@
         """
         Private method to handle the zoom in action.
         """
-        if QApplication.focusWidget() == e5App().getObject("Shell"):
-            e5App().getObject("Shell").zoomIn()
+        if QApplication.focusWidget() == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").zoomIn()
         else:
             aw = self.activeWindow()
             if aw:
@@ -5696,8 +5696,8 @@
         """
         Private method to handle the zoom out action.
         """
-        if QApplication.focusWidget() == e5App().getObject("Shell"):
-            e5App().getObject("Shell").zoomOut()
+        if QApplication.focusWidget() == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").zoomOut()
         else:
             aw = self.activeWindow()
             if aw:
@@ -5715,8 +5715,8 @@
         Private method to handle the zoom action.
         """
         aw = (
-            e5App().getObject("Shell")
-            if QApplication.focusWidget() == e5App().getObject("Shell") else
+            ericApp().getObject("Shell")
+            if QApplication.focusWidget() == ericApp().getObject("Shell") else
             self.activeWindow()
         )
         if aw:
@@ -5733,8 +5733,8 @@
         @param value zoom value to be set (integer)
         """
         aw = (
-            e5App().getObject("Shell")
-            if QApplication.focusWidget() == e5App().getObject("Shell") else
+            ericApp().getObject("Shell")
+            if QApplication.focusWidget() == ericApp().getObject("Shell") else
             self.activeWindow()
         )
         if aw:
@@ -5751,8 +5751,8 @@
         @type Editor or Shell
         """
         aw = (
-            e5App().getObject("Shell")
-            if QApplication.focusWidget() == e5App().getObject("Shell") else
+            ericApp().getObject("Shell")
+            if QApplication.focusWidget() == ericApp().getObject("Shell") else
             self.activeWindow()
         )
         if aw and aw == zoomingWidget:
@@ -6138,11 +6138,11 @@
         """
         Private method to set up the edit dictionaries menu.
         """
-        proj = e5App().getObject("Project")
+        proj = ericApp().getObject("Project")
         projetOpen = proj.isOpen()
-        pwl = e5App().getObject("Project").getProjectDictionaries()[0]
+        pwl = ericApp().getObject("Project").getProjectDictionaries()[0]
         self.__editProjectPwlAct.setEnabled(projetOpen and bool(pwl))
-        pel = e5App().getObject("Project").getProjectDictionaries()[1]
+        pel = ericApp().getObject("Project").getProjectDictionaries()[1]
         self.__editProjectPelAct.setEnabled(projetOpen and bool(pel))
         
         from QScintilla.SpellChecker import SpellChecker
@@ -6172,14 +6172,14 @@
         """
         Private slot to edit the project word list.
         """
-        pwl = e5App().getObject("Project").getProjectDictionaries()[0]
+        pwl = ericApp().getObject("Project").getProjectDictionaries()[0]
         self.__editSpellingDictionary(pwl)
     
     def __editProjectPEL(self):
         """
         Private slot to edit the project exception list.
         """
-        pel = e5App().getObject("Project").getProjectDictionaries()[1]
+        pel = ericApp().getObject("Project").getProjectDictionaries()[1]
         self.__editSpellingDictionary(pel)
     
     def __editUserPWL(self):
@@ -6209,7 +6209,7 @@
                 with open(dictionaryFile, "r", encoding="utf-8") as f:
                     data = f.read()
             except OSError as err:
-                E5MessageBox.critical(
+                EricMessageBox.critical(
                     self.ui,
                     QCoreApplication.translate(
                         'ViewManager', "Edit Spelling Dictionary"),
@@ -6238,7 +6238,7 @@
                     with open(dictionaryFile, "w", encoding="utf-8") as f:
                         f.write(data)
                 except OSError as err:
-                    E5MessageBox.critical(
+                    EricMessageBox.critical(
                         self.ui,
                         QCoreApplication.translate(
                             'ViewManager', "Edit Spelling Dictionary"),
@@ -6287,7 +6287,7 @@
         @return flag indicating success (boolean)
         """
         with contextlib.suppress(TypeError):
-            e5App().focusChanged.disconnect(self.appFocusChanged)
+            ericApp().focusChanged.disconnect(self.appFocusChanged)
         
         self.closeAllWindows()
         self.currentEditor = None
@@ -6302,7 +6302,7 @@
         res = len(self.editors) == 0
         
         if not res:
-            e5App().focusChanged.connect(self.appFocusChanged)
+            ericApp().focusChanged.connect(self.appFocusChanged)
         
         return res
         
@@ -6637,7 +6637,7 @@
         @param actionSetType string denoting the action set to get.
             It must be one of "edit", "file", "search", "view", "window",
             "macro", "bookmark" or "spelling".
-        @return list of all actions (list of E5Action)
+        @return list of all actions (list of EricAction)
         """
         try:
             return self.__actions[actionSetType][:]
@@ -6651,8 +6651,8 @@
         @param cmd the scintilla command to be sent
         """
         focusWidget = QApplication.focusWidget()
-        if focusWidget == e5App().getObject("Shell"):
-            e5App().getObject("Shell").editorCommand(cmd)
+        if focusWidget == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").editorCommand(cmd)
         else:
             aw = self.activeWindow()
             if aw:
@@ -6664,7 +6664,7 @@
         cursor is not at the end of the line.
         """
         focusWidget = QApplication.focusWidget()
-        if focusWidget == e5App().getObject("Shell"):
+        if focusWidget == ericApp().getObject("Shell"):
             return
         else:
             aw = self.activeWindow()
@@ -6781,8 +6781,8 @@
             return os.path.dirname(self.activeWindow().getFileName())
         
         # check, if there is an active project and return its path
-        elif e5App().getObject("Project").isOpen():
-            return e5App().getObject("Project").ppath
+        elif ericApp().getObject("Project").isOpen():
+            return ericApp().getObject("Project").ppath
         
         else:
             return (
@@ -6859,7 +6859,7 @@
         @param fileName file name of the editor (string)
         @param message command message to be sent (string)
         """
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         if project.isProjectFile(fileName):
             self.__cooperationClient.sendEditorCommand(
                 project.getHash(),
@@ -6875,7 +6875,7 @@
         @param fileName project relative file name of the editor (string)
         @param command command string (string)
         """
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         if projectHash == project.getHash():
             fn = project.getAbsoluteUniversalPath(fileName)
             editor = self.getOpenEditor(fn)
@@ -6900,7 +6900,7 @@
         aw = self.activeWindow()
         if aw is not None:
             fn = aw.getFileName()
-            if fn and e5App().getObject("Project").isProjectFile(fn):
+            if fn and ericApp().getObject("Project").isProjectFile(fn):
                 aw.shareEditor(share)
     
     def startSharedEdit(self):
@@ -6910,7 +6910,7 @@
         aw = self.activeWindow()
         if aw is not None:
             fn = aw.getFileName()
-            if fn and e5App().getObject("Project").isProjectFile(fn):
+            if fn and ericApp().getObject("Project").isProjectFile(fn):
                 aw.startSharedEdit()
     
     def sendSharedEdit(self):
@@ -6921,7 +6921,7 @@
         aw = self.activeWindow()
         if aw is not None:
             fn = aw.getFileName()
-            if fn and e5App().getObject("Project").isProjectFile(fn):
+            if fn and ericApp().getObject("Project").isProjectFile(fn):
                 aw.sendSharedEdit()
     
     def cancelSharedEdit(self):
@@ -6931,7 +6931,7 @@
         aw = self.activeWindow()
         if aw is not None:
             fn = aw.getFileName()
-            if fn and e5App().getObject("Project").isProjectFile(fn):
+            if fn and ericApp().getObject("Project").isProjectFile(fn):
                 aw.cancelSharedEdit()
     
     #######################################################################
@@ -6944,8 +6944,8 @@
         
         @param txt text to be inserted (string)
         """
-        if self.__lastFocusWidget == e5App().getObject("Shell"):
-            e5App().getObject("Shell").insert(txt)
+        if self.__lastFocusWidget == ericApp().getObject("Shell"):
+            ericApp().getObject("Shell").insert(txt)
         else:
             aw = self.activeWindow()
             if aw is not None:
@@ -6963,8 +6963,8 @@
         
         @param txt text to be inserted (string)
         """
-        if self.__lastFocusWidget == e5App().getObject("Shell"):
-            aw = e5App().getObject("Shell")
+        if self.__lastFocusWidget == ericApp().getObject("Shell"):
+            aw = ericApp().getObject("Shell")
             if aw.hasSelectedText():
                 aw.removeSelectedText()
             aw.insert(txt)
@@ -6984,8 +6984,8 @@
         @return selected text of the active window (string)
         """
         txt = ""
-        if self.__lastFocusWidget == e5App().getObject("Shell"):
-            aw = e5App().getObject("Shell")
+        if self.__lastFocusWidget == ericApp().getObject("Shell"):
+            aw = ericApp().getObject("Shell")
             if aw.hasSelectedText():
                 txt = aw.selectedText()
         else:

eric ide

mercurial