--- a/QScintilla/MiniEditor.py Sun Mar 30 22:00:14 2014 +0200
+++ b/QScintilla/MiniEditor.py Thu Apr 03 23:05:31 2014 +0200
@@ -110,7 +110,6 @@
super(MiniEditor, self).__init__(parent)
if name is not None:
self.setObjectName(name)
- self.setAttribute(Qt.WA_DeleteOnClose)
self.setWindowIcon(UI.PixmapCache.getIcon("editor.png"))
self.setStyle(Preferences.getUI("Style"),
@@ -251,8 +250,8 @@
"""
E5MessageBox.about(
self,
- self.trUtf8("About eric5 Mini Editor"),
- self.trUtf8(
+ self.tr("About eric5 Mini Editor"),
+ self.tr(
"The eric5 Mini Editor is an editor component"
" based on QScintilla. It may be used for simple"
" editing tasks, that don't need the power of"
@@ -312,11 +311,11 @@
if line is None:
line = ''
- self.sbLine.setText(self.trUtf8('Line: {0:5}').format(line))
+ self.sbLine.setText(self.tr('Line: {0:5}').format(line))
if pos is None:
pos = ''
- self.sbPos.setText(self.trUtf8('Pos: {0:5}').format(pos))
+ self.sbPos.setText(self.tr('Pos: {0:5}').format(pos))
def __readShortcut(self, act, category):
"""
@@ -366,103 +365,103 @@
Private method to create the File actions.
"""
self.newAct = E5Action(
- self.trUtf8('New'),
+ self.tr('New'),
UI.PixmapCache.getIcon("new.png"),
- self.trUtf8('&New'),
- QKeySequence(self.trUtf8("Ctrl+N", "File|New")),
+ self.tr('&New'),
+ QKeySequence(self.tr("Ctrl+N", "File|New")),
0, self, 'vm_file_new')
- self.newAct.setStatusTip(self.trUtf8('Open an empty editor window'))
- self.newAct.setWhatsThis(self.trUtf8(
+ self.newAct.setStatusTip(self.tr('Open an empty editor window'))
+ self.newAct.setWhatsThis(self.tr(
"""<b>New</b>"""
"""<p>An empty editor window will be created.</p>"""
))
- self.newAct.triggered[()].connect(self.__newFile)
+ self.newAct.triggered.connect(self.__newFile)
self.fileActions.append(self.newAct)
self.openAct = E5Action(
- self.trUtf8('Open'),
+ self.tr('Open'),
UI.PixmapCache.getIcon("open.png"),
- self.trUtf8('&Open...'),
- QKeySequence(self.trUtf8("Ctrl+O", "File|Open")),
+ self.tr('&Open...'),
+ QKeySequence(self.tr("Ctrl+O", "File|Open")),
0, self, 'vm_file_open')
- self.openAct.setStatusTip(self.trUtf8('Open a file'))
- self.openAct.setWhatsThis(self.trUtf8(
+ self.openAct.setStatusTip(self.tr('Open a file'))
+ self.openAct.setWhatsThis(self.tr(
"""<b>Open a file</b>"""
"""<p>You will be asked for the name of a file to be opened.</p>"""
))
- self.openAct.triggered[()].connect(self.__open)
+ self.openAct.triggered.connect(self.__open)
self.fileActions.append(self.openAct)
self.saveAct = E5Action(
- self.trUtf8('Save'),
+ self.tr('Save'),
UI.PixmapCache.getIcon("fileSave.png"),
- self.trUtf8('&Save'),
- QKeySequence(self.trUtf8("Ctrl+S", "File|Save")),
+ self.tr('&Save'),
+ QKeySequence(self.tr("Ctrl+S", "File|Save")),
0, self, 'vm_file_save')
- self.saveAct.setStatusTip(self.trUtf8('Save the current file'))
- self.saveAct.setWhatsThis(self.trUtf8(
+ self.saveAct.setStatusTip(self.tr('Save the current file'))
+ self.saveAct.setWhatsThis(self.tr(
"""<b>Save File</b>"""
"""<p>Save the contents of current editor window.</p>"""
))
- self.saveAct.triggered[()].connect(self.__save)
+ self.saveAct.triggered.connect(self.__save)
self.fileActions.append(self.saveAct)
self.saveAsAct = E5Action(
- self.trUtf8('Save as'),
+ self.tr('Save as'),
UI.PixmapCache.getIcon("fileSaveAs.png"),
- self.trUtf8('Save &as...'),
- QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")),
+ self.tr('Save &as...'),
+ QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")),
0, self, 'vm_file_save_as')
- self.saveAsAct.setStatusTip(self.trUtf8(
+ self.saveAsAct.setStatusTip(self.tr(
'Save the current file to a new one'))
- self.saveAsAct.setWhatsThis(self.trUtf8(
+ self.saveAsAct.setWhatsThis(self.tr(
"""<b>Save File as</b>"""
"""<p>Save the contents of current editor window to a new file."""
""" The file can be entered in a file selection dialog.</p>"""
))
- self.saveAsAct.triggered[()].connect(self.__saveAs)
+ self.saveAsAct.triggered.connect(self.__saveAs)
self.fileActions.append(self.saveAsAct)
self.closeAct = E5Action(
- self.trUtf8('Close'),
+ self.tr('Close'),
UI.PixmapCache.getIcon("close.png"),
- self.trUtf8('&Close'),
- QKeySequence(self.trUtf8("Ctrl+W", "File|Close")),
+ self.tr('&Close'),
+ QKeySequence(self.tr("Ctrl+W", "File|Close")),
0, self, 'vm_file_close')
- self.closeAct.setStatusTip(self.trUtf8('Close the editor window'))
- self.closeAct.setWhatsThis(self.trUtf8(
+ self.closeAct.setStatusTip(self.tr('Close the editor window'))
+ self.closeAct.setWhatsThis(self.tr(
"""<b>Close Window</b>"""
"""<p>Close the current window.</p>"""
))
- self.closeAct.triggered[()].connect(self.close)
+ self.closeAct.triggered.connect(self.close)
self.fileActions.append(self.closeAct)
self.printAct = E5Action(
- self.trUtf8('Print'),
+ self.tr('Print'),
UI.PixmapCache.getIcon("print.png"),
- self.trUtf8('&Print'),
- QKeySequence(self.trUtf8("Ctrl+P", "File|Print")),
+ self.tr('&Print'),
+ QKeySequence(self.tr("Ctrl+P", "File|Print")),
0, self, 'vm_file_print')
- self.printAct.setStatusTip(self.trUtf8('Print the current file'))
- self.printAct.setWhatsThis(self.trUtf8(
+ self.printAct.setStatusTip(self.tr('Print the current file'))
+ self.printAct.setWhatsThis(self.tr(
"""<b>Print File</b>"""
"""<p>Print the contents of the current file.</p>"""
))
- self.printAct.triggered[()].connect(self.__printFile)
+ self.printAct.triggered.connect(self.__printFile)
self.fileActions.append(self.printAct)
self.printPreviewAct = E5Action(
- self.trUtf8('Print Preview'),
+ self.tr('Print Preview'),
UI.PixmapCache.getIcon("printPreview.png"),
QApplication.translate('ViewManager', 'Print Preview'),
0, 0, self, 'vm_file_print_preview')
- self.printPreviewAct.setStatusTip(self.trUtf8(
+ self.printPreviewAct.setStatusTip(self.tr(
'Print preview of the current file'))
- self.printPreviewAct.setWhatsThis(self.trUtf8(
+ self.printPreviewAct.setWhatsThis(self.tr(
"""<b>Print Preview</b>"""
"""<p>Print preview of the current file.</p>"""
))
- self.printPreviewAct.triggered[()].connect(self.__printPreviewFile)
+ self.printPreviewAct.triggered.connect(self.__printPreviewFile)
self.fileActions.append(self.printPreviewAct)
def __createEditActions(self):
@@ -470,96 +469,96 @@
Private method to create the Edit actions.
"""
self.undoAct = E5Action(
- self.trUtf8('Undo'),
+ self.tr('Undo'),
UI.PixmapCache.getIcon("editUndo.png"),
- self.trUtf8('&Undo'),
- QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")),
- QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")),
+ self.tr('&Undo'),
+ QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")),
+ QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")),
self, 'vm_edit_undo')
- self.undoAct.setStatusTip(self.trUtf8('Undo the last change'))
- self.undoAct.setWhatsThis(self.trUtf8(
+ self.undoAct.setStatusTip(self.tr('Undo the last change'))
+ self.undoAct.setWhatsThis(self.tr(
"""<b>Undo</b>"""
"""<p>Undo the last change done in the current editor.</p>"""
))
- self.undoAct.triggered[()].connect(self.__undo)
+ self.undoAct.triggered.connect(self.__undo)
self.editActions.append(self.undoAct)
self.redoAct = E5Action(
- self.trUtf8('Redo'),
+ self.tr('Redo'),
UI.PixmapCache.getIcon("editRedo.png"),
- self.trUtf8('&Redo'),
- QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")),
+ self.tr('&Redo'),
+ QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")),
0, self, 'vm_edit_redo')
- self.redoAct.setStatusTip(self.trUtf8('Redo the last change'))
- self.redoAct.setWhatsThis(self.trUtf8(
+ self.redoAct.setStatusTip(self.tr('Redo the last change'))
+ self.redoAct.setWhatsThis(self.tr(
"""<b>Redo</b>"""
"""<p>Redo the last change done in the current editor.</p>"""
))
- self.redoAct.triggered[()].connect(self.__redo)
+ self.redoAct.triggered.connect(self.__redo)
self.editActions.append(self.redoAct)
self.cutAct = E5Action(
- self.trUtf8('Cut'),
+ self.tr('Cut'),
UI.PixmapCache.getIcon("editCut.png"),
- self.trUtf8('Cu&t'),
- QKeySequence(self.trUtf8("Ctrl+X", "Edit|Cut")),
- QKeySequence(self.trUtf8("Shift+Del", "Edit|Cut")),
+ self.tr('Cu&t'),
+ QKeySequence(self.tr("Ctrl+X", "Edit|Cut")),
+ QKeySequence(self.tr("Shift+Del", "Edit|Cut")),
self, 'vm_edit_cut')
- self.cutAct.setStatusTip(self.trUtf8('Cut the selection'))
- self.cutAct.setWhatsThis(self.trUtf8(
+ self.cutAct.setStatusTip(self.tr('Cut the selection'))
+ self.cutAct.setWhatsThis(self.tr(
"""<b>Cut</b>"""
"""<p>Cut the selected text of the current editor to the"""
""" clipboard.</p>"""
))
- self.cutAct.triggered[()].connect(self.__textEdit.cut)
+ self.cutAct.triggered.connect(self.__textEdit.cut)
self.editActions.append(self.cutAct)
self.copyAct = E5Action(
- self.trUtf8('Copy'),
+ self.tr('Copy'),
UI.PixmapCache.getIcon("editCopy.png"),
- self.trUtf8('&Copy'),
- QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")),
- QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")),
+ self.tr('&Copy'),
+ QKeySequence(self.tr("Ctrl+C", "Edit|Copy")),
+ QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")),
self, 'vm_edit_copy')
- self.copyAct.setStatusTip(self.trUtf8('Copy the selection'))
- self.copyAct.setWhatsThis(self.trUtf8(
+ self.copyAct.setStatusTip(self.tr('Copy the selection'))
+ self.copyAct.setWhatsThis(self.tr(
"""<b>Copy</b>"""
"""<p>Copy the selected text of the current editor to the"""
""" clipboard.</p>"""
))
- self.copyAct.triggered[()].connect(self.__textEdit.copy)
+ self.copyAct.triggered.connect(self.__textEdit.copy)
self.editActions.append(self.copyAct)
self.pasteAct = E5Action(
- self.trUtf8('Paste'),
+ self.tr('Paste'),
UI.PixmapCache.getIcon("editPaste.png"),
- self.trUtf8('&Paste'),
- QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")),
- QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")),
+ self.tr('&Paste'),
+ QKeySequence(self.tr("Ctrl+V", "Edit|Paste")),
+ QKeySequence(self.tr("Shift+Ins", "Edit|Paste")),
self, 'vm_edit_paste')
- self.pasteAct.setStatusTip(self.trUtf8(
+ self.pasteAct.setStatusTip(self.tr(
'Paste the last cut/copied text'))
- self.pasteAct.setWhatsThis(self.trUtf8(
+ self.pasteAct.setWhatsThis(self.tr(
"""<b>Paste</b>"""
"""<p>Paste the last cut/copied text from the clipboard to"""
""" the current editor.</p>"""
))
- self.pasteAct.triggered[()].connect(self.__textEdit.paste)
+ self.pasteAct.triggered.connect(self.__textEdit.paste)
self.editActions.append(self.pasteAct)
self.deleteAct = E5Action(
- self.trUtf8('Clear'),
+ self.tr('Clear'),
UI.PixmapCache.getIcon("editDelete.png"),
- self.trUtf8('Cl&ear'),
- QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")),
+ self.tr('Cl&ear'),
+ QKeySequence(self.tr("Alt+Shift+C", "Edit|Clear")),
0,
self, 'vm_edit_clear')
- self.deleteAct.setStatusTip(self.trUtf8('Clear all text'))
- self.deleteAct.setWhatsThis(self.trUtf8(
+ self.deleteAct.setStatusTip(self.tr('Clear all text'))
+ self.deleteAct.setWhatsThis(self.tr(
"""<b>Clear</b>"""
"""<p>Delete all text of the current editor.</p>"""
))
- self.deleteAct.triggered[()].connect(self.__textEdit.clear)
+ self.deleteAct.triggered.connect(self.__textEdit.clear)
self.editActions.append(self.deleteAct)
self.cutAct.setEnabled(False)
@@ -585,7 +584,7 @@
if isMacPlatform():
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+B')))
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -597,7 +596,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+F')))
self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -609,7 +608,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+P')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEUP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -621,7 +620,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+N')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -633,7 +632,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Left')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -645,7 +644,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -660,7 +659,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Left')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -675,7 +674,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -691,7 +690,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Home')))
self.esm.setMapping(act, QsciScintilla.SCI_VCHOME)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -710,7 +709,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Home')))
self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -729,7 +728,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'End')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -738,7 +737,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')),
0, self.editorActGrp, 'vm_edit_scroll_down_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -747,7 +746,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0,
self.editorActGrp, 'vm_edit_scroll_up_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -756,7 +755,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0,
self.editorActGrp, 'vm_edit_move_up_para')
self.esm.setMapping(act, QsciScintilla.SCI_PARAUP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -765,7 +764,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0,
self.editorActGrp, 'vm_edit_move_down_para')
self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -774,7 +773,7 @@
QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0,
self.editorActGrp, 'vm_edit_move_up_page')
self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -786,7 +785,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+V')))
self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -801,7 +800,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Home')))
self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -816,7 +815,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+End')))
self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -825,7 +824,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0,
self.editorActGrp, 'vm_edit_indent_one_level')
self.esm.setMapping(act, QsciScintilla.SCI_TAB)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -834,7 +833,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')),
0, self.editorActGrp, 'vm_edit_unindent_one_level')
self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -849,7 +848,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Shift+B')))
self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -865,7 +864,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Shift+F')))
self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -881,7 +880,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Shift+P')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -897,7 +896,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Shift+N')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -913,7 +912,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Shift+Left')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -929,7 +928,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Shift+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -946,7 +945,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+Left')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -963,7 +962,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -981,7 +980,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Shift+Home')))
self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -998,7 +997,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Shift+End')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1012,7 +1011,7 @@
'Alt+Shift+Up')),
0, self.editorActGrp, 'vm_edit_extend_selection_up_para')
self.esm.setMapping(act, QsciScintilla.SCI_PARAUPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1025,7 +1024,7 @@
0,
self.editorActGrp, 'vm_edit_extend_selection_down_para')
self.esm.setMapping(act, QsciScintilla.SCI_PARADOWNEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1038,7 +1037,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')),
0, self.editorActGrp, 'vm_edit_extend_selection_up_page')
self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1055,7 +1054,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Shift+V')))
self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1072,7 +1071,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+Home')))
self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTARTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1089,7 +1088,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+End')))
self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1106,7 +1105,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Shift+Backspace')))
self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1119,7 +1118,7 @@
0, 0,
self.editorActGrp, 'vm_edit_delet_previous_char_not_line_start')
self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACKNOTLINE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1131,7 +1130,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+D')))
self.esm.setMapping(act, QsciScintilla.SCI_CLEAR)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1141,7 +1140,7 @@
'Ctrl+Backspace')),
0, self.editorActGrp, 'vm_edit_delete_word_left')
self.esm.setMapping(act, QsciScintilla.SCI_DELWORDLEFT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1150,7 +1149,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0,
self.editorActGrp, 'vm_edit_delete_word_right')
self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1160,7 +1159,7 @@
'Ctrl+Shift+Backspace')),
0, self.editorActGrp, 'vm_edit_delete_line_left')
self.esm.setMapping(act, QsciScintilla.SCI_DELLINELEFT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1175,7 +1174,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+Del')))
self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1185,7 +1184,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Enter')),
self.editorActGrp, 'vm_edit_insert_line')
self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1195,7 +1194,7 @@
'Ctrl+Shift+L')),
0, self.editorActGrp, 'vm_edit_delete_current_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINEDELETE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1204,7 +1203,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0,
self.editorActGrp, 'vm_edit_duplicate_current_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1217,7 +1216,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0,
self.editorActGrp, 'vm_edit_swap_current_previous_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1226,7 +1225,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+L')),
0, self.editorActGrp, 'vm_edit_cut_current_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINECUT)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1236,7 +1235,7 @@
'Ctrl+Shift+T')),
0, self.editorActGrp, 'vm_edit_copy_current_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINECOPY)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1245,7 +1244,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0,
self.editorActGrp, 'vm_edit_toggle_insert_overtype')
self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1258,7 +1257,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+U')),
0, self.editorActGrp, 'vm_edit_convert_selection_lower')
self.esm.setMapping(act, QsciScintilla.SCI_LOWERCASE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1272,7 +1271,7 @@
'Ctrl+Shift+U')),
0, self.editorActGrp, 'vm_edit_convert_selection_upper')
self.esm.setMapping(act, QsciScintilla.SCI_UPPERCASE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1289,7 +1288,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+End')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1305,7 +1304,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1314,7 +1313,7 @@
0, 0,
self.editorActGrp, 'vm_edit_formfeed')
self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1323,7 +1322,7 @@
QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0,
self.editorActGrp, 'vm_edit_escape')
self.esm.setMapping(act, QsciScintilla.SCI_CANCEL)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1340,7 +1339,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Alt+Shift+N')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1356,7 +1355,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Alt+Shift+P')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEUPRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1373,7 +1372,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Alt+Shift+B')))
self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1390,7 +1389,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Alt+Shift+F')))
self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1409,7 +1408,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Shift+Home')))
self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1428,7 +1427,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Shift+End')))
self.esm.setMapping(act, QsciScintilla.SCI_LINEENDRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1442,7 +1441,7 @@
'Alt+Shift+PgUp')),
0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page')
self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1459,7 +1458,7 @@
act.setAlternateShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Alt+Shift+V')))
self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1473,7 +1472,7 @@
'Ctrl+Shift+D')),
0, self.editorActGrp, 'vm_edit_duplicate_current_selection')
self.esm.setMapping(act, QsciScintilla.SCI_SELECTIONDUPLICATE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_SCROLLTOSTART"):
@@ -1488,7 +1487,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Home')))
self.esm.setMapping(act, QsciScintilla.SCI_SCROLLTOSTART)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_SCROLLTOEND"):
@@ -1503,7 +1502,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'End')))
self.esm.setMapping(act, QsciScintilla.SCI_SCROLLTOEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_VERTICALCENTRECARET"):
@@ -1518,7 +1517,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+L')))
self.esm.setMapping(act, QsciScintilla.SCI_VERTICALCENTRECARET)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_WORDRIGHTEND"):
@@ -1533,7 +1532,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_WORDRIGHTENDEXTEND"):
@@ -1548,7 +1547,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Shift+Right')))
self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTENDEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_WORDLEFTEND"):
@@ -1560,7 +1559,7 @@
0, 0,
self.editorActGrp, 'vm_edit_move_end_previous_word')
self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_WORDLEFTENDEXTEND"):
@@ -1572,7 +1571,7 @@
0, 0,
self.editorActGrp, 'vm_edit_select_end_previous_word')
self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTENDEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_HOME"):
@@ -1587,7 +1586,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+A')))
self.esm.setMapping(act, QsciScintilla.SCI_HOME)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_HOMEEXTEND"):
@@ -1605,7 +1604,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Shift+A')))
self.esm.setMapping(act, QsciScintilla.SCI_HOME)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_HOMERECTEXTEND"):
@@ -1622,7 +1621,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Meta+Alt+Shift+A')))
self.esm.setMapping(act, QsciScintilla.SCI_HOMERECTEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_HOMEDISPLAYEXTEND"):
@@ -1640,7 +1639,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Ctrl+Shift+Left')))
self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_HOMEWRAP"):
@@ -1654,7 +1653,7 @@
0, 0,
self.editorActGrp, 'vm_edit_move_start_display_document_line')
self.esm.setMapping(act, QsciScintilla.SCI_HOMEWRAP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_HOMEWRAPEXTEND"):
@@ -1669,7 +1668,7 @@
self.editorActGrp,
'vm_edit_extend_selection_start_display_document_line')
self.esm.setMapping(act, QsciScintilla.SCI_HOMEWRAPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_VCHOMEWRAP"):
@@ -1686,7 +1685,7 @@
self.editorActGrp,
'vm_edit_move_first_visible_char_document_line')
self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEWRAP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_VCHOMEWRAPEXTEND"):
@@ -1703,7 +1702,7 @@
self.editorActGrp,
'vm_edit_extend_selection_first_visible_char_document_line')
self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEWRAPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_LINEENDWRAP"):
@@ -1717,7 +1716,7 @@
0, 0,
self.editorActGrp, 'vm_edit_end_start_display_document_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINEENDWRAP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_LINEENDWRAPEXTEND"):
@@ -1732,7 +1731,7 @@
self.editorActGrp,
'vm_edit_extend_selection_end_display_document_line')
self.esm.setMapping(act, QsciScintilla.SCI_LINEENDWRAPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUP"):
@@ -1744,7 +1743,7 @@
0, 0,
self.editorActGrp, 'vm_edit_stuttered_move_up_page')
self.esm.setMapping(act, QsciScintilla.SCI_STUTTEREDPAGEUP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUPEXTEND"):
@@ -1759,7 +1758,7 @@
self.editorActGrp,
'vm_edit_stuttered_extend_selection_up_page')
self.esm.setMapping(act, QsciScintilla.SCI_STUTTEREDPAGEUPEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWN"):
@@ -1771,7 +1770,7 @@
0, 0,
self.editorActGrp, 'vm_edit_stuttered_move_down_page')
self.esm.setMapping(act, QsciScintilla.SCI_STUTTEREDPAGEDOWN)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWNEXTEND"):
@@ -1786,7 +1785,7 @@
self.editorActGrp,
'vm_edit_stuttered_extend_selection_down_page')
self.esm.setMapping(act, QsciScintilla.SCI_STUTTEREDPAGEDOWNEXTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_DELWORDRIGHTEND"):
@@ -1803,7 +1802,7 @@
act.setShortcut(QKeySequence(
QApplication.translate('ViewManager', 'Alt+Del')))
self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHTEND)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESUP"):
@@ -1817,7 +1816,7 @@
0, 0,
self.editorActGrp, 'vm_edit_move_selection_up_one_line')
self.esm.setMapping(act, QsciScintilla.SCI_MOVESELECTEDLINESUP)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESDOWN"):
@@ -1831,7 +1830,7 @@
0, 0,
self.editorActGrp, 'vm_edit_move_selection_down_one_line')
self.esm.setMapping(act, QsciScintilla.SCI_MOVESELECTEDLINESDOWN)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
act = E5Action(
@@ -1845,7 +1844,7 @@
'Ctrl+Shift+D')),
0, self.editorActGrp, 'vm_edit_duplicate_current_selection')
self.esm.setMapping(act, QsciScintilla.SCI_SELECTIONDUPLICATE)
- act.triggered[()].connect(self.esm.map)
+ act.triggered.connect(self.esm.map)
self.editActions.append(act)
self.__textEdit.addActions(self.editorActGrp.actions())
@@ -1872,7 +1871,7 @@
""" dialog is shown to enter the searchtext and options"""
""" for the search.</p>"""
))
- self.searchAct.triggered[()].connect(self.__search)
+ self.searchAct.triggered.connect(self.__search)
self.searchActions.append(self.searchAct)
self.searchNextAct = E5Action(
@@ -1892,7 +1891,7 @@
""" editor. The previously entered searchtext and options are"""
""" reused.</p>"""
))
- self.searchNextAct.triggered[()].connect(self.searchDlg.findNext)
+ self.searchNextAct.triggered.connect(self.searchDlg.findNext)
self.searchActions.append(self.searchNextAct)
self.searchPrevAct = E5Action(
@@ -1912,7 +1911,7 @@
""" current editor. The previously entered searchtext and"""
""" options are reused.</p>"""
))
- self.searchPrevAct.triggered[()].connect(self.searchDlg.findPrev)
+ self.searchPrevAct.triggered.connect(self.searchDlg.findPrev)
self.searchActions.append(self.searchPrevAct)
self.searchClearMarkersAct = E5Action(
@@ -1931,7 +1930,7 @@
"""<b>Clear search markers</b>"""
"""<p>Clear all displayed search markers.</p>"""
))
- self.searchClearMarkersAct.triggered[()].connect(
+ self.searchClearMarkersAct.triggered.connect(
self.__searchClearMarkers)
self.searchActions.append(self.searchClearMarkersAct)
@@ -1951,7 +1950,7 @@
""" it. A dialog is shown to enter the searchtext, the"""
""" replacement text and options for the search and replace.</p>"""
))
- self.replaceAct.triggered[()].connect(self.__replace)
+ self.replaceAct.triggered.connect(self.__replace)
self.searchActions.append(self.replaceAct)
def __createHelpActions(self):
@@ -1959,38 +1958,38 @@
Private method to create the Help actions.
"""
self.aboutAct = E5Action(
- self.trUtf8('About'),
- self.trUtf8('&About'),
+ self.tr('About'),
+ self.tr('&About'),
0, 0, self, 'about_eric')
- self.aboutAct.setStatusTip(self.trUtf8(
+ self.aboutAct.setStatusTip(self.tr(
'Display information about this software'))
- self.aboutAct.setWhatsThis(self.trUtf8(
+ self.aboutAct.setWhatsThis(self.tr(
"""<b>About</b>"""
"""<p>Display some information about this software.</p>"""))
- self.aboutAct.triggered[()].connect(self.__about)
+ self.aboutAct.triggered.connect(self.__about)
self.helpActions.append(self.aboutAct)
self.aboutQtAct = E5Action(
- self.trUtf8('About Qt'),
- self.trUtf8('About &Qt'),
+ self.tr('About Qt'),
+ self.tr('About &Qt'),
0, 0, self, 'about_qt')
self.aboutQtAct.setStatusTip(
- self.trUtf8('Display information about the Qt toolkit'))
- self.aboutQtAct.setWhatsThis(self.trUtf8(
+ self.tr('Display information about the Qt toolkit'))
+ self.aboutQtAct.setWhatsThis(self.tr(
"""<b>About Qt</b>"""
"""<p>Display some information about the Qt toolkit.</p>"""
))
- self.aboutQtAct.triggered[()].connect(self.__aboutQt)
+ self.aboutQtAct.triggered.connect(self.__aboutQt)
self.helpActions.append(self.aboutQtAct)
self.whatsThisAct = E5Action(
- self.trUtf8('What\'s This?'),
+ self.tr('What\'s This?'),
UI.PixmapCache.getIcon("whatsThis.png"),
- self.trUtf8('&What\'s This?'),
- QKeySequence(self.trUtf8("Shift+F1", "Help|What's This?'")),
+ self.tr('&What\'s This?'),
+ QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
0, self, 'help_help_whats_this')
- self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help'))
- self.whatsThisAct.setWhatsThis(self.trUtf8(
+ self.whatsThisAct.setStatusTip(self.tr('Context sensitive help'))
+ self.whatsThisAct.setWhatsThis(self.tr(
"""<b>Display context sensitive help</b>"""
"""<p>In What's This? mode, the mouse cursor shows an arrow"""
""" with a question mark, and you can click on the interface"""
@@ -1999,14 +1998,14 @@
""" accessed using the context help button in the titlebar."""
"""</p>"""
))
- self.whatsThisAct.triggered[()].connect(self.__whatsThis)
+ self.whatsThisAct.triggered.connect(self.__whatsThis)
self.helpActions.append(self.whatsThisAct)
def __createMenus(self):
"""
Private method to create the menus of the menu bar.
"""
- self.fileMenu = self.menuBar().addMenu(self.trUtf8("&File"))
+ self.fileMenu = self.menuBar().addMenu(self.tr("&File"))
self.fileMenu.addAction(self.newAct)
self.fileMenu.addAction(self.openAct)
self.fileMenu.addAction(self.saveAct)
@@ -2017,7 +2016,7 @@
self.fileMenu.addSeparator()
self.fileMenu.addAction(self.closeAct)
- self.editMenu = self.menuBar().addMenu(self.trUtf8("&Edit"))
+ self.editMenu = self.menuBar().addMenu(self.tr("&Edit"))
self.editMenu.addAction(self.undoAct)
self.editMenu.addAction(self.redoAct)
self.editMenu.addSeparator()
@@ -2034,7 +2033,7 @@
self.menuBar().addSeparator()
- self.helpMenu = self.menuBar().addMenu(self.trUtf8("&Help"))
+ self.helpMenu = self.menuBar().addMenu(self.tr("&Help"))
self.helpMenu.addAction(self.aboutAct)
self.helpMenu.addAction(self.aboutQtAct)
self.helpMenu.addSeparator()
@@ -2046,7 +2045,7 @@
"""
Private method to create the various toolbars.
"""
- filetb = self.addToolBar(self.trUtf8("File"))
+ filetb = self.addToolBar(self.tr("File"))
filetb.setIconSize(UI.Config.ToolBarIconSize)
filetb.addAction(self.newAct)
filetb.addAction(self.openAct)
@@ -2058,7 +2057,7 @@
filetb.addSeparator()
filetb.addAction(self.closeAct)
- edittb = self.addToolBar(self.trUtf8("Edit"))
+ edittb = self.addToolBar(self.tr("Edit"))
edittb.setIconSize(UI.Config.ToolBarIconSize)
edittb.addAction(self.undoAct)
edittb.addAction(self.redoAct)
@@ -2068,14 +2067,14 @@
edittb.addAction(self.pasteAct)
edittb.addAction(self.deleteAct)
- findtb = self.addToolBar(self.trUtf8("Find"))
+ findtb = self.addToolBar(self.tr("Find"))
findtb.setIconSize(UI.Config.ToolBarIconSize)
findtb.addAction(self.searchAct)
findtb.addAction(self.searchNextAct)
findtb.addAction(self.searchPrevAct)
findtb.addAction(self.searchClearMarkersAct)
- helptb = self.addToolBar(self.trUtf8("Help"))
+ helptb = self.addToolBar(self.tr("Help"))
helptb.setIconSize(UI.Config.ToolBarIconSize)
helptb.addAction(self.whatsThisAct)
@@ -2088,26 +2087,26 @@
self.sbWritable = QLabel(self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbWritable)
- self.sbWritable.setWhatsThis(self.trUtf8(
+ self.sbWritable.setWhatsThis(self.tr(
"""<p>This part of the status bar displays an indication of the"""
""" editors files writability.</p>"""
))
self.sbLine = QLabel(self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbLine)
- self.sbLine.setWhatsThis(self.trUtf8(
+ self.sbLine.setWhatsThis(self.tr(
"""<p>This part of the status bar displays the line number of"""
""" the editor.</p>"""
))
self.sbPos = QLabel(self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbPos)
- self.sbPos.setWhatsThis(self.trUtf8(
+ self.sbPos.setWhatsThis(self.tr(
"""<p>This part of the status bar displays the cursor position"""
""" of the editor.</p>"""
))
- self.__statusBar.showMessage(self.trUtf8("Ready"))
+ self.__statusBar.showMessage(self.tr("Ready"))
def __readSettings(self):
"""
@@ -2136,8 +2135,8 @@
if self.__textEdit.isModified():
ret = E5MessageBox.okToClearData(
self,
- self.trUtf8("eric5 Mini Editor"),
- self.trUtf8("The document has unsaved changes."),
+ self.tr("eric5 Mini Editor"),
+ self.tr("The document has unsaved changes."),
self.__save)
return ret
return True
@@ -2156,9 +2155,9 @@
except (UnicodeDecodeError, IOError) as why:
QApplication.restoreOverrideCursor()
E5MessageBox.critical(
- self, self.trUtf8('Open File'),
- self.trUtf8('<p>The file <b>{0}</b> could not be opened.</p>'
- '<p>Reason: {1}</p>')
+ 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)))
QApplication.restoreOverrideCursor()
return
@@ -2175,7 +2174,7 @@
fileEol = self.__textEdit.detectEolString(txt)
self.__textEdit.setEolModeByEolString(fileEol)
- self.__statusBar.showMessage(self.trUtf8("File loaded"), 2000)
+ self.__statusBar.showMessage(self.tr("File loaded"), 2000)
def __saveFile(self, fileName):
"""
@@ -2191,9 +2190,9 @@
fileName, txt, self.encoding)
except (IOError, Utilities.CodingError, UnicodeError) as why:
E5MessageBox.critical(
- self, self.trUtf8('Save File'),
- self.trUtf8('<p>The file <b>{0}</b> could not be saved.<br/>'
- 'Reason: {1}</p>')
+ self, self.tr('Save File'),
+ self.tr('<p>The file <b>{0}</b> could not be saved.<br/>'
+ 'Reason: {1}</p>')
.format(fileName, str(why)))
QApplication.restoreOverrideCursor()
@@ -2205,7 +2204,7 @@
self.editorSaved.emit()
self.__setCurrentFile(fileName)
- self.__statusBar.showMessage(self.trUtf8("File saved"), 2000)
+ self.__statusBar.showMessage(self.tr("File saved"), 2000)
self.__checkActions()
@@ -2220,12 +2219,12 @@
self.__curFile = fileName
if not self.__curFile:
- shownName = self.trUtf8("Untitled")
+ shownName = self.tr("Untitled")
else:
shownName = self.__strippedName(self.__curFile)
- self.setWindowTitle(self.trUtf8("{0}[*] - {1}")
- .format(shownName, self.trUtf8("Mini Editor")))
+ self.setWindowTitle(self.tr("{0}[*] - {1}")
+ .format(shownName, self.tr("Mini Editor")))
self.__textEdit.setModified(False)
self.setWindowModified(False)
@@ -2485,12 +2484,12 @@
if self.__textEdit.hasSelectedText():
printDialog.addEnabledOption(QAbstractPrintDialog.PrintSelection)
if printDialog.exec_() == QDialog.Accepted:
- sb.showMessage(self.trUtf8('Printing...'))
+ sb.showMessage(self.tr('Printing...'))
QApplication.processEvents()
if self.__curFile:
printer.setDocName(QFileInfo(self.__curFile).fileName())
else:
- printer.setDocName(self.trUtf8("Untitled"))
+ printer.setDocName(self.tr("Untitled"))
if printDialog.printRange() == QAbstractPrintDialog.Selection:
# get the selection
fromLine, fromIndex, toLine, toIndex = \
@@ -2502,12 +2501,12 @@
else:
res = printer.printRange(self.__textEdit)
if res:
- sb.showMessage(self.trUtf8('Printing completed'), 2000)
+ sb.showMessage(self.tr('Printing completed'), 2000)
else:
- sb.showMessage(self.trUtf8('Error while printing'), 2000)
+ sb.showMessage(self.tr('Error while printing'), 2000)
QApplication.processEvents()
else:
- sb.showMessage(self.trUtf8('Printing aborted'), 2000)
+ sb.showMessage(self.tr('Printing aborted'), 2000)
QApplication.processEvents()
def __printPreviewFile(self):
@@ -2521,7 +2520,7 @@
if self.__curFile:
printer.setDocName(QFileInfo(self.__curFile).fileName())
else:
- printer.setDocName(self.trUtf8("Untitled"))
+ printer.setDocName(self.tr("Untitled"))
preview = QPrintPreviewDialog(printer, self)
preview.paintRequested.connect(self.__printPreview)
preview.exec_()
@@ -2562,9 +2561,9 @@
self.contextMenu.addAction(self.copyAct)
self.contextMenu.addAction(self.pasteAct)
self.contextMenu.addSeparator()
- self.contextMenu.addAction(self.trUtf8('Select all'), self.__selectAll)
+ self.contextMenu.addAction(self.tr('Select all'), self.__selectAll)
self.contextMenu.addAction(
- self.trUtf8('Deselect all'), self.__deselectAll)
+ self.tr('Deselect all'), self.__deselectAll)
self.contextMenu.addSeparator()
self.languagesMenuAct = self.contextMenu.addMenu(self.languagesMenu)
self.contextMenu.addSeparator()
@@ -2577,10 +2576,10 @@
@return reference to the generated menu (QMenu)
"""
- menu = QMenu(self.trUtf8("Languages"))
+ menu = QMenu(self.tr("Languages"))
self.languagesActGrp = QActionGroup(self)
- self.noLanguageAct = menu.addAction(self.trUtf8("No Language"))
+ self.noLanguageAct = menu.addAction(self.tr("No Language"))
self.noLanguageAct.setCheckable(True)
self.noLanguageAct.setData("None")
self.languagesActGrp.addAction(self.noLanguageAct)
@@ -2603,11 +2602,11 @@
self.languagesActGrp.addAction(act)
menu.addSeparator()
- self.pygmentsAct = menu.addAction(self.trUtf8("Guessed"))
+ self.pygmentsAct = menu.addAction(self.tr("Guessed"))
self.pygmentsAct.setCheckable(True)
self.pygmentsAct.setData("Guessed")
self.languagesActGrp.addAction(self.pygmentsAct)
- self.pygmentsSelAct = menu.addAction(self.trUtf8("Alternatives"))
+ self.pygmentsSelAct = menu.addAction(self.tr("Alternatives"))
self.pygmentsSelAct.setData("Alternatives")
menu.triggered.connect(self.__languageMenuTriggered)
@@ -2622,9 +2621,9 @@
"""
if self.apiLanguage.startswith("Pygments|"):
self.pygmentsSelAct.setText(
- self.trUtf8("Alternatives ({0})").format(self.getLanguage()))
+ self.tr("Alternatives ({0})").format(self.getLanguage()))
else:
- self.pygmentsSelAct.setText(self.trUtf8("Alternatives"))
+ self.pygmentsSelAct.setText(self.tr("Alternatives"))
def __selectPygmentsLexer(self):
"""
@@ -2640,8 +2639,8 @@
lexerSel = 0
lexerName, ok = QInputDialog.getItem(
self,
- self.trUtf8("Pygments Lexer"),
- self.trUtf8("Select the Pygments lexer to apply."),
+ self.tr("Pygments Lexer"),
+ self.tr("Select the Pygments lexer to apply."),
lexerList,
lexerSel,
False)
