Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -350,6 +350,8 @@
     
     iconsDefaults = {
         "Path": [],
+        "DefaultIconsPath": "automatic",
+        # automatic, breeze-dark, breeze-light, oxygen
     }
     
     # defaults for the cooperation settings
@@ -640,6 +642,8 @@
         "NonmatchingBrace": QColor(Qt.red),
         "NonmatchingBraceBack": QColor(Qt.white),
         "CallTipsBackground": QColor(Qt.white),
+        "CallTipsForeground": QColor("#7f7f7f"),
+        "CallTipsHighlight": QColor("#00007f"),
         "CaretForeground": QColor(Qt.black),
         "CaretLineBackground": QColor(Qt.white),
         "Edge": QColor(Qt.lightGray),
@@ -1316,7 +1320,11 @@
     
     # defaults for the printer settings
     graphicsDefaults = {
-        "Font": "SansSerif,10,-1,5,50,0,0,0,0,0"
+        "Font": "SansSerif,10,-1,5,50,0,0,0,0,0",
+        "DrawingMode": "automatic",
+        # automatic - determine mode depending upon desktop scheme
+        # black_white - black items on white background
+        # white_black - white items on black background
     }
     
     # defaults for the icon editor
@@ -1332,9 +1340,9 @@
     
     # defaults for tray starter
     trayStarterDefaults = {
-        "TrayStarterIcon": "erict.png",
-        # valid values are: erict.png, erict-hc.png,
-        #                   erict-bw.png, erict-bwi.png
+        "TrayStarterIcon": "erict",
+        # valid values are: erict, erict-hc,
+        #                   erict-bw, erict-bwi
     }
     
     # defaults for geometry
@@ -1462,17 +1470,25 @@
         "SyncTimeAfterConnect": True,
         "ShowHiddenLocal": True,
         "ShowHiddenDevice": True,
+        "ChartColorTheme": -1,          # -1 = automatic,
+                                        # QChart.ChartTheme otherwise
         "MpyCrossCompiler": "",         # path of the mpy-cross compiler
         "DfuUtilPath": "",              # path of the dfu-util flashing tool
+        # documentation URLs
         "MicroPythonDocuUrl":
             "https://docs.micropython.org/en/latest/",
         "CircuitPythonDocuUrl":
             "https://circuitpython.readthedocs.io/en/latest/",
         "MicrobitDocuUrl":
             "https://microbit-micropython.readthedocs.io/en/latest/",
-        "MicroPythonFirmwareUrl": "http://micropython.org/download",
-        "CircuitPythonFirmwareUrl": "https://circuitpython.org/downloads",
+        "CalliopeDocuUrl":
+            "https://github.com/calliope-mini/calliope-mini-micropython/", 
+        # MicroPython firmware URLs
+        "MicroPythonFirmwareUrl": "http://micropython.org/download/",
+        "CircuitPythonFirmwareUrl": "https://circuitpython.org/downloads/",
         "MicrobitFirmwareUrl": "https://microbit.org/guide/firmware/",
+        "CalliopeFirmwareUrl":
+            "https://github.com/calliope-mini/calliope-mini-micropython/", 
     }
     if Globals.isWindowsPlatform():
         microPythonDefaults["ColorScheme"] = "Windows 10"
@@ -1992,6 +2008,13 @@
     else:
         return prefClass.iconsDefaults[key]
     
+    if key in ["Path"]:
+        return toList(prefClass.settings.value(
+            "UI/Icons/" + key, prefClass.iconsDefaults[key]))
+    else:
+        return prefClass.settings.value(
+            "UI/Icons/" + key, prefClass.iconsDefaults[key])
+
 
 def setIcons(key, value, prefClass=Prefs):
     """