diff --git a/docs/source/more/customise.rst b/docs/source/more/customise.rst index 89a74ba0..ba016d30 100644 --- a/docs/source/more/customise.rst +++ b/docs/source/more/customise.rst @@ -109,6 +109,7 @@ A colour theme ``.conf`` file consists of the following settings: headertext = green headertag = green:L135 emphasis = orange + whitespace = orange:64 dialog = blue altdialog = red note = yellow:D125 @@ -173,9 +174,10 @@ 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``, ``licenseurl``, and ``description`` settings. The ``author`` field - is now required if the theme is included in the app, but not for user themes. + their own file. The ``[Icons]`` section was renamed to ``[Base]``. Added the ``line`` and + ``whitespace`` settings. 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/themes/aura.conf b/novelwriter/assets/themes/aura.conf index a31ac7ba..97ba7908 100644 --- a/novelwriter/assets/themes/aura.conf +++ b/novelwriter/assets/themes/aura.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = purple:L105 +whitespace = purple:64 dialog = cyan altdialog = blue note = yellow diff --git a/novelwriter/assets/themes/aura_bright.conf b/novelwriter/assets/themes/aura_bright.conf index 651e452c..47bc7854 100644 --- a/novelwriter/assets/themes/aura_bright.conf +++ b/novelwriter/assets/themes/aura_bright.conf @@ -57,6 +57,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = purple +whitespace = purple:64 dialog = cyan:D105 altdialog = blue note = yellow diff --git a/novelwriter/assets/themes/aura_soft.conf b/novelwriter/assets/themes/aura_soft.conf index f8d58f70..1dafbc49 100644 --- a/novelwriter/assets/themes/aura_soft.conf +++ b/novelwriter/assets/themes/aura_soft.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = #a581ec +whitespace = #a581ec64 dialog = cyan altdialog = blue note = yellow diff --git a/novelwriter/assets/themes/b2t_garden_dark.conf b/novelwriter/assets/themes/b2t_garden_dark.conf index f5ecceba..cfaaa37e 100644 --- a/novelwriter/assets/themes/b2t_garden_dark.conf +++ b/novelwriter/assets/themes/b2t_garden_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = #fbfaf8 headertag = #828782 emphasis = #3fac39 +whitespace = #3fac3964 dialog = #90d98c altdialog = #4cb946 note = #dd843c diff --git a/novelwriter/assets/themes/b2t_garden_light.conf b/novelwriter/assets/themes/b2t_garden_light.conf index ac2287b7..d15c2e35 100644 --- a/novelwriter/assets/themes/b2t_garden_light.conf +++ b/novelwriter/assets/themes/b2t_garden_light.conf @@ -59,6 +59,7 @@ link = blue headertext = #2b2c2a headertag = #828782 emphasis = #4cb946 +whitespace = #4cb94664 dialog = #1c8217 altdialog = #3fac39 note = #d97726 diff --git a/novelwriter/assets/themes/b2t_suburb_dark.conf b/novelwriter/assets/themes/b2t_suburb_dark.conf index 854808ca..56c3768d 100644 --- a/novelwriter/assets/themes/b2t_suburb_dark.conf +++ b/novelwriter/assets/themes/b2t_suburb_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = red headertag = red:128 emphasis = #ffffff +whitespace = #ffffff64 dialog = #fe81b5 altdialog = #ffb3d2 note = #a0acfe diff --git a/novelwriter/assets/themes/b2t_suburb_light.conf b/novelwriter/assets/themes/b2t_suburb_light.conf index f31c8c29..8b728e6a 100644 --- a/novelwriter/assets/themes/b2t_suburb_light.conf +++ b/novelwriter/assets/themes/b2t_suburb_light.conf @@ -59,6 +59,7 @@ link = blue headertext = red headertag = red:128 emphasis = #1e202f +whitespace = #1e202f64 dialog = red altdialog = #fb6fa9 note = blue diff --git a/novelwriter/assets/themes/b4t_classic_o_dark.conf b/novelwriter/assets/themes/b4t_classic_o_dark.conf index ce775630..ca8a2b8b 100644 --- a/novelwriter/assets/themes/b4t_classic_o_dark.conf +++ b/novelwriter/assets/themes/b4t_classic_o_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = #5fe2d1 +whitespace = #5fe2d164 dialog = #87B4FC altdialog = #5A96F6 note = #d19af4 diff --git a/novelwriter/assets/themes/b4t_classic_o_light.conf b/novelwriter/assets/themes/b4t_classic_o_light.conf index 0f9c94a1..829e3a4d 100644 --- a/novelwriter/assets/themes/b4t_classic_o_light.conf +++ b/novelwriter/assets/themes/b4t_classic_o_light.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = #008976 +whitespace = #00897664 dialog = #1a68e5 altdialog = #1249a0 note = #c17eed diff --git a/novelwriter/assets/themes/b4t_modern_c_dark.conf b/novelwriter/assets/themes/b4t_modern_c_dark.conf index e348fbef..080a859f 100644 --- a/novelwriter/assets/themes/b4t_modern_c_dark.conf +++ b/novelwriter/assets/themes/b4t_modern_c_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = red headertag = red:128 emphasis = #f391b6 +whitespace = #f391b664 dialog = yellow altdialog = #e86296 note = #929ff7 diff --git a/novelwriter/assets/themes/b4t_modern_c_light.conf b/novelwriter/assets/themes/b4t_modern_c_light.conf index b881167f..cc6468fe 100644 --- a/novelwriter/assets/themes/b4t_modern_c_light.conf +++ b/novelwriter/assets/themes/b4t_modern_c_light.conf @@ -59,6 +59,7 @@ link = blue headertext = red headertag = red:128 emphasis = #d53874 +whitespace = #d5387464 dialog = #9f6303 altdialog = #e86296 note = blue diff --git a/novelwriter/assets/themes/blue_streak_dark.conf b/novelwriter/assets/themes/blue_streak_dark.conf index 49d19c42..aad8acc0 100644 --- a/novelwriter/assets/themes/blue_streak_dark.conf +++ b/novelwriter/assets/themes/blue_streak_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = blue headertag = blue:D150 emphasis = blue:L150 +whitespace = blue:64 dialog = blue altdialog = blue:L150 note = blue:L150 diff --git a/novelwriter/assets/themes/blue_streak_light.conf b/novelwriter/assets/themes/blue_streak_light.conf index 9f52d1a6..3d9ff76b 100644 --- a/novelwriter/assets/themes/blue_streak_light.conf +++ b/novelwriter/assets/themes/blue_streak_light.conf @@ -59,6 +59,7 @@ link = blue headertext = blue headertag = blue:D150 emphasis = blue:L125 +whitespace = blue:64 dialog = blue altdialog = blue:L125 note = blue:L125 diff --git a/novelwriter/assets/themes/castle_day.conf b/novelwriter/assets/themes/castle_day.conf index ab57dcd8..bd5dbdd0 100644 --- a/novelwriter/assets/themes/castle_day.conf +++ b/novelwriter/assets/themes/castle_day.conf @@ -57,6 +57,7 @@ link = blue headertext = yellow headertag = yellow:160 emphasis = #aa791e +whitespace = #aa791e64 dialog = green:D110 altdialog = #378b8b note = faded diff --git a/novelwriter/assets/themes/castle_night.conf b/novelwriter/assets/themes/castle_night.conf index c4245236..c7eb49c1 100644 --- a/novelwriter/assets/themes/castle_night.conf +++ b/novelwriter/assets/themes/castle_night.conf @@ -57,6 +57,7 @@ link = blue headertext = yellow headertag = yellow:160 emphasis = yellow +whitespace = yellow:64 dialog = green altdialog = cyan note = faded diff --git a/novelwriter/assets/themes/chalky_soil.conf b/novelwriter/assets/themes/chalky_soil.conf index 5e90b992..7f52150b 100644 --- a/novelwriter/assets/themes/chalky_soil.conf +++ b/novelwriter/assets/themes/chalky_soil.conf @@ -57,6 +57,7 @@ link = blue headertext = red headertag = red:128 emphasis = #488843 +whitespace = #48884364 dialog = #b95a00 altdialog = #b18010 note = faded diff --git a/novelwriter/assets/themes/chernozem.conf b/novelwriter/assets/themes/chernozem.conf index 56f80f66..93b1b258 100644 --- a/novelwriter/assets/themes/chernozem.conf +++ b/novelwriter/assets/themes/chernozem.conf @@ -57,6 +57,7 @@ link = blue headertext = red headertag = red:128 emphasis = #85c47f +whitespace = #85c47f64 dialog = orange altdialog = yellow note = faded diff --git a/novelwriter/assets/themes/cyberpunk_night.conf b/novelwriter/assets/themes/cyberpunk_night.conf index d433dabe..55641eae 100644 --- a/novelwriter/assets/themes/cyberpunk_night.conf +++ b/novelwriter/assets/themes/cyberpunk_night.conf @@ -58,6 +58,7 @@ link = blue headertext = #ffffff headertag = purple emphasis = cyan +whitespace = cyan:64 dialog = green altdialog = #008cff note = #969696 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 1f7359bb..985e7595 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = green headertag = green:D150 emphasis = orange +whitespace = orange:64 dialog = blue altdialog = red note = yellow diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index da7784f5..f141bd71 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -59,6 +59,7 @@ link = blue headertext = green headertag = green:L135 emphasis = orange +whitespace = orange:64 dialog = blue altdialog = red note = yellow:D125 diff --git a/novelwriter/assets/themes/dracula.conf b/novelwriter/assets/themes/dracula.conf index 04fe9949..f10c9484 100644 --- a/novelwriter/assets/themes/dracula.conf +++ b/novelwriter/assets/themes/dracula.conf @@ -75,6 +75,7 @@ link = #ff79c6 headertext = purple headertag = purple:D150 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = #ffcce9 diff --git a/novelwriter/assets/themes/espresso.conf b/novelwriter/assets/themes/espresso.conf index 3d222896..85c4d168 100644 --- a/novelwriter/assets/themes/espresso.conf +++ b/novelwriter/assets/themes/espresso.conf @@ -59,6 +59,7 @@ link = blue headertext = yellow:L125 headertag = faded emphasis = orange +whitespace = orange:64 dialog = yellow altdialog = orange note = yellow:L125 diff --git a/novelwriter/assets/themes/everforest_dark.conf b/novelwriter/assets/themes/everforest_dark.conf index ff10cf93..b6f7d962 100644 --- a/novelwriter/assets/themes/everforest_dark.conf +++ b/novelwriter/assets/themes/everforest_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = blue +whitespace = blue:64 dialog = green altdialog = cyan note = purple diff --git a/novelwriter/assets/themes/everforest_light.conf b/novelwriter/assets/themes/everforest_light.conf index 901379ed..988e2f93 100644 --- a/novelwriter/assets/themes/everforest_light.conf +++ b/novelwriter/assets/themes/everforest_light.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = blue +whitespace = blue:64 dialog = green altdialog = cyan note = purple diff --git a/novelwriter/assets/themes/floral_daydream.conf b/novelwriter/assets/themes/floral_daydream.conf index ecee703f..5c0b7bb7 100644 --- a/novelwriter/assets/themes/floral_daydream.conf +++ b/novelwriter/assets/themes/floral_daydream.conf @@ -57,6 +57,7 @@ link = #4781d8 headertext = #4781d8 headertag = #4781d880 emphasis = #8152b8 +whitespace = #8152b864 dialog = #eb4073 altdialog = #4781d8 note = #31924c diff --git a/novelwriter/assets/themes/floral_midnight.conf b/novelwriter/assets/themes/floral_midnight.conf index c05bb27d..eaa88fde 100644 --- a/novelwriter/assets/themes/floral_midnight.conf +++ b/novelwriter/assets/themes/floral_midnight.conf @@ -57,6 +57,7 @@ link = blue headertext = blue headertag = blue:128 emphasis = #ff9dd9 +whitespace = #ff9dd964 dialog = #d19df3 altdialog = blue note = #65ca80 diff --git a/novelwriter/assets/themes/full_moon.conf b/novelwriter/assets/themes/full_moon.conf index c6e2c864..6bb73de9 100644 --- a/novelwriter/assets/themes/full_moon.conf +++ b/novelwriter/assets/themes/full_moon.conf @@ -57,6 +57,7 @@ link = blue headertext = purple headertag = purple:128 emphasis = blue +whitespace = blue:64 dialog = #0e2a35 altdialog = cyan note = green diff --git a/novelwriter/assets/themes/grey_dark.conf b/novelwriter/assets/themes/grey_dark.conf index 665c7a1f..8bb0d1f2 100644 --- a/novelwriter/assets/themes/grey_dark.conf +++ b/novelwriter/assets/themes/grey_dark.conf @@ -59,6 +59,7 @@ link = default headertext = default:L115 headertag = default:D125 emphasis = default +whitespace = default:64 dialog = default altdialog = default note = default diff --git a/novelwriter/assets/themes/grey_light.conf b/novelwriter/assets/themes/grey_light.conf index 2106e5bf..35e7be54 100644 --- a/novelwriter/assets/themes/grey_light.conf +++ b/novelwriter/assets/themes/grey_light.conf @@ -59,6 +59,7 @@ link = default headertext = default:D200 headertag = default:L400 emphasis = default +whitespace = default:64 dialog = default altdialog = default note = default diff --git a/novelwriter/assets/themes/horizon_dark.conf b/novelwriter/assets/themes/horizon_dark.conf index 085e8c6d..6e446db2 100644 --- a/novelwriter/assets/themes/horizon_dark.conf +++ b/novelwriter/assets/themes/horizon_dark.conf @@ -59,6 +59,7 @@ link = blue headertext = red headertag = red:128 emphasis = yellow +whitespace = yellow:64 dialog = orange altdialog = red note = blue diff --git a/novelwriter/assets/themes/horizon_light.conf b/novelwriter/assets/themes/horizon_light.conf index cee0a7f1..50bd40bd 100644 --- a/novelwriter/assets/themes/horizon_light.conf +++ b/novelwriter/assets/themes/horizon_light.conf @@ -59,6 +59,7 @@ link = blue headertext = red headertag = red:128 emphasis = #f6661e +whitespace = #f6661e64 dialog = orange altdialog = red note = blue diff --git a/novelwriter/assets/themes/lcars.conf b/novelwriter/assets/themes/lcars.conf index ee553602..6d5956f6 100644 --- a/novelwriter/assets/themes/lcars.conf +++ b/novelwriter/assets/themes/lcars.conf @@ -59,6 +59,7 @@ link = purple headertext = orange headertag = red emphasis = orange +whitespace = orange:64 dialog = yellow altdialog = green note = purple diff --git a/novelwriter/assets/themes/light_owl.conf b/novelwriter/assets/themes/light_owl.conf index 6a43afc0..c3e338a1 100644 --- a/novelwriter/assets/themes/light_owl.conf +++ b/novelwriter/assets/themes/light_owl.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:160 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = yellow:D175 diff --git a/novelwriter/assets/themes/new_moon.conf b/novelwriter/assets/themes/new_moon.conf index 4bbb2e58..79018122 100644 --- a/novelwriter/assets/themes/new_moon.conf +++ b/novelwriter/assets/themes/new_moon.conf @@ -59,6 +59,7 @@ link = blue headertext = purple headertag = purple:128 emphasis = blue +whitespace = blue:64 dialog = #ffffff altdialog = cyan note = green diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf index 716f7eb8..93e3c105 100644 --- a/novelwriter/assets/themes/night_owl.conf +++ b/novelwriter/assets/themes/night_owl.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:160 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = yellow:L115 diff --git a/novelwriter/assets/themes/noctis.conf b/novelwriter/assets/themes/noctis.conf index 235bb5dc..e1489328 100644 --- a/novelwriter/assets/themes/noctis.conf +++ b/novelwriter/assets/themes/noctis.conf @@ -91,6 +91,7 @@ link = #40d4e7 headertext = #49e9a6 headertag = green:D125 emphasis = #d67e5c +whitespace = #d67e5c64 dialog = green altdialog = blue note = #d67e5c diff --git a/novelwriter/assets/themes/noctis_lux.conf b/novelwriter/assets/themes/noctis_lux.conf index fa37b293..c6e22bf5 100644 --- a/novelwriter/assets/themes/noctis_lux.conf +++ b/novelwriter/assets/themes/noctis_lux.conf @@ -91,6 +91,7 @@ link = #00c6e0 headertext = #00b368 headertag = green:D125 emphasis = #b3694d +whitespace = #b3694d64 dialog = green altdialog = blue note = #b3694d diff --git a/novelwriter/assets/themes/nord.conf b/novelwriter/assets/themes/nord.conf index e2a2faf9..aeaeb30e 100644 --- a/novelwriter/assets/themes/nord.conf +++ b/novelwriter/assets/themes/nord.conf @@ -59,6 +59,7 @@ link = purple headertext = cyan headertag = cyan:128 emphasis = #8fbcbb +whitespace = #8fbcbb64 dialog = blue altdialog = green note = orange diff --git a/novelwriter/assets/themes/nordlicht.conf b/novelwriter/assets/themes/nordlicht.conf index f8d9a846..ccfde60a 100644 --- a/novelwriter/assets/themes/nordlicht.conf +++ b/novelwriter/assets/themes/nordlicht.conf @@ -57,6 +57,7 @@ link = purple headertext = #559db1 headertag = #559db188 emphasis = #549b86 +whitespace = #549b8664 dialog = #5579a5 altdialog = #619b5b note = orange diff --git a/novelwriter/assets/themes/otium_dark.conf b/novelwriter/assets/themes/otium_dark.conf index 7319180a..5d9401e3 100644 --- a/novelwriter/assets/themes/otium_dark.conf +++ b/novelwriter/assets/themes/otium_dark.conf @@ -57,6 +57,7 @@ link = #a6d0ed headertext = yellow headertag = yellow:128 emphasis = yellow +whitespace = yellow:64 dialog = green altdialog = orange note = #a6d0ed diff --git a/novelwriter/assets/themes/otium_light.conf b/novelwriter/assets/themes/otium_light.conf index 062c7879..c3084ed7 100644 --- a/novelwriter/assets/themes/otium_light.conf +++ b/novelwriter/assets/themes/otium_light.conf @@ -57,6 +57,7 @@ link = blue headertext = yellow headertag = yellow:128 emphasis = #ad802a +whitespace = #ad802a64 dialog = green altdialog = #c0652d note = #668bbd diff --git a/novelwriter/assets/themes/paragon.conf b/novelwriter/assets/themes/paragon.conf index 7b05bee4..f6a0cc6f 100644 --- a/novelwriter/assets/themes/paragon.conf +++ b/novelwriter/assets/themes/paragon.conf @@ -58,6 +58,7 @@ link = green headertext = green headertag = green:128 emphasis = #99bbff +whitespace = #99bbff64 dialog = cyan altdialog = green note = #c7b377 diff --git a/novelwriter/assets/themes/primer_light.conf b/novelwriter/assets/themes/primer_light.conf index 49850873..97262d06 100644 --- a/novelwriter/assets/themes/primer_light.conf +++ b/novelwriter/assets/themes/primer_light.conf @@ -59,6 +59,7 @@ link = blue headertext = default headertag = #9ea7b0 emphasis = #1a7f37 +whitespace = #1a7f3764 dialog = #0d1117 altdialog = cyan note = #bf8700 diff --git a/novelwriter/assets/themes/primer_night.conf b/novelwriter/assets/themes/primer_night.conf index 2b4e4156..e25f06c0 100644 --- a/novelwriter/assets/themes/primer_night.conf +++ b/novelwriter/assets/themes/primer_night.conf @@ -59,6 +59,7 @@ link = blue headertext = default headertag = #b1bac4 emphasis = #7ee787 +whitespace = #7ee78764 dialog = #ffffff altdialog = #57ccc5 note = #f8e3a1 diff --git a/novelwriter/assets/themes/ruby_day.conf b/novelwriter/assets/themes/ruby_day.conf index 5a56e472..d01aa090 100644 --- a/novelwriter/assets/themes/ruby_day.conf +++ b/novelwriter/assets/themes/ruby_day.conf @@ -57,6 +57,7 @@ link = #5159cc headertext = #343242 headertag = #34324280 emphasis = #c05858 +whitespace = #c0585864 dialog = #ce1d1d altdialog = #c45522 note = #9f58ad diff --git a/novelwriter/assets/themes/ruby_night.conf b/novelwriter/assets/themes/ruby_night.conf index 37f60ac6..9c6d988c 100644 --- a/novelwriter/assets/themes/ruby_night.conf +++ b/novelwriter/assets/themes/ruby_night.conf @@ -57,6 +57,7 @@ link = blue headertext = default headertag = default:128 emphasis = #ff9d9d +whitespace = #ff9d9d64 dialog = red altdialog = orange note = purple @@ -70,4 +71,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/selenium_dark.conf b/novelwriter/assets/themes/selenium_dark.conf index a5c5cc1b..e19e525e 100644 --- a/novelwriter/assets/themes/selenium_dark.conf +++ b/novelwriter/assets/themes/selenium_dark.conf @@ -57,6 +57,7 @@ link = blue headertext = #e4e0ec headertag = faded emphasis = #9267d3 +whitespace = #9267d364 dialog = #e4e0ec altdialog = #c458ac note = red diff --git a/novelwriter/assets/themes/selenium_light.conf b/novelwriter/assets/themes/selenium_light.conf index d1eefa1f..7b6fe9b5 100644 --- a/novelwriter/assets/themes/selenium_light.conf +++ b/novelwriter/assets/themes/selenium_light.conf @@ -57,6 +57,7 @@ link = blue headertext = #29252f headertag = faded emphasis = purple +whitespace = purple:64 dialog = #29252f altdialog = #c458ac note = red diff --git a/novelwriter/assets/themes/sepia_dark.conf b/novelwriter/assets/themes/sepia_dark.conf index 49deeedd..358728f5 100644 --- a/novelwriter/assets/themes/sepia_dark.conf +++ b/novelwriter/assets/themes/sepia_dark.conf @@ -57,6 +57,7 @@ link = cyan headertext = default headertag = default:160 emphasis = #f1daca +whitespace = #f1daca64 dialog = orange altdialog = red note = green diff --git a/novelwriter/assets/themes/sepia_light.conf b/novelwriter/assets/themes/sepia_light.conf index a7c1d306..8c85e2e0 100644 --- a/novelwriter/assets/themes/sepia_light.conf +++ b/novelwriter/assets/themes/sepia_light.conf @@ -57,6 +57,7 @@ link = #458871 headertext = default headertag = default:160 emphasis = #6e2920 +whitespace = #6e292064 dialog = #ac5828 altdialog = #b44b4b note = #6e8021 diff --git a/novelwriter/assets/themes/snazzy.conf b/novelwriter/assets/themes/snazzy.conf index 0c36d884..68c270fb 100644 --- a/novelwriter/assets/themes/snazzy.conf +++ b/novelwriter/assets/themes/snazzy.conf @@ -72,6 +72,7 @@ link = blue headertext = green headertag = green:D125 emphasis = purple +whitespace = purple:64 dialog = blue altdialog = yellow note = cyan diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf index 4c73412f..e9292dbd 100644 --- a/novelwriter/assets/themes/solarized_dark.conf +++ b/novelwriter/assets/themes/solarized_dark.conf @@ -78,6 +78,7 @@ link = blue headertext = blue headertag = #657b83 emphasis = blue +whitespace = blue:64 dialog = cyan altdialog = red note = cyan:D125 diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf index 61d701b7..bc8abcfd 100644 --- a/novelwriter/assets/themes/solarized_light.conf +++ b/novelwriter/assets/themes/solarized_light.conf @@ -78,6 +78,7 @@ link = blue headertext = blue headertag = #657b83 emphasis = blue +whitespace = blue:64 dialog = cyan altdialog = red note = cyan:D125 diff --git a/novelwriter/assets/themes/sultana_light.conf b/novelwriter/assets/themes/sultana_light.conf index 1f4e5195..1a29f079 100644 --- a/novelwriter/assets/themes/sultana_light.conf +++ b/novelwriter/assets/themes/sultana_light.conf @@ -57,6 +57,7 @@ link = #5577bb headertext = #66515e headertag = #66515e80 emphasis = #5577bb +whitespace = #5577bb64 dialog = #c54a5f altdialog = #4d968a note = #699128 diff --git a/novelwriter/assets/themes/sultana_night.conf b/novelwriter/assets/themes/sultana_night.conf index bd55dd84..a952c87e 100644 --- a/novelwriter/assets/themes/sultana_night.conf +++ b/novelwriter/assets/themes/sultana_night.conf @@ -57,6 +57,7 @@ link = blue headertext = #f3eae0 headertag = #f3eae080 emphasis = blue +whitespace = blue:64 dialog = red altdialog = cyan note = green diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf index 8661ce27..0e5707cb 100644 --- a/novelwriter/assets/themes/tango_dark.conf +++ b/novelwriter/assets/themes/tango_dark.conf @@ -73,6 +73,7 @@ link = blue headertext = blue headertag = blue:160 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = yellow:L115 diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf index 379b0a72..efbcaf20 100644 --- a/novelwriter/assets/themes/tango_light.conf +++ b/novelwriter/assets/themes/tango_light.conf @@ -73,6 +73,7 @@ link = blue headertext = blue headertag = blue:160 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = yellow:D125 diff --git a/novelwriter/assets/themes/tomorrow.conf b/novelwriter/assets/themes/tomorrow.conf index 15abcd32..70b123ee 100644 --- a/novelwriter/assets/themes/tomorrow.conf +++ b/novelwriter/assets/themes/tomorrow.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:L135 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = #b38c00 diff --git a/novelwriter/assets/themes/tomorrow_night.conf b/novelwriter/assets/themes/tomorrow_night.conf index ac213a76..9bd4fbea 100644 --- a/novelwriter/assets/themes/tomorrow_night.conf +++ b/novelwriter/assets/themes/tomorrow_night.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:D150 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = #f0dbb2 diff --git a/novelwriter/assets/themes/tomorrow_night_blue.conf b/novelwriter/assets/themes/tomorrow_night_blue.conf index 05193e6f..409cfd25 100644 --- a/novelwriter/assets/themes/tomorrow_night_blue.conf +++ b/novelwriter/assets/themes/tomorrow_night_blue.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:D150 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = #fff4cc diff --git a/novelwriter/assets/themes/tomorrow_night_bright.conf b/novelwriter/assets/themes/tomorrow_night_bright.conf index 514940fa..14a1a4d6 100644 --- a/novelwriter/assets/themes/tomorrow_night_bright.conf +++ b/novelwriter/assets/themes/tomorrow_night_bright.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:D150 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = #e7d696 diff --git a/novelwriter/assets/themes/tomorrow_night_eighties.conf b/novelwriter/assets/themes/tomorrow_night_eighties.conf index 154b6ef4..af7190fc 100644 --- a/novelwriter/assets/themes/tomorrow_night_eighties.conf +++ b/novelwriter/assets/themes/tomorrow_night_eighties.conf @@ -79,6 +79,7 @@ link = blue headertext = blue headertag = blue:D150 emphasis = orange +whitespace = orange:64 dialog = green altdialog = yellow note = #ffe6b3 diff --git a/novelwriter/assets/themes/vivid_black_green.conf b/novelwriter/assets/themes/vivid_black_green.conf index f2d17043..2c0101e3 100644 --- a/novelwriter/assets/themes/vivid_black_green.conf +++ b/novelwriter/assets/themes/vivid_black_green.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = blue +whitespace = blue:64 dialog = green altdialog = cyan note = red diff --git a/novelwriter/assets/themes/vivid_black_red.conf b/novelwriter/assets/themes/vivid_black_red.conf index fd7d99f2..c7f3f6b8 100644 --- a/novelwriter/assets/themes/vivid_black_red.conf +++ b/novelwriter/assets/themes/vivid_black_red.conf @@ -59,6 +59,7 @@ link = blue headertext = yellow headertag = yellow:128 emphasis = orange +whitespace = orange:64 dialog = red altdialog = yellow note = green @@ -72,4 +73,4 @@ spellcheckline = #ff3737 errorline = cyan replacetag = #ff61e5 modifier = cyan -texthighlight = red:80 \ No newline at end of file +texthighlight = red:80 diff --git a/novelwriter/assets/themes/vivid_white_green.conf b/novelwriter/assets/themes/vivid_white_green.conf index 7c299bdc..5d421a2a 100644 --- a/novelwriter/assets/themes/vivid_white_green.conf +++ b/novelwriter/assets/themes/vivid_white_green.conf @@ -59,6 +59,7 @@ link = blue headertext = cyan headertag = cyan:128 emphasis = blue +whitespace = blue:64 dialog = green altdialog = cyan note = red diff --git a/novelwriter/assets/themes/vivid_white_red.conf b/novelwriter/assets/themes/vivid_white_red.conf index e77b42b3..dc40bfbe 100644 --- a/novelwriter/assets/themes/vivid_white_red.conf +++ b/novelwriter/assets/themes/vivid_white_red.conf @@ -59,6 +59,7 @@ link = blue headertext = yellow headertag = yellow:128 emphasis = orange +whitespace = orange:64 dialog = red altdialog = #a37e03 note = green diff --git a/novelwriter/assets/themes/warpgate.conf b/novelwriter/assets/themes/warpgate.conf index 1398732f..2cb0108f 100644 --- a/novelwriter/assets/themes/warpgate.conf +++ b/novelwriter/assets/themes/warpgate.conf @@ -58,6 +58,7 @@ link = green headertext = green headertag = green:128 emphasis = #fff6aa +whitespace = #fff6aa64 dialog = cyan altdialog = #11bdc6 note = green diff --git a/novelwriter/assets/themes/waterlily_dark.conf b/novelwriter/assets/themes/waterlily_dark.conf index 92395b9c..46b356bf 100644 --- a/novelwriter/assets/themes/waterlily_dark.conf +++ b/novelwriter/assets/themes/waterlily_dark.conf @@ -57,6 +57,7 @@ link = blue headertext = default headertag = faded emphasis = green +whitespace = green:64 dialog = #ff9fbd altdialog = orange note = blue diff --git a/novelwriter/assets/themes/waterlily_light.conf b/novelwriter/assets/themes/waterlily_light.conf index 960baa67..b86d4f2c 100644 --- a/novelwriter/assets/themes/waterlily_light.conf +++ b/novelwriter/assets/themes/waterlily_light.conf @@ -57,6 +57,7 @@ link = #0b9caf headertext = #526b5d headertag = #526b5d80 emphasis = #1e920e +whitespace = #1e920e64 dialog = #d15574 altdialog = #d86f3e note = #0b9caf diff --git a/novelwriter/gui/dochighlight.py b/novelwriter/gui/dochighlight.py index 3cd1cb1d..f20f5f5e 100644 --- a/novelwriter/gui/dochighlight.py +++ b/novelwriter/gui/dochighlight.py @@ -94,8 +94,6 @@ class GuiDocHighlighter(QSyntaxHighlighter): syntax = SHARED.theme.syntaxTheme colEmph = syntax.emph if CONFIG.highlightEmph else None - colBreak = QColor(syntax.emph) - colBreak.setAlpha(64) # Create Character Formats self._addCharFormat("text", syntax.text) @@ -112,7 +110,7 @@ class GuiDocHighlighter(QSyntaxHighlighter): self._addCharFormat("strike", syntax.hidden, "s") self._addCharFormat("mark", syntax.mark, "bg") self._addCharFormat("mspaces", syntax.error, "err") - self._addCharFormat("nobreak", colBreak, "bg") + self._addCharFormat("nobreak", syntax.space, "bg") self._addCharFormat("altdialog", syntax.dialA) self._addCharFormat("dialog", syntax.dialN) self._addCharFormat("replace", syntax.repTag) diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index 6293a9f6..407e87a9 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -114,6 +114,7 @@ class SyntaxColors: head: QColor = QColor(0, 0, 0) headH: QColor = QColor(0, 0, 0) emph: QColor = QColor(0, 0, 0) + space: QColor = QColor(0, 0, 0) dialN: QColor = QColor(0, 0, 0) dialA: QColor = QColor(0, 0, 0) hidden: QColor = QColor(0, 0, 0) @@ -393,6 +394,7 @@ class GuiTheme: self.syntaxTheme.head = self._readColor(parser, sec, "headertext") self.syntaxTheme.headH = self._readColor(parser, sec, "headertag") self.syntaxTheme.emph = self._readColor(parser, sec, "emphasis") + self.syntaxTheme.space = self._readColor(parser, sec, "whitespace") self.syntaxTheme.dialN = self._readColor(parser, sec, "dialog") self.syntaxTheme.dialA = self._readColor(parser, sec, "altdialog") self.syntaxTheme.hidden = self._readColor(parser, sec, "hidden") diff --git a/tests/test_gui/test_gui_theme.py b/tests/test_gui/test_gui_theme.py index aa613bd5..7f4d976a 100644 --- a/tests/test_gui/test_gui_theme.py +++ b/tests/test_gui/test_gui_theme.py @@ -635,9 +635,10 @@ def testGuiTheme_CheckTheme(theme): ], "Syntax": [ "background", "text", "line", "link", "headertext", "headertag", - "emphasis", "dialog", "altdialog", "hidden", "note", "shortcode", - "keyword", "tag", "value", "optional", "spellcheckline", - "errorline", "replacetag", "modifier", "texthighlight", + "emphasis", "whitespace", "dialog", "altdialog", "hidden", "note", + "shortcode", "keyword", "tag", "value", "optional", + "spellcheckline", "errorline", "replacetag", "modifier", + "texthighlight", ], } optional = ["credit", "url"]