eric: comparison eric6/QScintilla/MiniEditor.py

-:e01ae92db699
+:31965986ecd1
 @return filename of the displayed file
 @rtype str
 """
 return self.mw.getFileName()
+def editorCommand(self, cmd):
+"""
+Public method to perform a simple editor command.
+@param cmd the scintilla command to be performed (integer)
+"""
+if cmd == QsciScintilla.SCI_DELETEBACK:
+line, index = self.getCursorPosition()
+text = self.text(line)[index - 1:index + 1]
+matchingPairs = ['()', '[]', '{}', '<>', "''", '""']
+# __IGNORE_WARNING_M613__
+if text in matchingPairs:
+self.delete()
+super(MiniScintilla, self).editorCommand(cmd)
 def keyPressEvent(self, ev):
 """
 Protected method to handle the user input a key at a time.
 @param ev key event
 self.__textEdit.modificationChanged.connect(self.__modificationChanged)
 self.__textEdit.cursorPositionChanged.connect(
 self.__cursorPositionChanged)
 self.__textEdit.linesChanged.connect(self.__resizeLinenoMargin)
-self.__textEdit.setContextMenuPolicy(Qt.CustomContextMenu)
+self.__textEdit.setContextMenuPolicy(
+Qt.ContextMenuPolicy.CustomContextMenu)
 self.__textEdit.customContextMenuRequested.connect(
 self.__contextMenuRequested)
 self.__textEdit.selectionChanged.connect(
 lambda: self.__searchWidget.selectionChanged(self.__textEdit))
 ####################################################################
 ## Below follow the actions for QScintilla standard commands.
 ####################################################################
 self.esm = QSignalMapper(self)
-self.esm.mapped[int].connect(self.__textEdit.editorCommand)
+try:
+self.esm.mappedInt.connect(self.__textEdit.editorCommand)
+except AttributeError:
+# pre Qt 5.15
+self.esm.mapped[int].connect(self.__textEdit.editorCommand)
 self.editorActGrp = createActionGroup(self)
 act = E5Action(
 QCoreApplication.translate('ViewManager',
 Preferences.getEditorColour("FoldmarginBackground"))
 self.__textEdit.setFoldMarkersColors(
 Preferences.getEditorColour("FoldMarkersForeground"),
 Preferences.getEditorColour("FoldMarkersBackground"))
 else:
-self.__textEdit.setFolding(QsciScintilla.NoFoldStyle)
+self.__textEdit.setFolding(QsciScintilla.FoldStyle.NoFoldStyle)
 def __resizeLinenoMargin(self):
 """
 Private slot to resize the line numbers margin.
 """
 self.__textEdit.setIndentationGuidesBackgroundColor(
 Preferences.getEditorColour("IndentationGuidesBackground"))
 self.__textEdit.setIndentationGuidesForegroundColor(
 Preferences.getEditorColour("IndentationGuidesForeground"))
 if Preferences.getEditor("ShowWhitespace"):
-self.__textEdit.setWhitespaceVisibility(QsciScintilla.WsVisible)
+self.__textEdit.setWhitespaceVisibility(
+QsciScintilla.WhitespaceVisibility.WsVisible)
 self.__textEdit.setWhitespaceForegroundColor(
 Preferences.getEditorColour("WhitespaceForeground"))
 self.__textEdit.setWhitespaceBackgroundColor(
 Preferences.getEditorColour("WhitespaceBackground"))
 self.__textEdit.setWhitespaceSize(
 Preferences.getEditor("WhitespaceSize"))
 else:
-self.__textEdit.setWhitespaceVisibility(QsciScintilla.WsInvisible)
+self.__textEdit.setWhitespaceVisibility(
+QsciScintilla.WhitespaceVisibility.WsInvisible)
 self.__textEdit.setEolVisibility(Preferences.getEditor("ShowEOL"))
 self.__textEdit.setAutoIndent(Preferences.getEditor("AutoIndentation"))
 if Preferences.getEditor("BraceHighlighting"):
-self.__textEdit.setBraceMatching(QsciScintilla.SloppyBraceMatch)
+self.__textEdit.setBraceMatching(
-else:
+QsciScintilla.BraceMatch.SloppyBraceMatch)
-self.__textEdit.setBraceMatching(QsciScintilla.NoBraceMatch)
+else:
+self.__textEdit.setBraceMatching(
+QsciScintilla.BraceMatch.NoBraceMatch)
 self.__textEdit.setMatchedBraceForegroundColor(
 Preferences.getEditorColour("MatchingBrace"))
 self.__textEdit.setMatchedBraceBackgroundColor(
 Preferences.getEditorColour("MatchingBraceBack"))
 self.__textEdit.setUnmatchedBraceForegroundColor(
 if Preferences.getEditor("CustomSelectionColours"):
 self.__textEdit.setSelectionBackgroundColor(
 Preferences.getEditorColour("SelectionBackground"))
 else:
 self.__textEdit.setSelectionBackgroundColor(
-QApplication.palette().color(QPalette.Highlight))
+QApplication.palette().color(QPalette.ColorRole.Highlight))
 if Preferences.getEditor("ColourizeSelText"):
 self.__textEdit.resetSelectionForegroundColor()
 elif Preferences.getEditor("CustomSelectionColours"):
 self.__textEdit.setSelectionForegroundColor(
 Preferences.getEditorColour("SelectionForeground"))
 else:
 self.__textEdit.setSelectionForegroundColor(
-QApplication.palette().color(QPalette.HighlightedText))
+QApplication.palette().color(
+QPalette.ColorRole.HighlightedText))
 self.__textEdit.setSelectionToEol(
 Preferences.getEditor("ExtendSelectionToEol"))
 self.__textEdit.setCaretForegroundColor(
 Preferences.getEditorColour("CaretForeground"))
 self.__textEdit.setCaretLineBackgroundColor(
 self.__textEdit.setPaper(
 Preferences.getEditorColour("EditAreaBackground"))
 self.__textEdit.setVirtualSpaceOptions(
 Preferences.getEditor("VirtualSpaceOptions"))
+# to avoid errors due to line endings by pasting
+self.__textEdit.SendScintilla(
+QsciScintilla.SCI_SETPASTECONVERTENDINGS, True)
 def __setEolMode(self):
 """
 Private method to configure the eol mode of the editor.
 """
 def __printFile(self):
 """
 Private slot to print the text.
 """
 from .Printer import Printer
-printer = Printer(mode=QPrinter.HighResolution)
+printer = Printer(mode=QPrinter.PrinterMode.HighResolution)
 sb = self.statusBar()
 printDialog = QPrintDialog(printer, self)
 if self.__textEdit.hasSelectedText():
-printDialog.setOption(QAbstractPrintDialog.PrintSelection, True)
+printDialog.setOption(
-if printDialog.exec() == QDialog.Accepted:
+QAbstractPrintDialog.PrintDialogOption.PrintSelection,
+True)
+if printDialog.exec() == QDialog.DialogCode.Accepted:
 sb.showMessage(self.tr('Printing...'))
 QApplication.processEvents()
 if self.__curFile:
 printer.setDocName(QFileInfo(self.__curFile).fileName())
 else:
 printer.setDocName(self.tr("Untitled"))
-if printDialog.printRange() == QAbstractPrintDialog.Selection:
+if (
+printDialog.printRange() ==
+QAbstractPrintDialog.PrintRange.Selection
+):
 # get the selection
 fromLine, fromIndex, toLine, toIndex = (
 self.__textEdit.getSelection()
 )
 if toIndex == 0:
 Private slot to show a print preview of the text.
 """
 from PyQt5.QtPrintSupport import QPrintPreviewDialog
 from .Printer import Printer
-printer = Printer(mode=QPrinter.HighResolution)
+printer = Printer(mode=QPrinter.PrinterMode.HighResolution)
 if self.__curFile:
 printer.setDocName(QFileInfo(self.__curFile).fileName())
 else:
 printer.setDocName(self.tr("Untitled"))
 preview = QPrintPreviewDialog(printer, self)
 self.__textEdit.setLexer(self.lexer_)
 if self.lexer_.lexer() == "container" or self.lexer_.lexer() is None:
 self.__textEdit.SCN_STYLENEEDED.connect(self.__styleNeeded)
 # get the font for style 0 and set it as the default font
-key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
+if pyname and pyname.startswith("Pygments|"):
+key = 'Scintilla/Guessed/style0/font'
+else:
+key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
 fdesc = Preferences.Prefs.settings.value(key)
 if fdesc is not None:
 font = QFont(fdesc[0], int(fdesc[1]))
 self.lexer_.setDefaultFont(font)
 self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
 try:
 if option == "EOLMode":
 value = config["end_of_line"]
 if value == "lf":
-value = QsciScintilla.EolUnix
+value = QsciScintilla.EolMode.EolUnix
 elif value == "crlf":
-value = QsciScintilla.EolWindows
+value = QsciScintilla.EolMode.EolWindows
 elif value == "cr":
-value = QsciScintilla.EolMac
+value = QsciScintilla.EolMode.EolMac
 else:
 value = None
 elif option == "DefaultEncoding":
 value = config["charset"]
 elif option == "InsertFinalNewline":
 """
 Private method to handle the zoom action.
 """
 from QScintilla.ZoomDialog import ZoomDialog
 dlg = ZoomDialog(self.getZoom(), self, None, True)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 value = dlg.getZoomSize()
 self.__zoomTo(value)
 def __zoomTo(self, value):
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/QScintilla/MiniEditor.py

eric6/QScintilla/MiniEditor.py