Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sun Feb 04 10:56:30 2018 +0100
+++ b/Preferences/__init__.py	Fri Mar 02 19:35:16 2018 +0100
@@ -395,6 +395,7 @@
         "WarnFilesize": 512,
         "ClearBreaksOnClose": True,
         "StripTrailingWhitespace": False,
+        "InsertFinalNewline": True,
         "CommentColumn0": True,
         "OverrideEditAreaColours": False,
         
@@ -665,6 +666,7 @@
         "ChangesMap": QColor("#00b000"),
         "CurrentMap": QColor("#000000"),
         "SearchMarkersMap": QColor(Qt.blue),
+        "VcsConflictMarkersMap": QColor("#dd00dd"),
         "MarkerMapBackground": QColor("#e7e7e7"),
     }
     
@@ -1189,6 +1191,8 @@
             
             "AutoLoadImages": webEngineSettings.testAttribute(
                 QWebEngineSettings.AutoLoadImages),
+            "JavaScriptEnabled": webEngineSettings.testAttribute(
+                QWebEngineSettings.JavascriptEnabled),
             "JavaScriptCanOpenWindows": webEngineSettings.testAttribute(
                 QWebEngineSettings.JavascriptCanOpenWindows),
             "JavaScriptCanAccessClipboard": webEngineSettings.testAttribute(
@@ -1252,7 +1256,7 @@
         try:
             # Qt 5.10+
             cls.webBrowserDefaults.update({
-                "AllowWindowActivationFromJavaScript": 
+                "AllowWindowActivationFromJavaScript":
                     webEngineSettings.testAttribute(
                         QWebEngineSettings.AllowWindowActivationFromJavaScript
                     ),
@@ -2943,7 +2947,7 @@
             download["Downloaded"] = prefClass.settings.value("Downloaded")
             if download["Downloaded"] is None:
                 download["Downloaded"] = QDateTime()
-            else:
+            elif isinstance(download["Downloaded"], str):
                 download["Downloaded"] = QDateTime.fromString(
                     download["Downloaded"], "yyyy-MM-dd hh:mm:ss")
             downloads.append(download)
@@ -2986,7 +2990,8 @@
         return int(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
     elif key in ["SingleWebBrowserWindow", "SaveGeometry",
-                 "JavaScriptCanOpenWindows", "JavaScriptCanAccessClipboard",
+                 "JavaScriptEnabled", "JavaScriptCanOpenWindows",
+                 "JavaScriptCanAccessClipboard",
                  "AutoLoadImages", "LocalStorageEnabled",
                  "SpatialNavigationEnabled", "LinksIncludedInFocusChain",
                  "LocalContentCanAccessRemoteUrls",