Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/__init__.py	Sun May 16 20:07:24 2021 +0200
+++ b/eric7/Preferences/__init__.py	Mon May 17 19:58:15 2021 +0200
@@ -26,7 +26,7 @@
 
 from PyQt6.QtCore import (
     QDir, QPoint, QLocale, QSettings, QFileInfo, QCoreApplication, QByteArray,
-    QSize, QUrl, Qt, QLibraryInfo, QDateTime
+    QSize, QUrl, Qt, QLibraryInfo, QDateTime, QtMsgType
 )
 from PyQt6.QtGui import QColor, QFont, QPalette
 from PyQt6.QtWidgets import QApplication
@@ -224,11 +224,12 @@
         "DownloadPath": "",
         "RequestDownloadFilename": True,
         "CheckErrorLog": True,
-        "MinimumMessageTypeSeverity": 2,    # 0 = QtDebugMsg
-                                            # 1 = QtWarningMsg
-                                            # 2 = QtCriticalMsg, QtSystemMsg
-                                            # 3 = QtFatalMsg
-        
+        "MinimumMessageTypeSeverity": QtMsgType.QtCriticalMsg.value,
+        # 0 = QtMsgType.QtDebugMsg
+        # 1 = QtMsgType.QtWarningMsg
+        # 2 = QtMsgType.QtCriticalMsg
+        # 3 = QtMsgType.QtFatalMsg
+
         "LogStdErrColour": QColor(Qt.GlobalColor.red),
         "NotificationTimeout": 5,       # time in seconds the notification
                                         # is shown
@@ -368,7 +369,7 @@
         "IndentationGuides": True,
         "LinenoMargin": True,
         "FoldingMargin": True,
-        "FoldingStyle": 1,
+        "FoldingStyle": QsciScintilla.FoldStyle.PlainFoldStyle,
         "TabForIndentation": False,
         "TabIndents": True,
         "ConvertTabsOnLoad": False,
@@ -2097,8 +2098,8 @@
         return prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key])
     elif key in ["AutosaveInterval", "TabWidth", "IndentWidth",
-                 "FoldingStyle", "WarnFilesize", "EdgeColumn",
-                 "CaretWidth", "CaretLineFrameWidth", "AutoCompletionSource",
+                 "WarnFilesize", "EdgeColumn",
+                 "CaretWidth", "CaretLineFrameWidth",
                  "AutoCompletionThreshold", "AutoCompletionTimeout",
                  "AutoCompletionCacheSize", "AutoCompletionCacheTime",
                  "AutoCompletionWatchdogTime", "AutoCompletionMaxLines",
@@ -2113,32 +2114,35 @@
         return int(prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key]))
     elif key == "WrapLongLinesMode":
-        return QsciScintilla.WrapMode(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "WrapVisualFlag":
-        return QsciScintilla.WrapVisualFlag(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "WrapIndentMode":
-        return QsciScintilla.WrapIndentMode(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "EdgeMode":
-        return QsciScintilla.EdgeMode(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "CallTipsStyle":
-        return QsciScintilla.CallTipsStyle(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "AutoCompletionSource":
-        return QsciScintilla.AutoCompletionSource(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "PythonBadIndentation":
-        return QsciLexerPython.IndentationWarning(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "EOLMode":
-        return QsciScintilla.EolMode(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key == "CallTipsPosition":
-        return QsciScintilla.CallTipsPosition(int(prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key].value)))
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
+    elif key == "FoldingStyle":
+        return prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key])
     elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters",
                  "PreviewMarkdownFileNameExtensions",
                  "PreviewRestFileNameExtensions",
@@ -2169,12 +2173,13 @@
     """
     if key == "TabIndentOverride":
         prefClass.settings.setValue("Editor/" + key, json.dumps(value))
-    elif key in ("WrapLongLinesMode", "WrapVisualFlag", "WrapIndentMode",
-                 "EdgeMode", "CallTipsStyle", "AutoCompletionSource",
-                 "PythonBadIndentation", "EOLMode", "CallTipsPosition"):
-        # value is an enum.Enum derived item
-        prefClass.settings.setValue("Editor/" + key, value.value)
-    else:
+##    elif key in ("WrapLongLinesMode", "WrapVisualFlag", "WrapIndentMode",
+##                 "EdgeMode", "CallTipsStyle", "AutoCompletionSource",
+##                 "PythonBadIndentation", "EOLMode", "CallTipsPosition",
+##                 "FoldingStyle"):
+##        # value is an enum.Enum derived item
+##        prefClass.settings.setValue("Editor/" + key, value.value)
+##    else:
         prefClass.settings.setValue("Editor/" + key, value)