Mercurial Repositories > eric / file diff

diff -r 14680839ad7a -r d062df8f1d9f QScintilla/Editor.py
--- a/QScintilla/Editor.py	Sat Mar 02 11:17:15 2019 +0100
+++ b/QScintilla/Editor.py	Fri Apr 05 19:06:39 2019 +0200
@@ -29,7 +29,7 @@
 from E5Gui import E5FileDialog, E5MessageBox
 from E5Utilities.E5Cache import E5Cache
 
-from .QsciScintillaCompat import QsciScintillaCompat
+from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
 from .EditorMarkerMap import EditorMarkerMap
 
 import Preferences
@@ -1632,6 +1632,8 @@
             font = QFont(fdesc[0], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+        if self.lexer_.hasSubstyles():
+            self.lexer_.readSubstyles(self)
         
         # now set the lexer properties
         self.lexer_.initProperties()
@@ -3311,6 +3313,8 @@
             if self.lexer_:
                 self.lexer_.readSettings(
                     Preferences.Prefs.settings, "Scintilla")
+                if self.lexer_.hasSubstyles():
+                    self.lexer_.readSubstyles(self)
                 self.lexer_.initProperties()
             self.setMonospaced(False)
             self.__setMarginsDisplay()
@@ -4069,6 +4073,8 @@
         # read the lexer settings and reinit the properties
         if self.lexer_ is not None:
             self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+            if self.lexer_.hasSubstyles():
+                self.lexer_.readSubstyles(self)
             self.lexer_.initProperties()
             
             self.lexer_.setDefaultColor(self.lexer_.color(0))
@@ -4343,6 +4349,9 @@
             Preferences.getEditor("CaretLineAlwaysVisible"))
         self.caretWidth = Preferences.getEditor("CaretWidth")
         self.setCaretWidth(self.caretWidth)
+        self.caretLineFrameWidth = Preferences.getEditor("CaretLineFrameWidth")
+        if QSCINTILLA_VERSION() >= 0x020B00:
+            self.setCaretLineFrameWidth(self.caretLineFrameWidth)
         self.useMonospaced = Preferences.getEditor("UseMonospacedFont")
         self.setMonospaced(self.useMonospaced)
         edgeMode = Preferences.getEditor("EdgeMode")
@@ -4355,6 +4364,8 @@
         wrapVisualFlag = Preferences.getEditor("WrapVisualFlag")
         self.setWrapMode(Preferences.getEditor("WrapLongLinesMode"))
         self.setWrapVisualFlags(wrapVisualFlag, wrapVisualFlag)
+        self.setWrapIndentMode(Preferences.getEditor("WrapIndentMode"))
+        self.setWrapStartIndent(Preferences.getEditor("WrapStartIndent"))
         
         self.zoomTo(Preferences.getEditor("ZoomFactor"))
         
@@ -5673,7 +5684,7 @@
                     files,
                     0, False)
                 if not ok:
-                    return
+                    return ""
             else:
                 fn = files[0]
         else: