Mercurial Repositories > eric / changeset

changeset

Added some forgotten colors to the Theme Manager. eric7

Sun, 19 Dec 2021 19:38:18 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 19 Dec 2021 19:38:18 +0100
branch
eric7
changeset 8842
80ce644a6067
parent 8841
d02b7fd512b2
child 8843
586ee2c4553a

Added some forgotten colors to the Theme Manager.

eric7/Preferences/ThemeManager.py file | annotate | diff | comparison | revisions
eric7/Preferences/__init__.py file | annotate | diff | comparison | revisions
eric7/Themes/dark_1.ethj file | annotate | diff | comparison | revisions
eric7/Themes/dark_2.ethj file | annotate | diff | comparison | revisions
eric7/Themes/light.ethj file | annotate | diff | comparison | revisions 
--- a/eric7/Preferences/ThemeManager.py	Sun Dec 19 17:58:43 2021 +0100
+++ b/eric7/Preferences/ThemeManager.py	Sun Dec 19 19:38:18 2021 +0100
@@ -28,10 +28,14 @@
     ColorKeyPatternList = [
         "Diff/.*Color",
         "Editor/Colour/",
+        "HexEditor/.*BackGround",
+        "HexEditor/.*ForeGround",
         "IRC/.*Colou?r",
         "Project/Colour",
+        "Python/.*Color",
         "Scintilla/.*color",
         "Scintilla/.*paper",
+        "Tasks/.*Color",
         "WebBrowser/.*Colou?r",
     ]
     ColorKeyList = [
--- a/eric7/Preferences/__init__.py	Sun Dec 19 17:58:43 2021 +0100
+++ b/eric7/Preferences/__init__.py	Sun Dec 19 19:38:18 2021 +0100
@@ -1401,7 +1401,7 @@
         "OpenInOverwriteMode": True,
         "OpenReadOnly": False,
         "HighlightChanges": True,
-        "HighlightingBackGround": QColor(0xff, 0xff, 0x99, 0xff),
+        "HighlightingBackGround": QColor("#ffff99"),
         "HighlightingForeGround": QColor(Qt.GlobalColor.black),
         "SelectionBackGround": QColor("#308cc6"),
         "SelectionForeGround": QColor(Qt.GlobalColor.white),
@@ -1869,10 +1869,11 @@
         "ASTViewerErrorColor", "DisViewerErrorColor",
         "DisViewerCurrentColor", "DisViewerLabeledColor",
     ):
-        if value.alpha() < 255:
-            val = "#{0:8x}".format(value.rgba())
-        else:
-            val = value.name()
+        val = (
+            "#{0:8x}".format(value.rgba())
+            if value.alpha() < 255 else
+            value.name()
+        )
         Prefs.settings.setValue("Python/" + key, val)
     else:
         Prefs.settings.setValue("Python/" + key, value)
@@ -3405,7 +3406,8 @@
     @param value the colour to be set
     """
     val = ("#{0:8x}".format(value.rgba())
-           if value.alpha() < 255 else value.name())
+           if value.alpha() < 255 else
+           value.name())
     Prefs.settings.setValue("Diff/" + key, val)
 
 
--- a/eric7/Themes/dark_1.ethj	Sun Dec 19 17:58:43 2021 +0100
+++ b/eric7/Themes/dark_1.ethj	Sun Dec 19 19:38:18 2021 +0100
@@ -56,6 +56,12 @@
     "Editor/Colour/WarningsMap": "#939300",
     "Editor/Colour/WhitespaceBackground": "#262626",
     "Editor/Colour/WhitespaceForeground": "#dfdfdf",
+    "HexEditor/AddressAreaBackGround": "#262626",
+    "HexEditor/AddressAreaForeGround": "#ffffff",
+    "HexEditor/HighlightingBackGround": "#8d8d55",
+    "HexEditor/HighlightingForeGround": "#ffffff",
+    "HexEditor/SelectionBackGround": "#308cc6",
+    "HexEditor/SelectionForeGround": "#ffffff",
     "IRC/ChannelInfoColour": "#9e54b3",
     "IRC/ChannelMessageColour": "#000000",
     "IRC/ErrorMessageColour": "#ff0000",
@@ -92,6 +98,10 @@
     "Project/Colour/VcsRemoved": "#8f008f",
     "Project/Colour/VcsReplaced": "#4f8783",
     "Project/Colour/VcsUpdate": "#008100",
+    "Python/ASTViewerErrorColor": "#ff7f7f",
+    "Python/DisViewerCurrentColor": "#ff7fff",
+    "Python/DisViewerErrorColor": "#ff7f7f",
+    "Python/DisViewerLabeledColor": "#7fff7f",
     "Scintilla/Bash/defaultcolor": 2303527,
     "Scintilla/Bash/defaultpaper": 16579836,
     "Scintilla/Bash/style0/color": 16777215,
@@ -2452,6 +2462,12 @@
     "Scintilla/YAML/style8/paper": 16711680,
     "Scintilla/YAML/style9/color": 16052165,
     "Scintilla/YAML/style9/paper": 2500134,
+    "Tasks/TasksDocuColor": "#803080",
+    "Tasks/TasksFixmeColor": "#803030",
+    "Tasks/TasksNoteColor": "#303080",
+    "Tasks/TasksTestColor": "#a08030",
+    "Tasks/TasksTodoColor": "#308030",
+    "Tasks/TasksWarningColor": "#808000",
     "UI/IconBarColor": "#235d1b",
     "UI/LogStdErrColour": "#ff0000",
     "UI/NotificationCriticalBackground": "#600000",
--- a/eric7/Themes/dark_2.ethj	Sun Dec 19 17:58:43 2021 +0100
+++ b/eric7/Themes/dark_2.ethj	Sun Dec 19 19:38:18 2021 +0100
@@ -56,6 +56,12 @@
     "Editor/Colour/WarningsMap": "#939300",
     "Editor/Colour/WhitespaceBackground": "#262626",
     "Editor/Colour/WhitespaceForeground": "#dfdfdf",
+    "HexEditor/AddressAreaBackGround": "#262626",
+    "HexEditor/AddressAreaForeGround": "#ffffff",
+    "HexEditor/HighlightingBackGround": "#8d8d55",
+    "HexEditor/HighlightingForeGround": "#ffffff",
+    "HexEditor/SelectionBackGround": "#308cc6",
+    "HexEditor/SelectionForeGround": "#ffffff",
     "IRC/ChannelInfoColour": "#9e54b3",
     "IRC/ChannelMessageColour": "#000000",
     "IRC/ErrorMessageColour": "#ff0000",
@@ -92,6 +98,10 @@
     "Project/Colour/VcsRemoved": "#8f008f",
     "Project/Colour/VcsReplaced": "#4f8783",
     "Project/Colour/VcsUpdate": "#008100",
+    "Python/ASTViewerErrorColor": "#ff7f7f",
+    "Python/DisViewerCurrentColor": "#ff7fff",
+    "Python/DisViewerErrorColor": "#ff7f7f",
+    "Python/DisViewerLabeledColor": "#7fff7f",
     "Scintilla/Bash/defaultcolor": 2303527,
     "Scintilla/Bash/defaultpaper": 16579836,
     "Scintilla/Bash/style0/color": 16777215,
@@ -2452,6 +2462,12 @@
     "Scintilla/YAML/style8/paper": 16711680,
     "Scintilla/YAML/style9/color": 16052165,
     "Scintilla/YAML/style9/paper": 3026478,
+    "Tasks/TasksDocuColor": "#803080",
+    "Tasks/TasksFixmeColor": "#803030",
+    "Tasks/TasksNoteColor": "#303080",
+    "Tasks/TasksTestColor": "#a08030",
+    "Tasks/TasksTodoColor": "#308030",
+    "Tasks/TasksWarningColor": "#808000",
     "UI/IconBarColor": "#235d1b",
     "UI/LogStdErrColour": "#ff0000",
     "UI/NotificationCriticalBackground": "#600000",
--- a/eric7/Themes/light.ethj	Sun Dec 19 17:58:43 2021 +0100
+++ b/eric7/Themes/light.ethj	Sun Dec 19 19:38:18 2021 +0100
@@ -56,6 +56,12 @@
     "Editor/Colour/WarningsMap": "#606000",
     "Editor/Colour/WhitespaceBackground": "#ffffff",
     "Editor/Colour/WhitespaceForeground": "#808080",
+    "HexEditor/AddressAreaBackGround": "#efedec",
+    "HexEditor/AddressAreaForeGround": "#000000",
+    "HexEditor/HighlightingBackGround": "#ffff99",
+    "HexEditor/HighlightingForeGround": "#000000",
+    "HexEditor/SelectionBackGround": "#308cc6",
+    "HexEditor/SelectionForeGround": "#ffffff",
     "IRC/ChannelInfoColour": "#9e54b3",
     "IRC/ChannelMessageColour": "#000000",
     "IRC/ErrorMessageColour": "#ff0000",
@@ -92,6 +98,10 @@
     "Project/Colour/VcsRemoved": "#ff00ff",
     "Project/Colour/VcsReplaced": "#95fff8",
     "Project/Colour/VcsUpdate": "#00ff00",
+    "Python/ASTViewerErrorColor": "#800000",
+    "Python/DisViewerCurrentColor": "#800080",
+    "Python/DisViewerErrorColor": "#800000",
+    "Python/DisViewerLabeledColor": "#008000",
     "Scintilla/Bash/defaultcolor": "2303527",
     "Scintilla/Bash/defaultpaper": "16579836",
     "Scintilla/Bash/style0/color": "8421504",
@@ -2452,6 +2462,12 @@
     "Scintilla/YAML/style8/paper": "16711680",
     "Scintilla/YAML/style9/color": "2303527",
     "Scintilla/YAML/style9/paper": "16579836",
+    "Tasks/TasksDocuColor": "#ffa0ff",
+    "Tasks/TasksFixmeColor": "#ffa0a0",
+    "Tasks/TasksNoteColor": "#a0a0ff",
+    "Tasks/TasksTestColor": "#ffcc00",
+    "Tasks/TasksTodoColor": "#a0ffa0",
+    "Tasks/TasksWarningColor": "#ffffa0",
     "UI/IconBarColor": "#2b7321",
     "UI/LogStdErrColour": "#ff0000",
     "UI/NotificationCriticalBackground": "#ffd0d0",

Mercurial Repository: eric

eric ide

mercurial