From 06b6adbcdea6a66ff38ffff930e5bf6bff95f3a4 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 14 Jul 2025 19:33:01 +0200 Subject: [PATCH 1/3] Remove description field from theme parsing and testing --- novelwriter/gui/theme.py | 22 ++++++++++------------ tests/test_gui/test_gui_theme.py | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index cbd4166d..5dd370ab 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -66,12 +66,11 @@ class ThemeEntry: class ThemeMeta: - name: str = "" - mode: str = "" - description: str = "" - author: str = "" - credit: str = "" - url: str = "" + name: str = "" + mode: str = "" + author: str = "" + credit: str = "" + url: str = "" class IconsMeta: @@ -299,12 +298,11 @@ class GuiTheme: sec = "Main" meta = ThemeMeta() if parser.has_section(sec): - meta.name = parser.get(sec, "name", fallback="") - meta.mode = parser.get(sec, "mode", fallback="light") - meta.description = parser.get(sec, "description", fallback="") - meta.author = parser.get(sec, "author", fallback="") - meta.credit = parser.get(sec, "credit", fallback="") - meta.url = parser.get(sec, "url", fallback="") + meta.name = parser.get(sec, "name", fallback="") + meta.mode = parser.get(sec, "mode", fallback="light") + meta.author = parser.get(sec, "author", fallback="") + meta.credit = parser.get(sec, "credit", fallback="") + meta.url = parser.get(sec, "url", fallback="") self._meta = meta diff --git a/tests/test_gui/test_gui_theme.py b/tests/test_gui/test_gui_theme.py index 933043b3..e461a9bf 100644 --- a/tests/test_gui/test_gui_theme.py +++ b/tests/test_gui/test_gui_theme.py @@ -613,7 +613,7 @@ def testGuiTheme_CheckTheme(theme): structure = { "Main": [ - "name", "mode", "description", "author", # The rest are not required + "name", "mode", "author", # The rest are not required ], "Base": [ "base", "default", "faded", "red", "orange", "yellow", "green", From df89f183e0ff921eb0a67b427c1f2ea01ff7ad62 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 14 Jul 2025 19:33:23 +0200 Subject: [PATCH 2/3] Clean up theme files --- novelwriter/assets/themes/aura.conf | 11 +++++------ novelwriter/assets/themes/aura_bright.conf | 7 +++---- novelwriter/assets/themes/aura_soft.conf | 11 +++++------ novelwriter/assets/themes/b2t_garden_dark.conf | 13 ++++++------- novelwriter/assets/themes/b2t_garden_light.conf | 13 ++++++------- novelwriter/assets/themes/b2t_suburb_dark.conf | 13 ++++++------- novelwriter/assets/themes/b2t_suburb_light.conf | 13 ++++++------- novelwriter/assets/themes/b4t_classic_o_dark.conf | 11 +++++------ novelwriter/assets/themes/b4t_classic_o_light.conf | 11 +++++------ novelwriter/assets/themes/b4t_modern_c_dark.conf | 11 +++++------ novelwriter/assets/themes/b4t_modern_c_light.conf | 13 ++++++------- novelwriter/assets/themes/blue_streak_dark.conf | 11 +++++------ novelwriter/assets/themes/blue_streak_light.conf | 11 +++++------ novelwriter/assets/themes/castle_day.conf | 7 +++---- novelwriter/assets/themes/castle_night.conf | 7 +++---- novelwriter/assets/themes/chalky_soil.conf | 7 +++---- novelwriter/assets/themes/chernozem.conf | 7 +++---- novelwriter/assets/themes/cyberpunk_night.conf | 9 ++++----- novelwriter/assets/themes/default_dark.conf | 11 +++++------ novelwriter/assets/themes/default_light.conf | 11 +++++------ novelwriter/assets/themes/dracula.conf | 11 +++++------ novelwriter/assets/themes/espresso.conf | 11 +++++------ novelwriter/assets/themes/everforest_dark.conf | 11 +++++------ novelwriter/assets/themes/everforest_light.conf | 11 +++++------ novelwriter/assets/themes/floral_daydream.conf | 7 +++---- novelwriter/assets/themes/floral_midnight.conf | 7 +++---- novelwriter/assets/themes/full_moon.conf | 9 ++++----- novelwriter/assets/themes/grey_dark.conf | 11 +++++------ novelwriter/assets/themes/grey_light.conf | 11 +++++------ novelwriter/assets/themes/lcars.conf | 11 +++++------ novelwriter/assets/themes/light_owl.conf | 11 +++++------ novelwriter/assets/themes/new_moon.conf | 13 ++++++------- novelwriter/assets/themes/night_owl.conf | 11 +++++------ novelwriter/assets/themes/noctis.conf | 11 +++++------ novelwriter/assets/themes/noctis_lux.conf | 11 +++++------ novelwriter/assets/themes/nord.conf | 11 +++++------ novelwriter/assets/themes/nordlicht.conf | 9 ++++----- novelwriter/assets/themes/primer_light.conf | 11 +++++------ novelwriter/assets/themes/primer_night.conf | 11 +++++------ novelwriter/assets/themes/ruby_day.conf | 7 +++---- novelwriter/assets/themes/ruby_night.conf | 9 ++++----- novelwriter/assets/themes/snazzy.conf | 11 +++++------ novelwriter/assets/themes/solarized_dark.conf | 11 +++++------ novelwriter/assets/themes/solarized_light.conf | 11 +++++------ novelwriter/assets/themes/tango_dark.conf | 11 +++++------ novelwriter/assets/themes/tango_light.conf | 11 +++++------ novelwriter/assets/themes/tomorrow.conf | 11 +++++------ novelwriter/assets/themes/tomorrow_night.conf | 11 +++++------ novelwriter/assets/themes/tomorrow_night_blue.conf | 11 +++++------ .../assets/themes/tomorrow_night_bright.conf | 11 +++++------ .../assets/themes/tomorrow_night_eighties.conf | 11 +++++------ 51 files changed, 241 insertions(+), 292 deletions(-) diff --git a/novelwriter/assets/themes/aura.conf b/novelwriter/assets/themes/aura.conf index b6d8749e..1c89fe62 100644 --- a/novelwriter/assets/themes/aura.conf +++ b/novelwriter/assets/themes/aura.conf @@ -1,10 +1,9 @@ [Main] -name = Aura -mode = dark -description = Aura -author = Myian -credit = Dalton Menezes -url = https://github.com/daltonmenezes/aura-theme +name = Aura +mode = dark +author = Myian +credit = Dalton Menezes +url = https://github.com/daltonmenezes/aura-theme [Base] base = #15141b diff --git a/novelwriter/assets/themes/aura_bright.conf b/novelwriter/assets/themes/aura_bright.conf index 65f41056..2b022c22 100644 --- a/novelwriter/assets/themes/aura_bright.conf +++ b/novelwriter/assets/themes/aura_bright.conf @@ -1,8 +1,7 @@ [Main] -name = Aura (Bright) -mode = light -description = Aura -author = Myian +name = Aura (Bright) +mode = light +author = Myian [Base] base = #f0e9f0 diff --git a/novelwriter/assets/themes/aura_soft.conf b/novelwriter/assets/themes/aura_soft.conf index 82ddbc11..cf619963 100644 --- a/novelwriter/assets/themes/aura_soft.conf +++ b/novelwriter/assets/themes/aura_soft.conf @@ -1,10 +1,9 @@ [Main] -name = Aura (Soft) -mode = dark -description = Aura -author = Myian -credit = Dalton Menezes -url = https://github.com/daltonmenezes/aura-theme +name = Aura (Soft) +mode = dark +author = Myian +credit = Dalton Menezes +url = https://github.com/daltonmenezes/aura-theme [Base] base = #15141b diff --git a/novelwriter/assets/themes/b2t_garden_dark.conf b/novelwriter/assets/themes/b2t_garden_dark.conf index a6dcf87a..2da82a6f 100644 --- a/novelwriter/assets/themes/b2t_garden_dark.conf +++ b/novelwriter/assets/themes/b2t_garden_dark.conf @@ -1,10 +1,9 @@ [Main] -name = B2T Garden Dark -mode = dark -description = Garden Dark -author = Myian -credit = Bram de Haan -url = https://base2t.one/demo/garden/ +name = B2T Garden Dark +mode = dark +author = Myian +credit = Bram de Haan +url = https://base2t.one/demo/garden/ [Base] base = #2b2c2a @@ -73,4 +72,4 @@ spellcheckline = #ff6f65 errorline = green replacetag = #dd843c modifier = faded -texthighlight = green:80 \ No newline at end of file +texthighlight = green:80 diff --git a/novelwriter/assets/themes/b2t_garden_light.conf b/novelwriter/assets/themes/b2t_garden_light.conf index 6d3172bd..5903a761 100644 --- a/novelwriter/assets/themes/b2t_garden_light.conf +++ b/novelwriter/assets/themes/b2t_garden_light.conf @@ -1,10 +1,9 @@ [Main] -name = B2T Garden Light -mode = light -description = Garden Light -author = Myian -credit = Bram de Haan -url = https://base2t.one/demo/garden/ +name = B2T Garden Light +mode = light +author = Myian +credit = Bram de Haan +url = https://base2t.one/demo/garden/ [Base] base = #fbfaf8 @@ -73,4 +72,4 @@ spellcheckline = red errorline = green replacetag = #d97726 modifier = faded -texthighlight = green:80 \ No newline at end of file +texthighlight = green:80 diff --git a/novelwriter/assets/themes/b2t_suburb_dark.conf b/novelwriter/assets/themes/b2t_suburb_dark.conf index a088ecef..854808ca 100644 --- a/novelwriter/assets/themes/b2t_suburb_dark.conf +++ b/novelwriter/assets/themes/b2t_suburb_dark.conf @@ -1,10 +1,9 @@ [Main] -name = B2T Suburb Dark -mode = dark -description = Suburb Dark -author = Myian -credit = Bram de Haan -url = https://base2t.one/demo/suburb/ +name = B2T Suburb Dark +mode = dark +author = Myian +credit = Bram de Haan +url = https://base2t.one/demo/suburb/ [Base] base = #25293d @@ -73,4 +72,4 @@ spellcheckline = #ff3b3b errorline = #7083ff replacetag = blue modifier = faded -texthighlight = red:72 \ No newline at end of file +texthighlight = red:72 diff --git a/novelwriter/assets/themes/b2t_suburb_light.conf b/novelwriter/assets/themes/b2t_suburb_light.conf index 429994df..f31c8c29 100644 --- a/novelwriter/assets/themes/b2t_suburb_light.conf +++ b/novelwriter/assets/themes/b2t_suburb_light.conf @@ -1,10 +1,9 @@ [Main] -name = B2T Suburb Light -mode = light -description = Suburb Light -author = Myian -credit = Bram de Haan -url = https://base2t.one/demo/suburb/ +name = B2T Suburb Light +mode = light +author = Myian +credit = Bram de Haan +url = https://base2t.one/demo/suburb/ [Base] base = #fbf9fa @@ -73,4 +72,4 @@ spellcheckline = #ff0000 errorline = cyan replacetag = blue modifier = faded -texthighlight = #f25a9944 \ No newline at end of file +texthighlight = #f25a9944 diff --git a/novelwriter/assets/themes/b4t_classic_o_dark.conf b/novelwriter/assets/themes/b4t_classic_o_dark.conf index 5c664a5b..b9d8fa8b 100644 --- a/novelwriter/assets/themes/b4t_classic_o_dark.conf +++ b/novelwriter/assets/themes/b4t_classic_o_dark.conf @@ -1,10 +1,9 @@ [Main] -name = B4T Classic-O Dark -mode = dark -description = Classic-O Dark -author = Myian -credit = Bram de Haan -url = https://atelierbram.github.io/Base4Tone-prism/b4t_classic-o/dark/ +name = B4T Classic-O Dark +mode = dark +author = Myian +credit = Bram de Haan +url = https://atelierbram.github.io/Base4Tone-prism/b4t_classic-o/dark/ [Base] base = #22272f diff --git a/novelwriter/assets/themes/b4t_classic_o_light.conf b/novelwriter/assets/themes/b4t_classic_o_light.conf index b7d7643d..1619cafd 100644 --- a/novelwriter/assets/themes/b4t_classic_o_light.conf +++ b/novelwriter/assets/themes/b4t_classic_o_light.conf @@ -1,10 +1,9 @@ [Main] -name = B4T Classic-O Light -mode = light -description = Classic-O Light -author = Myian -credit = Bram de Haan -url = https://atelierbram.github.io/Base4Tone-prism/b4t_classic-o/light/ +name = B4T Classic-O Light +mode = light +author = Myian +credit = Bram de Haan +url = https://atelierbram.github.io/Base4Tone-prism/b4t_classic-o/light/ [Base] base = #f6f7f9 diff --git a/novelwriter/assets/themes/b4t_modern_c_dark.conf b/novelwriter/assets/themes/b4t_modern_c_dark.conf index 4300da41..75fdf78a 100644 --- a/novelwriter/assets/themes/b4t_modern_c_dark.conf +++ b/novelwriter/assets/themes/b4t_modern_c_dark.conf @@ -1,10 +1,9 @@ [Main] -name = B4T Modern-C Dark -mode = dark -description = Modern-C Dark -author = Myian -credit = Bram de Haan -url = https://atelierbram.github.io/Base4Tone-prism/b4t_modern-c/dark/ +name = B4T Modern-C Dark +mode = dark +author = Myian +credit = Bram de Haan +url = https://atelierbram.github.io/Base4Tone-prism/b4t_modern-c/dark/ [Base] base = #25262c diff --git a/novelwriter/assets/themes/b4t_modern_c_light.conf b/novelwriter/assets/themes/b4t_modern_c_light.conf index ef4c23f5..41b1ac27 100644 --- a/novelwriter/assets/themes/b4t_modern_c_light.conf +++ b/novelwriter/assets/themes/b4t_modern_c_light.conf @@ -1,10 +1,9 @@ [Main] -name = B4T Modern-C Light -mode = light -description = Modern-C Light -author = Myian -credit = Bram de Haan -url = https://atelierbram.github.io/Base4Tone-prism/b4t_modern-c/light/ +name = B4T Modern-C Light +mode = light +author = Myian +credit = Bram de Haan +url = https://atelierbram.github.io/Base4Tone-prism/b4t_modern-c/light/ [Base] base = #f6f6f9 @@ -73,4 +72,4 @@ spellcheckline = red errorline = blue replacetag = blue modifier = #354ddd -texthighlight = blue:64 \ No newline at end of file +texthighlight = blue:64 diff --git a/novelwriter/assets/themes/blue_streak_dark.conf b/novelwriter/assets/themes/blue_streak_dark.conf index c8dbf177..49d19c42 100644 --- a/novelwriter/assets/themes/blue_streak_dark.conf +++ b/novelwriter/assets/themes/blue_streak_dark.conf @@ -1,10 +1,9 @@ [Main] -name = Blue Streak Dark -mode = dark -description = A theme mainly using shades of blue -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter +name = Blue Streak Dark +mode = dark +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter [Base] base = #2d2d2d diff --git a/novelwriter/assets/themes/blue_streak_light.conf b/novelwriter/assets/themes/blue_streak_light.conf index 906ab71e..9f52d1a6 100644 --- a/novelwriter/assets/themes/blue_streak_light.conf +++ b/novelwriter/assets/themes/blue_streak_light.conf @@ -1,10 +1,9 @@ [Main] -name = Blue Streak Light -mode = light -description = A theme mainly using shades of blue -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter +name = Blue Streak Light +mode = light +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter [Base] base = #fcfcfc diff --git a/novelwriter/assets/themes/castle_day.conf b/novelwriter/assets/themes/castle_day.conf index a7948592..b3755640 100644 --- a/novelwriter/assets/themes/castle_day.conf +++ b/novelwriter/assets/themes/castle_day.conf @@ -1,8 +1,7 @@ [Main] -name = Castle by Day -mode = light -description = Castle Day -author = Myian +name = Castle by Day +mode = light +author = Myian [Base] base = #f3eeec diff --git a/novelwriter/assets/themes/castle_night.conf b/novelwriter/assets/themes/castle_night.conf index 8fd8a963..c4245236 100644 --- a/novelwriter/assets/themes/castle_night.conf +++ b/novelwriter/assets/themes/castle_night.conf @@ -1,8 +1,7 @@ [Main] -name = Castle by Night -mode = dark -description = Castle Night -author = Myian +name = Castle by Night +mode = dark +author = Myian [Base] base = #1c1f28 diff --git a/novelwriter/assets/themes/chalky_soil.conf b/novelwriter/assets/themes/chalky_soil.conf index 19b8dc6a..bf41868b 100644 --- a/novelwriter/assets/themes/chalky_soil.conf +++ b/novelwriter/assets/themes/chalky_soil.conf @@ -1,8 +1,7 @@ [Main] -name = Chalky Soil -mode = light -description = Chalky -author = Myian +name = Chalky Soil +mode = light +author = Myian [Base] base = #f0f0f0 diff --git a/novelwriter/assets/themes/chernozem.conf b/novelwriter/assets/themes/chernozem.conf index 10847dd3..a39cc684 100644 --- a/novelwriter/assets/themes/chernozem.conf +++ b/novelwriter/assets/themes/chernozem.conf @@ -1,8 +1,7 @@ [Main] -name = Chernozem -mode = dark -description = Chernozem -author = Myian +name = Chernozem +mode = dark +author = Myian [Base] base = #2c2525 diff --git a/novelwriter/assets/themes/cyberpunk_night.conf b/novelwriter/assets/themes/cyberpunk_night.conf index 3643888f..d433dabe 100644 --- a/novelwriter/assets/themes/cyberpunk_night.conf +++ b/novelwriter/assets/themes/cyberpunk_night.conf @@ -1,9 +1,8 @@ [Main] -name = Cyberpunk Night -mode = dark -description = A taste of the future 80s -author = Anders Lemvigh -url = https://github.com/alemvigh +name = Cyberpunk Night +mode = dark +author = Anders Lemvigh +url = https://github.com/alemvigh [Base] base = #000000 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 75b2843f..90c1a411 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -1,10 +1,9 @@ [Main] -name = Default Dark Theme -mode = dark -description = The novelWriter standard dark theme -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter +name = Default Dark Theme +mode = dark +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter [Base] base = #373737 diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index 744f90e3..1424db8d 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -1,10 +1,9 @@ [Main] -name = Default Light Theme -mode = light -description = The novelWriter standard light theme -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter +name = Default Light Theme +mode = light +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter [Base] base = #fcfcfc diff --git a/novelwriter/assets/themes/dracula.conf b/novelwriter/assets/themes/dracula.conf index 25fe36ca..04fe9949 100644 --- a/novelwriter/assets/themes/dracula.conf +++ b/novelwriter/assets/themes/dracula.conf @@ -1,10 +1,9 @@ [Main] -name = Dracula -mode = dark -description = A dark theme with bright colours -author = Veronica Berglyd Olsen (adaptation) -credit = Zeno Rocha -url = https://draculatheme.com +name = Dracula +mode = dark +author = Veronica Berglyd Olsen (adaptation) +credit = Zeno Rocha +url = https://draculatheme.com ## # Colours: diff --git a/novelwriter/assets/themes/espresso.conf b/novelwriter/assets/themes/espresso.conf index 74ff4b33..3d222896 100644 --- a/novelwriter/assets/themes/espresso.conf +++ b/novelwriter/assets/themes/espresso.conf @@ -1,10 +1,9 @@ [Main] -name = Espresso -mode = dark -description = High contrast & vivid color scheme based on Monokai Pro -author = Veronica Berglyd Olsen -credit = Sainnhe Park and Antoine Cotten -url = https://github.com/sainnhe/sonokai +name = Espresso +mode = dark +author = Veronica Berglyd Olsen +credit = Sainnhe Park and Antoine Cotten +url = https://github.com/sainnhe/sonokai [Base] base = #2f2726 diff --git a/novelwriter/assets/themes/everforest_dark.conf b/novelwriter/assets/themes/everforest_dark.conf index 8de92d38..ff10cf93 100644 --- a/novelwriter/assets/themes/everforest_dark.conf +++ b/novelwriter/assets/themes/everforest_dark.conf @@ -1,10 +1,9 @@ [Main] -name = Everforest Dark -mode = dark -description = Everforest -author = Myian -credit = Sainnhe Park -url = https://github.com/sainnhe/everforest +name = Everforest Dark +mode = dark +author = Myian +credit = Sainnhe Park +url = https://github.com/sainnhe/everforest [Base] base = #272e33 diff --git a/novelwriter/assets/themes/everforest_light.conf b/novelwriter/assets/themes/everforest_light.conf index f6219327..901379ed 100644 --- a/novelwriter/assets/themes/everforest_light.conf +++ b/novelwriter/assets/themes/everforest_light.conf @@ -1,10 +1,9 @@ [Main] -name = Everforest Light -mode = light -description = Everforest -author = Myian -credit = Sainnhe Park -url = https://github.com/sainnhe/everforest +name = Everforest Light +mode = light +author = Myian +credit = Sainnhe Park +url = https://github.com/sainnhe/everforest [Base] base = #fffbef diff --git a/novelwriter/assets/themes/floral_daydream.conf b/novelwriter/assets/themes/floral_daydream.conf index 97c71ec3..c6bcfd6b 100644 --- a/novelwriter/assets/themes/floral_daydream.conf +++ b/novelwriter/assets/themes/floral_daydream.conf @@ -1,8 +1,7 @@ [Main] -name = Floral Daydream -mode = light -description = Floral -author = Myian +name = Floral Daydream +mode = light +author = Myian [Base] base = #fff4f7 diff --git a/novelwriter/assets/themes/floral_midnight.conf b/novelwriter/assets/themes/floral_midnight.conf index 8dc48dbe..305f8e7e 100644 --- a/novelwriter/assets/themes/floral_midnight.conf +++ b/novelwriter/assets/themes/floral_midnight.conf @@ -1,8 +1,7 @@ [Main] -name = Floral Midnight -mode = dark -description = Floral -author = Myian +name = Floral Midnight +mode = dark +author = Myian [Base] base = #1e1e31 diff --git a/novelwriter/assets/themes/full_moon.conf b/novelwriter/assets/themes/full_moon.conf index 25e9678c..d6d52f46 100644 --- a/novelwriter/assets/themes/full_moon.conf +++ b/novelwriter/assets/themes/full_moon.conf @@ -1,8 +1,7 @@ [Main] -name = Full Moon -mode = light -description = New Moon Light -author = Myian +name = Full Moon +mode = light +author = Myian [Base] base = #ffffff @@ -72,4 +71,4 @@ spellcheckline = #f73c3f errorline = cyan replacetag = purple modifier = green -texthighlight = blue:80 \ No newline at end of file +texthighlight = blue:80 diff --git a/novelwriter/assets/themes/grey_dark.conf b/novelwriter/assets/themes/grey_dark.conf index 44f94e14..665c7a1f 100644 --- a/novelwriter/assets/themes/grey_dark.conf +++ b/novelwriter/assets/themes/grey_dark.conf @@ -1,10 +1,9 @@ [Main] -name = Grey Dark -mode = dark -description = A theme with minimal colours -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter +name = Grey Dark +mode = dark +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter [Base] base = #3e3e3e diff --git a/novelwriter/assets/themes/grey_light.conf b/novelwriter/assets/themes/grey_light.conf index 3e4d3e86..2106e5bf 100644 --- a/novelwriter/assets/themes/grey_light.conf +++ b/novelwriter/assets/themes/grey_light.conf @@ -1,10 +1,9 @@ [Main] -name = Grey Light -mode = light -description = A theme with minimal colours -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter +name = Grey Light +mode = light +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter [Base] base = #ffffff diff --git a/novelwriter/assets/themes/lcars.conf b/novelwriter/assets/themes/lcars.conf index 94255255..ee553602 100644 --- a/novelwriter/assets/themes/lcars.conf +++ b/novelwriter/assets/themes/lcars.conf @@ -1,10 +1,9 @@ [Main] -name = LCARS -mode = dark -description = The Next Generation of Star Trek colours -author = Veronica Berglyd Olsen -credit = Star Trek TNG -url = https://github.com/vkbo/novelWriter +name = LCARS +mode = dark +author = Veronica Berglyd Olsen +credit = Star Trek TNG +url = https://github.com/vkbo/novelWriter [Base] base = #101010 diff --git a/novelwriter/assets/themes/light_owl.conf b/novelwriter/assets/themes/light_owl.conf index 24b676e1..6a43afc0 100644 --- a/novelwriter/assets/themes/light_owl.conf +++ b/novelwriter/assets/themes/light_owl.conf @@ -1,10 +1,9 @@ [Main] -name = Light Owl -mode = light -description = A theme for the night owls out there, but for daylight -author = Veronica Berglyd Olsen -credit = Sarah Drasner -url = https://github.com/sdras/night-owl-vscode-theme +name = Light Owl +mode = light +author = Veronica Berglyd Olsen +credit = Sarah Drasner +url = https://github.com/sdras/night-owl-vscode-theme ## # Theme: Light Owl diff --git a/novelwriter/assets/themes/new_moon.conf b/novelwriter/assets/themes/new_moon.conf index 39656db7..099c8c2f 100644 --- a/novelwriter/assets/themes/new_moon.conf +++ b/novelwriter/assets/themes/new_moon.conf @@ -1,10 +1,9 @@ [Main] -name = New Moon -mode = dark -description = New moon -author = Myian -credit = Tania Rascia -url = https://github.com/taniarascia/new-moon +name = New Moon +mode = dark +author = Myian +credit = Tania Rascia +url = https://github.com/taniarascia/new-moon [Base] base = #2d2d2d @@ -73,4 +72,4 @@ spellcheckline = #ff6265 errorline = green replacetag = purple modifier = green -texthighlight = blue:80 \ No newline at end of file +texthighlight = blue:80 diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf index b42ea489..716f7eb8 100644 --- a/novelwriter/assets/themes/night_owl.conf +++ b/novelwriter/assets/themes/night_owl.conf @@ -1,10 +1,9 @@ [Main] -name = Night Owl -mode = dark -description = A theme for the night owls out there -author = Veronica Berglyd Olsen -credit = Sarah Drasner -url = https://github.com/sdras/night-owl-vscode-theme +name = Night Owl +mode = dark +author = Veronica Berglyd Olsen +credit = Sarah Drasner +url = https://github.com/sdras/night-owl-vscode-theme ## # Theme: Night Owl diff --git a/novelwriter/assets/themes/noctis.conf b/novelwriter/assets/themes/noctis.conf index 35820118..235bb5dc 100644 --- a/novelwriter/assets/themes/noctis.conf +++ b/novelwriter/assets/themes/noctis.conf @@ -1,10 +1,9 @@ [Main] -name = Noctis -mode = dark -description = A dark theme with a well balanced blend of warm and cold medium contrast colors -author = Veronica Berglyd Olsen -credit = Liviu Schera, and contributors -url = https://github.com/liviuschera/noctis +name = Noctis +mode = dark +author = Veronica Berglyd Olsen +credit = Liviu Schera, and contributors +url = https://github.com/liviuschera/noctis ## # Noctis Lux : themes/noctis.json diff --git a/novelwriter/assets/themes/noctis_lux.conf b/novelwriter/assets/themes/noctis_lux.conf index ddf34244..fa37b293 100644 --- a/novelwriter/assets/themes/noctis_lux.conf +++ b/novelwriter/assets/themes/noctis_lux.conf @@ -1,10 +1,9 @@ [Main] -name = Noctis Lux -mode = light -description = A light theme with a well balanced blend of warm and cold medium contrast colors -author = Veronica Berglyd Olsen -credit = Liviu Schera, and contributors -url = https://github.com/liviuschera/noctis +name = Noctis Lux +mode = light +author = Veronica Berglyd Olsen +credit = Liviu Schera, and contributors +url = https://github.com/liviuschera/noctis ## # Noctis Lux : themes/lux.json diff --git a/novelwriter/assets/themes/nord.conf b/novelwriter/assets/themes/nord.conf index be9d956a..e2a2faf9 100644 --- a/novelwriter/assets/themes/nord.conf +++ b/novelwriter/assets/themes/nord.conf @@ -1,10 +1,9 @@ [Main] -name = Nord -mode = dark -description = Nord -author = Myian -credit = Sven Greb -url = https://github.com/nordtheme/nord +name = Nord +mode = dark +author = Myian +credit = Sven Greb +url = https://github.com/nordtheme/nord [Base] base = #2e3440 diff --git a/novelwriter/assets/themes/nordlicht.conf b/novelwriter/assets/themes/nordlicht.conf index 2d78a103..ba32e295 100644 --- a/novelwriter/assets/themes/nordlicht.conf +++ b/novelwriter/assets/themes/nordlicht.conf @@ -1,8 +1,7 @@ [Main] -name = Nordlicht -mode = light -description = Nord -author = Myian +name = Nordlicht +mode = light +author = Myian [Base] base = #ffffff @@ -71,4 +70,4 @@ spellcheckline = #ff3b4f errorline = #58aa51 replacetag = orange modifier = #a16e98 -texthighlight = cyan:64 \ No newline at end of file +texthighlight = cyan:64 diff --git a/novelwriter/assets/themes/primer_light.conf b/novelwriter/assets/themes/primer_light.conf index ecd1d34a..49850873 100644 --- a/novelwriter/assets/themes/primer_light.conf +++ b/novelwriter/assets/themes/primer_light.conf @@ -1,10 +1,9 @@ [Main] -name = Primer Light -mode = light -description = Primer -author = Myian -credit = GitHub Inc. -url = https://github.com/primer +name = Primer Light +mode = light +author = Myian +credit = GitHub Inc. +url = https://github.com/primer [Base] base = #ffffff diff --git a/novelwriter/assets/themes/primer_night.conf b/novelwriter/assets/themes/primer_night.conf index 2496f10d..2b4e4156 100644 --- a/novelwriter/assets/themes/primer_night.conf +++ b/novelwriter/assets/themes/primer_night.conf @@ -1,10 +1,9 @@ [Main] -name = Primer Night -mode = dark -description = Primer -author = Myian -credit = GitHub Inc. -url = https://github.com/primer +name = Primer Night +mode = dark +author = Myian +credit = GitHub Inc. +url = https://github.com/primer [Base] base = #0d1117 diff --git a/novelwriter/assets/themes/ruby_day.conf b/novelwriter/assets/themes/ruby_day.conf index 20891da0..5db7878c 100644 --- a/novelwriter/assets/themes/ruby_day.conf +++ b/novelwriter/assets/themes/ruby_day.conf @@ -1,8 +1,7 @@ [Main] -name = Ruby Day -mode = light -description = Ruby -author = Myian +name = Ruby Day +mode = light +author = Myian [Base] base = #ffeeee diff --git a/novelwriter/assets/themes/ruby_night.conf b/novelwriter/assets/themes/ruby_night.conf index b9fe7486..5f4b47ec 100644 --- a/novelwriter/assets/themes/ruby_night.conf +++ b/novelwriter/assets/themes/ruby_night.conf @@ -1,8 +1,7 @@ [Main] -name = Ruby Night -mode = dark -description = Ruby -author = Myian +name = Ruby Night +mode = dark +author = Myian [Base] base = #18181C @@ -71,4 +70,4 @@ spellcheckline = #ff2727 errorline = cyan replacetag = blue modifier = green -texthighlight = red:80 \ No newline at end of file +texthighlight = red:80 diff --git a/novelwriter/assets/themes/snazzy.conf b/novelwriter/assets/themes/snazzy.conf index 3838eb26..0c36d884 100644 --- a/novelwriter/assets/themes/snazzy.conf +++ b/novelwriter/assets/themes/snazzy.conf @@ -1,10 +1,9 @@ [Main] -name = Snazzy Light -mode = light -description = A vivid light color theme -author = Veronica Berglyd Olsen -credit = Florian Reuschel, Sindre Sorhus -url = https://github.com/loilo/vscode-snazzy-light +name = Snazzy Light +mode = light +author = Veronica Berglyd Olsen +credit = Florian Reuschel, Sindre Sorhus +url = https://github.com/loilo/vscode-snazzy-light ## # Colours: diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf index c328d12b..4c73412f 100644 --- a/novelwriter/assets/themes/solarized_dark.conf +++ b/novelwriter/assets/themes/solarized_dark.conf @@ -1,10 +1,9 @@ [Main] -name = Solarized Dark -mode = dark -description = Precision colors for machines and people -author = nullbasis, Veronica Berglyd Olsen -credit = Ethan Schoonover -url = https://ethanschoonover.com/solarized/ +name = Solarized Dark +mode = dark +author = nullbasis and Veronica Berglyd Olsen +credit = Ethan Schoonover +url = https://ethanschoonover.com/solarized/ ## # base03: #002b36 diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf index dbc20986..61d701b7 100644 --- a/novelwriter/assets/themes/solarized_light.conf +++ b/novelwriter/assets/themes/solarized_light.conf @@ -1,10 +1,9 @@ [Main] -name = Solarized Light -mode = light -description = Precision colors for machines and people -author = nullbasis, Veronica Berglyd Olsen -credit = Ethan Schoonover -url = https://ethanschoonover.com/solarized/ +name = Solarized Light +mode = light +author = nullbasis and Veronica Berglyd Olsen +credit = Ethan Schoonover +url = https://ethanschoonover.com/solarized/ ## # base03: #002b36 diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf index 40f733c4..8661ce27 100644 --- a/novelwriter/assets/themes/tango_dark.conf +++ b/novelwriter/assets/themes/tango_dark.conf @@ -1,10 +1,9 @@ [Main] -name = Tango Dark -mode = dark -description = Colors for everyone -author = Veronica Berglyd Olsen -credit = Tango Desktop Project -url = https://en.wikipedia.org/wiki/Tango_Desktop_Project +name = Tango Dark +mode = dark +author = Veronica Berglyd Olsen +credit = Tango Desktop Project +url = https://en.wikipedia.org/wiki/Tango_Desktop_Project ## # Colours: diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf index 81c34c11..379b0a72 100644 --- a/novelwriter/assets/themes/tango_light.conf +++ b/novelwriter/assets/themes/tango_light.conf @@ -1,10 +1,9 @@ [Main] -name = Tango Light -mode = light -description = Colors for everyone -author = Veronica Berglyd Olsen -credit = Tango Desktop Project -url = https://en.wikipedia.org/wiki/Tango_Desktop_Project +name = Tango Light +mode = light +author = Veronica Berglyd Olsen +credit = Tango Desktop Project +url = https://en.wikipedia.org/wiki/Tango_Desktop_Project ## # Colours: diff --git a/novelwriter/assets/themes/tomorrow.conf b/novelwriter/assets/themes/tomorrow.conf index 97872b2b..15abcd32 100644 --- a/novelwriter/assets/themes/tomorrow.conf +++ b/novelwriter/assets/themes/tomorrow.conf @@ -1,10 +1,9 @@ [Main] -name = Tomorrow -mode = light -description = A colourful theme with muted colours and sensible highlighting -author = Veronica Berglyd Olsen -credit = Chris Kempson -url = https://github.com/chriskempson/tomorrow-theme +name = Tomorrow +mode = light +author = Veronica Berglyd Olsen +credit = Chris Kempson +url = https://github.com/chriskempson/tomorrow-theme ## # Theme: Tomorrow diff --git a/novelwriter/assets/themes/tomorrow_night.conf b/novelwriter/assets/themes/tomorrow_night.conf index 8424a1a3..ac213a76 100644 --- a/novelwriter/assets/themes/tomorrow_night.conf +++ b/novelwriter/assets/themes/tomorrow_night.conf @@ -1,10 +1,9 @@ [Main] -name = Tomorrow Night -mode = dark -description = A colourful theme with muted colours and sensible highlighting -author = Veronica Berglyd Olsen -credit = Chris Kempson -url = https://github.com/chriskempson/tomorrow-theme +name = Tomorrow Night +mode = dark +author = Veronica Berglyd Olsen +credit = Chris Kempson +url = https://github.com/chriskempson/tomorrow-theme ## # Theme: Tomorrow Night diff --git a/novelwriter/assets/themes/tomorrow_night_blue.conf b/novelwriter/assets/themes/tomorrow_night_blue.conf index ab1692c7..05193e6f 100644 --- a/novelwriter/assets/themes/tomorrow_night_blue.conf +++ b/novelwriter/assets/themes/tomorrow_night_blue.conf @@ -1,10 +1,9 @@ [Main] -name = Tomorrow Night Blue -mode = dark -description = A colourful theme with muted colours and sensible highlighting -author = Veronica Berglyd Olsen -credit = Chris Kempson -url = https://github.com/chriskempson/tomorrow-theme +name = Tomorrow Night Blue +mode = dark +author = Veronica Berglyd Olsen +credit = Chris Kempson +url = https://github.com/chriskempson/tomorrow-theme ## # Theme: Tomorrow Night Blue diff --git a/novelwriter/assets/themes/tomorrow_night_bright.conf b/novelwriter/assets/themes/tomorrow_night_bright.conf index 3fd7d44a..514940fa 100644 --- a/novelwriter/assets/themes/tomorrow_night_bright.conf +++ b/novelwriter/assets/themes/tomorrow_night_bright.conf @@ -1,10 +1,9 @@ [Main] -name = Tomorrow Night Bright -mode = dark -description = A colourful theme with muted colours and sensible highlighting -author = Veronica Berglyd Olsen -credit = Chris Kempson -url = https://github.com/chriskempson/tomorrow-theme +name = Tomorrow Night Bright +mode = dark +author = Veronica Berglyd Olsen +credit = Chris Kempson +url = https://github.com/chriskempson/tomorrow-theme ## # Theme: Tomorrow Night Bright diff --git a/novelwriter/assets/themes/tomorrow_night_eighties.conf b/novelwriter/assets/themes/tomorrow_night_eighties.conf index 4a72bcf5..154b6ef4 100644 --- a/novelwriter/assets/themes/tomorrow_night_eighties.conf +++ b/novelwriter/assets/themes/tomorrow_night_eighties.conf @@ -1,10 +1,9 @@ [Main] -name = Tomorrow Night Eighties -mode = dark -description = A colourful theme with muted colours and sensible highlighting -author = Veronica Berglyd Olsen -credit = Chris Kempson -url = https://github.com/chriskempson/tomorrow-theme +name = Tomorrow Night Eighties +mode = dark +author = Veronica Berglyd Olsen +credit = Chris Kempson +url = https://github.com/chriskempson/tomorrow-theme ## # Theme: Tomorrow Night Eighties From 4a0ed710a32faca2e1ed4eb45ea23ba95109b095 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 14 Jul 2025 19:33:35 +0200 Subject: [PATCH 3/3] Update credits and documentation --- CREDITS.md | 18 ++++++++++++++++-- docs/source/more/customise.rst | 15 +++++++-------- novelwriter/assets/text/credits_en.htm | 18 ++++++++++++++++-- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 4c08b186..16d34e1e 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -65,11 +65,17 @@ The following icon themes are bundles with novelWriter: ## Colour Themes -Some colour themes included with novelWriter were adapted from the following sources: +Colour themes included with novelWriter were adapted from the following sources: +* **Aura** theme by Dalton Menezes +* **B2T** themes by Bram de Haan +* **B4T** themes by Bram de Haan * **Dracula** theme by Zeno Rocha * **Espresso** theme by Sainnhe Park and Antoine Cotten -* **Noctis** themes by Liviu Schera, and contributors +* **Everforest** themes by Sainnhe Park +* **New Moon** theme by Tania Rascia +* **Noctis** themes by Liviu Schera and contributors +* **Nord** theme by Sven Greb * **Owl** themes by Sarah Drasner * **Primer** themes by GitHub Inc and Myian * **Snazzy Light** theme by Florian Reuschel @@ -79,9 +85,17 @@ Some colour themes included with novelWriter were adapted from the following sou Other themes were created for novelWriter: +* **Aura** theme variations by Myian * **Blue Streak** themes by Veronica Berglyd Olsen +* **Castle** themes by Myian +* **Chalky Soil** theme by Myian +* **Chernozem** theme by Myian * **Cyberpunk Night** theme by Anders Lemvigh +* **Floral** themes by Myian +* **Full Moon** theme by Myian * **LCARS** theme by Veronica Berglyd Olsen +* **Nordlicht** theme by Myian +* **Ruby** themes by Myian ## Fonts diff --git a/docs/source/more/customise.rst b/docs/source/more/customise.rst index dea685b5..b871bf09 100644 --- a/docs/source/more/customise.rst +++ b/docs/source/more/customise.rst @@ -49,12 +49,11 @@ A colour theme ``.conf`` file consists of the following settings: :caption: The theme file for the "Default Light Theme" [Main] - name = Default Light Theme - mode = light - description = The novelWriter standard light theme - author = Veronica Berglyd Olsen - credit = Veronica Berglyd Olsen - url = https://github.com/vkbo/novelWriter + name = Default Light Theme + mode = light + author = Veronica Berglyd Olsen + credit = Veronica Berglyd Olsen + url = https://github.com/vkbo/novelWriter [Base] base = #fcfcfc @@ -175,8 +174,8 @@ There are several ways to enter colour values: .. versionadded:: 2.8 The ``[Syntax]`` section was moved into the main theme file. Previously, these settings were in their own file. The ``[Icons]`` section was renamed to ``[Base]``. Added the ``line`` setting. - Dropped the ``license`` and ``licenseurl`` settings. The ``description`` and ``author`` fields - are now required if the theme is included in the app, but not for user themes. + Dropped the ``license``, ``licenseurl``, and ``description`` settings. The ``author`` field + is now required if the theme is included in the app, but not for user themes. Icon Themes diff --git a/novelwriter/assets/text/credits_en.htm b/novelwriter/assets/text/credits_en.htm index c8d868a9..fb3ceaaf 100644 --- a/novelwriter/assets/text/credits_en.htm +++ b/novelwriter/assets/text/credits_en.htm @@ -79,12 +79,18 @@ more contributions are listed on the project's Members page.

Colour Themes

-

Some colour themes included with novelWriter were adapted from the following sources:

+

Colour themes included with novelWriter were adapted from the following sources: