--- a/eric6/Preferences/__init__.py Sat Oct 03 11:14:23 2020 +0200 +++ b/eric6/Preferences/__init__.py Sun Nov 01 11:15:18 2020 +0100 @@ -16,7 +16,6 @@ 'from Preferences import *' to import it. """ - import ast import os import fnmatch @@ -125,6 +124,7 @@ "BrowsersListContentsByOccurrence": False, "BrowsersListHiddenFiles": False, "BrowsersFileFilters": "*.py[co];*.so;*.dll", + "BrowserShowCoding": True, "LogViewerAutoRaise": True, "LogViewerStdoutFilter": [], "LogViewerStderrFilter": [], @@ -496,6 +496,8 @@ "ShowSourceOutline": True, "SourceOutlineWidth": 200, + "SourceOutlineStepSize": 50, + "SourceOutlineShowCoding": True, # All (most) lexers "AllFoldCompact": True, @@ -1901,7 +1903,7 @@ """ if key in ["BrowsersListFoldersFirst", "BrowsersHideNonPublic", "BrowsersListContentsByOccurrence", "BrowsersListHiddenFiles", - "LogViewerAutoRaise", + "BrowserShowCoding", "LogViewerAutoRaise", "SingleApplicationMode", "TabViewManagerFilenameOnly", "ShowFilePreview", "ShowFilePreviewJS", "ShowFilePreviewSSI", "CaptionShowsFilename", "ShowSplash", @@ -2097,7 +2099,8 @@ "OnlineSyntaxCheckInterval", "OnlineChangeTraceInterval", "WrapLongLinesMode", "WrapVisualFlag", "WrapIndentMode", "WrapStartIndent", "CallTipsPosition", "VirtualSpaceOptions", - "PreviewRefreshWaitTimer", "SourceOutlineWidth"]: + "PreviewRefreshWaitTimer", "SourceOutlineWidth", + "SourceOutlineStepSize"]: return int(prefClass.settings.value( "Editor/" + key, prefClass.editorDefaults[key])) elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters", @@ -3558,7 +3561,7 @@ @param prefClass preferences class used as the storage area @return the requested MicroPython value """ - if key in ("SerialTimeout"): + if key in ("SerialTimeout", "ChartColorTheme"): return int(prefClass.settings.value( "MicroPython/" + key, prefClass.microPythonDefaults[key]))