[pyqgis-console] allows comments and quotes folding in editor lexer

This commit is contained in:
Salvatore Larosa 2013-04-29 12:41:45 +02:00
parent 195918293c
commit e755815ff0
2 changed files with 6 additions and 7 deletions

View File

@ -82,9 +82,6 @@ class Editor(QsciScintilla):
# Enable non-ascii chars for editor
self.setUtf8(True)
#self.insertInitText()
self.setLexers()
# Set the default font
font = QFont()
font.setFamily('Courier')
@ -102,7 +99,7 @@ class Editor(QsciScintilla):
self.setMarginsBackgroundColor(QColor("#f9f9f9"))
self.setCaretLineVisible(True)
self.setCaretLineBackgroundColor(QColor("#fcf3ed"))
# Clickable margin 1 for showing markers
# self.setMarginSensitivity(1, True)
# self.connect(self,
@ -172,6 +169,7 @@ class Editor(QsciScintilla):
self.uncommentScut.activated.connect(self.parent.pc.uncommentCode)
def settingsEditor(self):
# Set Python lexer
self.setLexers()
threshold = self.settings.value("pythonConsole/autoCompThresholdEditor", 2).toInt()[0]
radioButtonSource = self.settings.value("pythonConsole/autoCompleteSourceEditor", 'fromAPI').toString()
@ -209,6 +207,9 @@ class Editor(QsciScintilla):
from qgis.core import QgsApplication
self.lexer = QsciLexerPython()
self.lexer.setIndentationWarning(QsciLexerPython.Inconsistent)
self.lexer.setFoldComments(True)
self.lexer.setFoldQuotes(True)
loadFont = self.settings.value("pythonConsole/fontfamilytextEditor", "Monospace").toString()
fontSize = self.settings.value("pythonConsole/fontsizeEditor", 10).toInt()[0]

View File

@ -73,9 +73,6 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter):
# Current line visible with special background color
self.setCaretWidth(2)
# Set Python lexer
self.setLexers()
self.settingsShell()
# Don't want to see the horizontal scrollbar at all
@ -110,6 +107,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter):
self.completion_list_selected)
def settingsShell(self):
# Set Python lexer
self.setLexers()
threshold = self.settings.value("pythonConsole/autoCompThreshold", 2).toInt()[0]
self.setAutoCompletionThreshold(threshold)