Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sat May 06 13:44:26 2017 +0200
+++ b/Preferences/__init__.py	Sat Jun 03 13:08:50 2017 +0200
@@ -29,7 +29,7 @@
 import sys
 
 from PyQt5.QtCore import QDir, QPoint, QLocale, QSettings, QFileInfo, \
-    QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo, qVersion
+    QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo
 from PyQt5.QtGui import QColor, QFont, QPalette
 from PyQt5.QtWidgets import QInputDialog, QApplication
 from PyQt5.QtNetwork import QNetworkRequest
@@ -49,7 +49,7 @@
 
 from Globals import settingsNameOrganization, settingsNameGlobal, \
     settingsNameRecent, isWindowsPlatform, findPythonInterpreters, \
-    getPyQt5ModulesDirectory
+    getPyQt5ModulesDirectory, qVersionTuple
 
 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
@@ -403,6 +403,7 @@
         "ColourizeSelText": False,
         "CustomSelectionColours": False,
         "ExtendSelectionToEol": False,
+        "LineMarkersBackground": True,
         
         "AutoPrepareAPIs": False,
         
@@ -607,6 +608,8 @@
         editorDefaults["CallTipsPosition"] = 0
     
     editorColourDefaults = {
+        "CurrentMarker": QColor(Qt.yellow),
+        "ErrorMarker": QColor(Qt.red),
         "MatchingBrace": QColor(Qt.green),
         "MatchingBraceBack": QColor(Qt.white),
         "NonmatchingBrace": QColor(Qt.red),
@@ -1022,6 +1025,10 @@
     # defaults for the web browser settings
     webBrowserDefaults = {
         "SingleWebBrowserWindow": True,
+        "ShowToolbars": False,
+        "BookmarksToolBarVisible": True,
+        "MenuBarVisible": False,
+        "StatusBarVisible": True,
         "SaveGeometry": True,
         "WebBrowserState": QByteArray(),
         "StartupBehavior": 1,      # show speed dial
@@ -1292,6 +1299,7 @@
         # parameters for housekeeping
         "KeepGenerations": 2,
         "KeepHidden": False,
+        "StartupCleanup": True,
     }
     
     # defaults for the printer settings
@@ -2869,7 +2877,8 @@
                  "AutoScrollEnabled", "ScreenCaptureEnabled",
                  "WebGLEnabled", "FocusOnNavigationEnabled",
                  "PrintElementBackgrounds", "AllowRunningInsecureContent",
-                 "SpellCheckEnabled",
+                 "SpellCheckEnabled", "ShowToolbars", "MenuBarVisible",
+                 "BookmarksToolBarVisible", "StatusBarVisible",
                  ]:
         return toBool(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
@@ -2984,7 +2993,7 @@
     @param prefClass preferences class used as the storage area
     @return the requested setting (string)
     """
-    if qVersion() < "5.0.0":
+    if qVersionTuple() < (5, 0, 0):
         s = prefClass.settings.value(
             "Qt/Qt4TranslationsDir",
             prefClass.qtDefaults["Qt4TranslationsDir"])
@@ -2995,7 +3004,7 @@
     if s == "":
         s = os.getenv("QTTRANSLATIONSDIR", "")
     if s == "":
-        if qVersion() < "5.0.0":
+        if qVersionTuple() < (5, 0, 0):
             s = os.getenv("QT4TRANSLATIONSDIR", "")
         else:
             s = os.getenv("QT5TRANSLATIONSDIR", "")