--- a/eric6/Preferences/__init__.py Mon Feb 01 10:38:43 2021 +0100
+++ b/eric6/Preferences/__init__.py Tue Mar 02 17:12:08 2021 +0100
@@ -47,10 +47,6 @@
ProtocolsBrowserFlag, AllBrowsersFlag
)
-from WebBrowser.FlashCookieManager.FlashCookieUtilities import (
- flashDataPathForOS
-)
-
from QScintilla.Shell import ShellHistoryStyle
@@ -782,7 +778,7 @@
"AutoLoadSession": False,
"AutoSaveSession": False,
"SessionAllBreakpoints": False,
- "XMLTimestamp": True,
+ "TimestampFile": True,
"AutoCompileForms": False,
"AutoCompileResources": False,
"AutoExecuteMake": False,
@@ -799,12 +795,13 @@
"DebugClientsHistory": [],
"DebuggerInterpreterHistory": [],
"RestartShellForProject": True,
+ "BrowsersListHiddenFiles": False,
}
# defaults for the multi project settings
multiProjectDefaults = {
"OpenMasterAutomatically": True,
- "XMLTimestamp": True,
+ "TimestampFile": True,
"RecentNumber": 9,
"Workspace": "",
}
@@ -907,7 +904,7 @@
"PythonDocDir": "",
"Qt5DocDir": "",
"Qt6DocDir": "",
- "PyQt5DocDir": "",
+ "PyQt5DocDir": "https://www.riverbankcomputing.com/static/Docs/PyQt5/",
"PyQt6DocDir": "",
"PySide2DocDir": "",
"PySide6DocDir": "",
@@ -1012,13 +1009,6 @@
"AdBlockUpdatePeriod": 1,
"AdBlockExceptions": [],
"AdBlockUseLimitedEasyList": True,
- # Flash Cookie Manager
- "FlashCookiesDeleteOnStartExit": False,
- "FlashCookieAutoRefresh": False,
- "FlashCookieNotify": False,
- "FlashCookiesWhitelist": [],
- "FlashCookiesBlacklist": [],
- "FlashCookiesDataPath": flashDataPathForOS(),
# PIM:
"PimFullName": "",
"PimFirstName": "",
@@ -1445,6 +1435,7 @@
# defaults for MicroPython
microPythonDefaults = {
+ "MpyWorkspace": "",
"SerialTimeout": 2000, # timeout in milliseconds
"ReplLineWrap": True, # wrap the REPL lines
"SyncTimeAfterConnect": True,
@@ -1455,27 +1446,39 @@
"MpyCrossCompiler": "", # path of the mpy-cross compiler
"DfuUtilPath": "", # path of the dfu-util flashing tool
"IgnoredUnknownDevices": "[]", # empty list encoded as JSON
+ "ManualDevices": "[]", # empty list encoded as JSON
+
# MicroPython URLs
"MicroPythonDocuUrl":
"https://docs.micropython.org/en/latest/",
"MicroPythonFirmwareUrl":
"http://micropython.org/download/",
+
# CircuitPython URLS
"CircuitPythonDocuUrl":
"https://circuitpython.readthedocs.io/en/latest/",
"CircuitPythonFirmwareUrl":
"https://circuitpython.org/downloads/",
+ "CircuitPythonLibrariesUrl":
+ "https://circuitpython.org/libraries",
+
# BBC micro:bit URLs
"MicrobitDocuUrl":
"https://microbit-micropython.readthedocs.io/en/latest/",
"MicrobitFirmwareUrl":
"https://microbit.org/guide/firmware/",
"MicrobitMicroPythonUrl":
- "https://github.com/bbcmicrobit/micropython/releases",
+ "https://github.com/bbcmicrobit/micropython/releases/",
+ "MicrobitV2MicroPythonUrl":
+ "https://github.com/microbit-foundation/micropython-microbit-v2/"
+ "releases/",
+
# calliope mini URLS
"CalliopeDocuUrl":
"https://github.com/calliope-mini/calliope-mini-micropython/",
- "CalliopeFirmwareUrl":
+ "CalliopeDAPLinkUrl":
+ "https://github.com/calliope-mini/production-test/releases/",
+ "CalliopeMicroPythonUrl":
"https://github.com/calliope-mini/calliope-mini-micropython/",
}
if Globals.isWindowsPlatform():
@@ -2644,7 +2647,7 @@
if key in ["RecentNumber"]:
return int(prefClass.settings.value(
"MultiProject/" + key, prefClass.multiProjectDefaults[key]))
- elif key in ["OpenMasterAutomatically", "XMLTimestamp"]:
+ elif key in ["OpenMasterAutomatically", "TimestampFile"]:
return toBool(prefClass.settings.value(
"MultiProject/" + key, prefClass.multiProjectDefaults[key]))
else:
@@ -2833,15 +2836,13 @@
"DownloadManagerAutoOpen", "DownloadManagerAutoClose",
"PlaybackRequiresUserGesture", "JavaScriptCanPaste",
"WebRTCPublicInterfacesOnly", "DnsPrefetchEnabled",
- "FlashCookiesDeleteOnStartExit", "FlashCookieAutoRefresh",
- "FlashCookieNotify", "VirusTotalEnabled", "VirusTotalSecure",
+ "VirusTotalEnabled", "VirusTotalSecure",
"PdfViewerEnabled", "AlwaysRejectFaultyCertificates",
]:
return toBool(prefClass.settings.value(
"WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
elif key in ["GreaseMonkeyDisabledScripts", "SendRefererWhitelist",
"AdBlockSubscriptions", "AdBlockExceptions",
- "FlashCookiesWhitelist", "FlashCookiesBlacklist",
"SpellCheckLanguages",
]:
return toList(prefClass.settings.value(
@@ -3577,7 +3578,7 @@
return toBool(prefClass.settings.value(
"MicroPython/" + key,
prefClass.microPythonDefaults[key]))
- elif key in ["IgnoredUnknownDevices"]:
+ elif key in ["IgnoredUnknownDevices", "ManualDevices"]:
jsonStr = prefClass.settings.value(
"MicroPython/" + key,
prefClass.microPythonDefaults[key])
@@ -3599,7 +3600,7 @@
@param value the value to be set
@param prefClass preferences class used as the storage area
"""
- if key in ["IgnoredUnknownDevices"]:
+ if key in ["IgnoredUnknownDevices", "ManualDevices"]:
prefClass.settings.setValue(
"MicroPython/" + key,
json.dumps(value))
