Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sat Apr 30 13:07:13 2016 +0200
+++ b/Preferences/__init__.py	Sat Apr 30 20:01:30 2016 +0200
@@ -1041,6 +1041,9 @@
         "FilterTrackingCookies": True,
         "SaveUrlColor": QColor(184, 248, 169),
         "UserAgent": "",
+        # Auto Scroller
+        "AutoScrollEnabled": True,
+        "AutoScrollDivider": 8.0,
         # Grease Monkey
         "GreaseMonkeyDisabledScripts": [],
         # Downloads
@@ -2627,7 +2630,7 @@
                  "SyncEncryptPasswordsOnly",
                  "WarnOnMultipleClose", "ClickToFlashEnabled",
                  "FlashCookiesDeleteOnStartExit", "FlashCookieAutoRefresh",
-                 "FlashCookieNotify",
+                 "FlashCookieNotify", 
                  ]:
         return toBool(prefClass.settings.value(
             "Help/" + key, prefClass.helpDefaults[key]))
@@ -2810,6 +2813,7 @@
                  "DoNotTrack", "SendReferer", "FilterTrackingCookies",
                  "AdBlockEnabled", "AdBlockUseLimitedEasyList",
                  "PluginsEnabled", "FullScreenSupportEnabled",
+                 "AutoScrollEnabled",
                  ]:
         return toBool(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
@@ -2818,6 +2822,9 @@
                  ]:
         return toList(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.helpDefaults[key]))
+    elif key in ["AutoScrollDivider"]:
+        return float(prefClass.settings.value(
+            "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
     else:
         return prefClass.settings.value("WebBrowser/" + key,
                                         prefClass.webBrowserDefaults[key])