From 60b5f660e8d899db5704251a9417add2049364f0 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 3 Jun 2025 17:30:13 +0200 Subject: [PATCH] Rename colour aqua to cyan in themes --- novelwriter/assets/themes/cyberpunk_night.conf | 2 +- novelwriter/assets/themes/default_dark.conf | 2 +- novelwriter/assets/themes/default_light.conf | 2 +- novelwriter/assets/themes/dracula.conf | 2 +- novelwriter/assets/themes/grey_dark.conf | 2 +- novelwriter/assets/themes/grey_light.conf | 2 +- novelwriter/assets/themes/light_owl.conf | 4 ++-- novelwriter/assets/themes/night_owl.conf | 4 ++-- novelwriter/assets/themes/snazzy.conf | 2 +- novelwriter/assets/themes/solarized_dark.conf | 2 +- novelwriter/assets/themes/solarized_light.conf | 2 +- novelwriter/assets/themes/tango_dark.conf | 4 ++-- novelwriter/assets/themes/tango_light.conf | 4 ++-- novelwriter/assets/themes/tomorrow.conf | 4 ++-- novelwriter/assets/themes/tomorrow_night.conf | 4 ++-- novelwriter/assets/themes/tomorrow_night_blue.conf | 4 ++-- novelwriter/assets/themes/tomorrow_night_bright.conf | 4 ++-- novelwriter/assets/themes/tomorrow_night_eighties.conf | 4 ++-- novelwriter/constants.py | 2 +- novelwriter/gui/theme.py | 6 +++--- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/novelwriter/assets/themes/cyberpunk_night.conf b/novelwriter/assets/themes/cyberpunk_night.conf index 1ee10ca8..40b5dd53 100644 --- a/novelwriter/assets/themes/cyberpunk_night.conf +++ b/novelwriter/assets/themes/cyberpunk_night.conf @@ -14,7 +14,7 @@ red = #f24817 orange = #ff960a yellow = #ffff00 green = #00ff00 -aqua = #00ffff +cyan = #00ffff blue = #4d4dff purple = #320064 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 71943bd8..e559de9e 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -15,7 +15,7 @@ red = #f2777a orange = #f99139 yellow = #ffcc66 green = #99cc99 -aqua = #66cccc +cyan = #66cccc blue = #6699cc purple = #cc99cc diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index a67759dc..638d6879 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -15,7 +15,7 @@ red = #a62a2d orange = #b36829 yellow = #a68542 green = #296629 -aqua = #269999 +cyan = #269999 blue = #3a70a6 purple = #b35ab3 diff --git a/novelwriter/assets/themes/dracula.conf b/novelwriter/assets/themes/dracula.conf index 49f30501..04e32450 100644 --- a/novelwriter/assets/themes/dracula.conf +++ b/novelwriter/assets/themes/dracula.conf @@ -31,7 +31,7 @@ red = #ff5555 orange = #ffb86c yellow = #f1fa8c green = #50fa7b -aqua = #8be9fd +cyan = #8be9fd blue = #93cff9 purple = #bd93f9 diff --git a/novelwriter/assets/themes/grey_dark.conf b/novelwriter/assets/themes/grey_dark.conf index d8c4a1fd..21d95224 100644 --- a/novelwriter/assets/themes/grey_dark.conf +++ b/novelwriter/assets/themes/grey_dark.conf @@ -14,7 +14,7 @@ red = #f2777a orange = #f99139 yellow = #ffcc66 green = #99cc99 -aqua = #66cccc +cyan = #66cccc blue = #6699cc purple = #cc99cc diff --git a/novelwriter/assets/themes/grey_light.conf b/novelwriter/assets/themes/grey_light.conf index ffa8fe61..651ab6d0 100644 --- a/novelwriter/assets/themes/grey_light.conf +++ b/novelwriter/assets/themes/grey_light.conf @@ -14,7 +14,7 @@ red = #a62a2d orange = #b36829 yellow = #a68542 green = #296629 -aqua = #269999 +cyan = #269999 blue = #3a70a6 purple = #b35ab3 diff --git a/novelwriter/assets/themes/light_owl.conf b/novelwriter/assets/themes/light_owl.conf index 3544b6cd..b18f5fb7 100644 --- a/novelwriter/assets/themes/light_owl.conf +++ b/novelwriter/assets/themes/light_owl.conf @@ -34,7 +34,7 @@ red = #de3d3a orange = #e0af05 yellow = #daaa01 green = #08916a -aqua = #2aa298 +cyan = #2aa298 blue = #288ed7 purple = #964ac1 @@ -86,6 +86,6 @@ value = orange optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = green texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf index 36ec3432..8aae2b62 100644 --- a/novelwriter/assets/themes/night_owl.conf +++ b/novelwriter/assets/themes/night_owl.conf @@ -34,7 +34,7 @@ red = #f78c6c orange = #ecc48d yellow = #addb67 green = #addb67 -aqua = #7fdbca +cyan = #7fdbca blue = #82aaff purple = #c792ea @@ -86,6 +86,6 @@ value = orange optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = green texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/snazzy.conf b/novelwriter/assets/themes/snazzy.conf index 19a662c0..6220dcc3 100644 --- a/novelwriter/assets/themes/snazzy.conf +++ b/novelwriter/assets/themes/snazzy.conf @@ -27,7 +27,7 @@ red = #ff5c57 orange = #f5b900 yellow = #cf9c00 green = #2dae58 -aqua = #13bbb7 +cyan = #13bbb7 blue = #09a1ed purple = #f767bb diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf index 354b2be9..5cf4e157 100644 --- a/novelwriter/assets/themes/solarized_dark.conf +++ b/novelwriter/assets/themes/solarized_dark.conf @@ -33,7 +33,7 @@ red = #dc322f orange = #cb4b16 yellow = #b58900 green = #859900 -aqua = #2aa198 +cyan = #2aa198 blue = #268bd2 purple = #6c71c4 diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf index 7d7427f5..f185bd73 100644 --- a/novelwriter/assets/themes/solarized_light.conf +++ b/novelwriter/assets/themes/solarized_light.conf @@ -33,7 +33,7 @@ red = #dc322f orange = #cb4b16 yellow = #b58900 green = #859900 -aqua = #2aa198 +cyan = #2aa198 blue = #268bd2 purple = #6c71c4 diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf index 9c4dc59e..33e758f7 100644 --- a/novelwriter/assets/themes/tango_dark.conf +++ b/novelwriter/assets/themes/tango_dark.conf @@ -24,7 +24,7 @@ red = #ef2929 orange = #fcaf3e yellow = #fce94f green = #8ae234 -aqua = #34e2e2 +cyan = #34e2e2 blue = #729fcf purple = #ad7fa8 @@ -76,6 +76,6 @@ value = red optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = blue texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf index 3c66d1e9..877f71ac 100644 --- a/novelwriter/assets/themes/tango_light.conf +++ b/novelwriter/assets/themes/tango_light.conf @@ -24,7 +24,7 @@ red = #a40000 orange = #ce5c00 yellow = #c4a000 green = #4e9a06 -aqua = #069a9a +cyan = #069a9a blue = #204a87 purple = #5c3566 @@ -76,6 +76,6 @@ value = red optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = blue texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow.conf b/novelwriter/assets/themes/tomorrow.conf index f8b9d5df..974816c1 100644 --- a/novelwriter/assets/themes/tomorrow.conf +++ b/novelwriter/assets/themes/tomorrow.conf @@ -34,7 +34,7 @@ red = #c82829 orange = #f5871f yellow = #eab700 green = #718c00 -aqua = #3e999f +cyan = #3e999f blue = #4271ae purple = #8959a8 @@ -86,6 +86,6 @@ value = yellow optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = orange texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow_night.conf b/novelwriter/assets/themes/tomorrow_night.conf index d0e91fbd..94fecbc0 100644 --- a/novelwriter/assets/themes/tomorrow_night.conf +++ b/novelwriter/assets/themes/tomorrow_night.conf @@ -34,7 +34,7 @@ red = #cc6666 orange = #de935f yellow = #f0c674 green = #b5bd68 -aqua = #8abeb7 +cyan = #8abeb7 blue = #81a2be purple = #b294bb @@ -86,6 +86,6 @@ value = yellow optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = orange texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow_night_blue.conf b/novelwriter/assets/themes/tomorrow_night_blue.conf index 79fa3ea4..88aac2e3 100644 --- a/novelwriter/assets/themes/tomorrow_night_blue.conf +++ b/novelwriter/assets/themes/tomorrow_night_blue.conf @@ -34,7 +34,7 @@ red = #ff9da4 orange = #ffc58f yellow = #ffeead green = #d1f1a9 -aqua = #99ffff +cyan = #99ffff blue = #bbdaff purple = #ebbbff @@ -86,6 +86,6 @@ value = yellow optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = orange texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow_night_bright.conf b/novelwriter/assets/themes/tomorrow_night_bright.conf index 3c2ad22d..ab3c4766 100644 --- a/novelwriter/assets/themes/tomorrow_night_bright.conf +++ b/novelwriter/assets/themes/tomorrow_night_bright.conf @@ -34,7 +34,7 @@ red = #d54e53 orange = #e78c45 yellow = #e7c547 green = #b9ca4a -aqua = #70c0b1 +cyan = #70c0b1 blue = #7aa6da purple = #c397d8 @@ -86,6 +86,6 @@ value = yellow optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = orange texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow_night_eighties.conf b/novelwriter/assets/themes/tomorrow_night_eighties.conf index 8f969073..ed67eb95 100644 --- a/novelwriter/assets/themes/tomorrow_night_eighties.conf +++ b/novelwriter/assets/themes/tomorrow_night_eighties.conf @@ -34,7 +34,7 @@ red = #f2777a orange = #f99157 yellow = #ffcc66 green = #99cc99 -aqua = #66cccc +cyan = #66cccc blue = #6699cc purple = #cc99cc @@ -86,6 +86,6 @@ value = yellow optional = blue spellcheckline = red errorline = green -replacetag = aqua +replacetag = cyan modifier = orange texthighlight = yellow:96 diff --git a/novelwriter/constants.py b/novelwriter/constants.py index 336c6318..5b7b260d 100644 --- a/novelwriter/constants.py +++ b/novelwriter/constants.py @@ -450,7 +450,7 @@ class nwLabels: "orange": QT_TRANSLATE_NOOP("Constant", "Orange"), "yellow": QT_TRANSLATE_NOOP("Constant", "Yellow"), "green": QT_TRANSLATE_NOOP("Constant", "Green"), - "aqua": QT_TRANSLATE_NOOP("Constant", "Aqua"), + "cyan": QT_TRANSLATE_NOOP("Constant", "Cyan"), "blue": QT_TRANSLATE_NOOP("Constant", "Blue"), "purple": QT_TRANSLATE_NOOP("Constant", "Purple"), } diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index 236bebe7..b5e2d2f2 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -316,7 +316,7 @@ class GuiTheme: self._setBaseColor("orange", self._readColor(parser, sec, "orange")) self._setBaseColor("yellow", self._readColor(parser, sec, "yellow")) self._setBaseColor("green", self._readColor(parser, sec, "green")) - self._setBaseColor("aqua", self._readColor(parser, sec, "aqua")) + self._setBaseColor("cyan", self._readColor(parser, sec, "cyan")) self._setBaseColor("blue", self._readColor(parser, sec, "blue")) self._setBaseColor("purple", self._readColor(parser, sec, "purple")) @@ -505,7 +505,7 @@ class GuiTheme: orange = QColor(249, 145, 57) if isDark else QColor(245, 135, 31) yellow = QColor(255, 204, 102) if isDark else QColor(234, 183, 0) green = QColor(153, 204, 153) if isDark else QColor(113, 140, 0) - aqua = QColor(102, 204, 204) if isDark else QColor(62, 153, 159) + cyan = QColor(102, 204, 204) if isDark else QColor(62, 153, 159) blue = QColor(102, 153, 204) if isDark else QColor(66, 113, 174) purple = QColor(204, 153, 204) if isDark else QColor(137, 89, 168) @@ -526,7 +526,7 @@ class GuiTheme: self._setBaseColor("orange", orange) self._setBaseColor("yellow", yellow) self._setBaseColor("green", green) - self._setBaseColor("aqua", aqua) + self._setBaseColor("cyan", cyan) self._setBaseColor("blue", blue) self._setBaseColor("purple", purple) self._setBaseColor("root", blue)