Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Mon Dec 10 20:15:52 2012 +0100
+++ b/Preferences/__init__.py	Tue Dec 11 19:32:52 2012 +0100
@@ -254,7 +254,8 @@
         "WhitespaceSize": 1,
         "ShowEOL": False,
         "UseMonospacedFont": False,
-        "WrapLongLinesMode": QsciScintilla.WrapFlagNone,
+        "WrapLongLinesMode": QsciScintilla.WrapNone,
+        "WrapVisualFlag": QsciScintilla.WrapFlagNone,
         "WarnFilesize": 512,
         "ClearBreaksOnClose": True,
         "StripTrailingWhitespace": False,
@@ -441,6 +442,12 @@
     else:
         editorDefaults["EOLMode"] = QsciScintilla.EolUnix
     
+    try:
+        # since QScintilla 2.7.0
+        editorDefaults["CallTipsPosition"] = QsciScintilla.CallTipsBelowText
+    except AttributeError:
+        editorDefaults["CallTipsPosition"] = 0
+    
     editorColourDefaults = {
         "CurrentMarker": QColor(Qt.yellow),
         "ErrorMarker": QColor(Qt.red),
@@ -1539,7 +1546,7 @@
                  "AutoSpellCheckChunkSize", "SpellCheckingMinWordSize",
                  "PostScriptLevel", "EOLMode", "ZoomFactor", "WhitespaceSize",
                  "OnlineSyntaxCheckInterval", "OnlineChangeTraceInterval",
-                 "WrapLongLinesMode"]:
+                 "WrapLongLinesMode", "WrapVisualFlag", "CallTipsPosition"]:
         return int(prefClass.settings.value("Editor/" + key,
             prefClass.editorDefaults[key]))
     elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters",