diff --git a/novelwriter/assets/themes/cyberpunk_night.conf b/novelwriter/assets/themes/cyberpunk_night.conf index 40b5dd53..66c3932c 100644 --- a/novelwriter/assets/themes/cyberpunk_night.conf +++ b/novelwriter/assets/themes/cyberpunk_night.conf @@ -8,24 +8,24 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] -default = #888888 -faded = #616161 -red = #f24817 -orange = #ff960a -yellow = #ffff00 -green = #00ff00 -cyan = #00ffff -blue = #4d4dff -purple = #320064 +default = #888888 +faded = #616161 +red = #f24817 +orange = #ff960a +yellow = #ffff00 +green = #00ff00 +cyan = #00ffff +blue = #4d4dff +purple = #320064 [Project] -root = #4d4dff -folder = #ffff00 -file = #888888 -title = #00ff00 -chapter = #f24817 -scene = #4d4dff -note = #ffff00 +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #000000 @@ -40,32 +40,32 @@ buttontext = #969696 brighttext = #ffffff highlight = #321e50 highlightedtext = #ffffff -link = #4d4dff +link = blue linkvisited = #320050 [GUI] -helptext = #616161 -fadedtext = #616161 -errortext = #f24817 +helptext = faded +fadedtext = faded +errortext = red [Syntax] -background = #000000 -text = #969696 -link = #4d4dff -headertext = #ffffff -headertag = #320064 -emphasis = #00ffff -dialog = #00ff00 -altdialog = #008cff -note = #969696 -hidden = #4d4d64 -shortcode = #ffff00 -keyword = #ff64ff -tag = #ff960a -value = #ff960a -spellcheckline = #f24817 -errorline = #bada04 -replacetag = #0000b4 -modifier = #908eb0 -optional = #b4b4b4 -texthighlight = #ffff8460 +background = #000000 +text = #969696 +link = blue +headertext = #ffffff +headertag = purple +emphasis = cyan +dialog = green +altdialog = #008cff +note = #969696 +hidden = #4d4d64 +shortcode = yellow +keyword = #ff64ff +tag = orange +value = orange +spellcheckline = red +errorline = #bada04 +replacetag = #0000b4 +modifier = #908eb0 +optional = #b4b4b4 +texthighlight = #ffff8460 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index e559de9e..e2e41efb 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -9,24 +9,24 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] -default = #cccccc -faded = #949494 -red = #f2777a -orange = #f99139 -yellow = #ffcc66 -green = #99cc99 -cyan = #66cccc -blue = #6699cc -purple = #cc99cc +default = #cccccc +faded = #949494 +red = #f2777a +orange = #f99139 +yellow = #ffcc66 +green = #99cc99 +cyan = #66cccc +blue = #6699cc +purple = #cc99cc [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #363636 @@ -45,28 +45,28 @@ link = blue linkvisited = blue [GUI] -helptext = #a4a4a4 -fadedtext = faded -errortext = red +helptext = #a4a4a4 +fadedtext = faded +errortext = red [Syntax] -background = #363636 -text = default -link = blue -headertext = green -headertag = green:160 -emphasis = orange -dialog = blue -altdialog = blue -note = yellow -hidden = faded -shortcode = green -keyword = red -tag = green -value = blue -optional = green -spellcheckline = red -errorline = green -replacetag = green -modifier = green -texthighlight = yellow:72 +background = #363636 +text = default +link = blue +headertext = green +headertag = green:160 +emphasis = orange +dialog = blue +altdialog = blue +note = yellow +hidden = faded +shortcode = green +keyword = red +tag = green +value = blue +optional = green +spellcheckline = red +errorline = green +replacetag = green +modifier = green +texthighlight = yellow:72 diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index 638d6879..ad38e0e7 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -9,24 +9,24 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] -default = #303030 -faded = #6c6c6c -red = #a62a2d -orange = #b36829 -yellow = #a68542 -green = #296629 -cyan = #269999 -blue = #3a70a6 -purple = #b35ab3 +default = #303030 +faded = #6c6c6c +red = #a62a2d +orange = #b36829 +yellow = #a68542 +green = #296629 +cyan = #269999 +blue = #3a70a6 +purple = #b35ab3 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #efefef @@ -45,28 +45,28 @@ link = blue linkvisited = blue [GUI] -helptext = #5c5c5c -fadedtext = #6c6c6c -errortext = red +helptext = #5c5c5c +fadedtext = #6c6c6c +errortext = red [Syntax] -background = #ffffff -text = #000000 -link = blue -headertext = green -headertag = green:160 -emphasis = orange -dialog = blue -altdialog = blue -note = yellow -hidden = faded -shortcode = green -keyword = red -tag = green -value = blue -optional = green -spellcheckline = red -errorline = green -replacetag = green -modifier = green -texthighlight = #c8c80060 +background = #ffffff +text = #000000 +link = blue +headertext = green +headertag = green:160 +emphasis = orange +dialog = blue +altdialog = blue +note = yellow +hidden = faded +shortcode = green +keyword = red +tag = green +value = blue +optional = green +spellcheckline = red +errorline = green +replacetag = green +modifier = green +texthighlight = #c8c80060 diff --git a/novelwriter/assets/themes/dracula.conf b/novelwriter/assets/themes/dracula.conf index 04e32450..0d5dd373 100644 --- a/novelwriter/assets/themes/dracula.conf +++ b/novelwriter/assets/themes/dracula.conf @@ -25,24 +25,24 @@ licenseurl = https://github.com/dracula/dracula-theme/blob/main/LICENSE ## [Base] -default = #e6e6e0 -faded = #6272a4 -red = #ff5555 -orange = #ffb86c -yellow = #f1fa8c -green = #50fa7b -cyan = #8be9fd -blue = #93cff9 -purple = #bd93f9 +default = #e6e6e0 +faded = #6272a4 +red = #ff5555 +orange = #ffb86c +yellow = #f1fa8c +green = #50fa7b +cyan = #8be9fd +blue = #93cff9 +purple = #bd93f9 [Project] -root = #bd93f9 -folder = #f1fa8c -file = #e6e6e0 -title = #50fa7b -chapter = #ff5555 -scene = #8be9fd -note = #f1fa8c +root = purple +folder = yellow +file = default +title = green +chapter = red +scene = cyan +note = yellow [Palette] window = #44475a @@ -50,39 +50,39 @@ windowtext = #f8f8f2 base = #282a36 alternatebase = #333645 text = #f8f8f2 -tooltipbase = #f1fa8c +tooltipbase = yellow tooltiptext = #282a36 button = #505369 buttontext = #f8f8f2 brighttext = #44475a highlight = #a681da highlightedtext = #f8f8f2 -link = #8be9fd -linkvisited = #8be9fd +link = cyan +linkvisited = cyan [GUI] -helptext = #ccacf9 -fadedtext = #6272a4 -errortext = #ff5555 +helptext = #ccacf9 +fadedtext = faded +errortext = red [Syntax] -background = #282a36 -text = #f8f8f2 -link = #ff79c6 -headertext = #bd93f9 -headertag = #bd93f9a0 -emphasis = #ffb86c -dialog = #50fa7b -altdialog = #f1fa8c -note = #ffcce9 -hidden = #6272a4 -shortcode = #8be9fd -keyword = #ff79c6 -tag = #ffb86c -value = #ffb86c -optional = #50fa7b -spellcheckline = #ff5555 -errorline = #50fa7b -replacetag = #f1fa8c -modifier = #8be9fd -texthighlight = #f1fa8c60 +background = #282a36 +text = #f8f8f2 +link = #ff79c6 +headertext = purple +headertag = #bd93f9a0 +emphasis = orange +dialog = green +altdialog = yellow +note = #ffcce9 +hidden = faded +shortcode = cyan +keyword = #ff79c6 +tag = orange +value = orange +optional = green +spellcheckline = red +errorline = green +replacetag = yellow +modifier = cyan +texthighlight = #f1fa8c60 diff --git a/novelwriter/assets/themes/grey_dark.conf b/novelwriter/assets/themes/grey_dark.conf index 21d95224..c51879a3 100644 --- a/novelwriter/assets/themes/grey_dark.conf +++ b/novelwriter/assets/themes/grey_dark.conf @@ -8,24 +8,24 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] -default = #cccccc -faded = #949494 -red = #f2777a -orange = #f99139 -yellow = #ffcc66 -green = #99cc99 -cyan = #66cccc -blue = #6699cc -purple = #cc99cc +default = #cccccc +faded = #949494 +red = #f2777a +orange = #f99139 +yellow = #ffcc66 +green = #99cc99 +cyan = #66cccc +blue = #6699cc +purple = #cc99cc [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #363636 @@ -44,9 +44,9 @@ link = blue linkvisited = blue [GUI] -helptext = #a4a4a4 -fadedtext = faded -errortext = red +helptext = #a4a4a4 +fadedtext = faded +errortext = red [Syntax] background = #363636 diff --git a/novelwriter/assets/themes/grey_light.conf b/novelwriter/assets/themes/grey_light.conf index 651ab6d0..3bd22238 100644 --- a/novelwriter/assets/themes/grey_light.conf +++ b/novelwriter/assets/themes/grey_light.conf @@ -8,24 +8,24 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] -default = #303030 -faded = #6c6c6c -red = #a62a2d -orange = #b36829 -yellow = #a68542 -green = #296629 -cyan = #269999 -blue = #3a70a6 -purple = #b35ab3 +default = #303030 +faded = #6c6c6c +red = #a62a2d +orange = #b36829 +yellow = #a68542 +green = #296629 +cyan = #269999 +blue = #3a70a6 +purple = #b35ab3 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #efefef @@ -44,9 +44,9 @@ link = blue linkvisited = blue [GUI] -helptext = #5c5c5c -fadedtext = faded -errortext = red +helptext = #5c5c5c +fadedtext = faded +errortext = red [Syntax] background = #ffffff diff --git a/novelwriter/assets/themes/light_owl.conf b/novelwriter/assets/themes/light_owl.conf index b18f5fb7..8851b0d2 100644 --- a/novelwriter/assets/themes/light_owl.conf +++ b/novelwriter/assets/themes/light_owl.conf @@ -14,7 +14,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE ## # Colours: # Background = #fbfbfb -# Current Line = #e0e0e0 +# Current Line = #eaeaea # Selection = #e0e0e0 # Foreground = #403f52 # Comment = #989fb1 @@ -28,64 +28,64 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE ## [Base] -default = #403f52 -faded = #989fb1 -red = #de3d3a -orange = #e0af05 -yellow = #daaa01 -green = #08916a -cyan = #2aa298 -blue = #288ed7 -purple = #964ac1 +default = #403f52 +faded = #989fb1 +red = #de3d3a +orange = #e0af05 +yellow = #daaa01 +green = #08916a +cyan = #2aa298 +blue = #288ed7 +purple = #964ac1 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] -window = #e0e0e0 +window = #eaeaea windowtext = default base = #fbfbfb alternatebase = #e0e0e0 text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #e0e0e0 +button = #eaeaea buttontext = default -brighttext = #e0e0e0 +brighttext = #eaeaea highlight = #3087c6 highlightedtext = #ffffff link = blue linkvisited = blue [GUI] -helptext = blue -fadedtext = faded -errortext = red +helptext = blue +fadedtext = faded +errortext = red [Syntax] -background = #fbfbfb -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #80764b -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = orange -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = green -texthighlight = yellow:96 +background = #fbfbfb +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #80764b +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = orange +optional = blue +spellcheckline = red +errorline = green +replacetag = cyan +modifier = green +texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf index 8aae2b62..3e0a5aca 100644 --- a/novelwriter/assets/themes/night_owl.conf +++ b/novelwriter/assets/themes/night_owl.conf @@ -14,7 +14,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE ## # Colours: # Background = #011627 -# Current Line = #32374d +# Current Line = #434652 # Selection = #32374d # Foreground = #d6deeb # Comment = #637777 @@ -28,64 +28,64 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE ## [Base] -default = #d6deeb -faded = #637777 -red = #f78c6c -orange = #ecc48d -yellow = #addb67 -green = #addb67 -cyan = #7fdbca -blue = #82aaff -purple = #c792ea +default = #d6deeb +faded = #637777 +red = #f78c6c +orange = #ecc48d +yellow = #addb67 +green = #addb67 +cyan = #7fdbca +blue = #82aaff +purple = #c792ea [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] -window = #32374d +window = #434652 windowtext = default base = #011627 alternatebase = #32374d text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #32374d +button = #434652 buttontext = default -brighttext = #32374d +brighttext = #434652 highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue [GUI] -helptext = blue -fadedtext = faded -errortext = red +helptext = blue +fadedtext = faded +errortext = red [Syntax] -background = #011627 -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #fff9ca -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = orange -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = green -texthighlight = yellow:96 +background = #011627 +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #fff9ca +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = orange +optional = blue +spellcheckline = red +errorline = green +replacetag = cyan +modifier = green +texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/snazzy.conf b/novelwriter/assets/themes/snazzy.conf index 6220dcc3..737107e7 100644 --- a/novelwriter/assets/themes/snazzy.conf +++ b/novelwriter/assets/themes/snazzy.conf @@ -21,64 +21,64 @@ licenseurl = https://github.com/loilo/vscode-snazzy-light/blob/master/LICENSE ## [Base] -default = #565869 -faded = #545554 -red = #ff5c57 -orange = #f5b900 -yellow = #cf9c00 -green = #2dae58 -cyan = #13bbb7 -blue = #09a1ed -purple = #f767bb +default = #565869 +faded = #545554 +red = #ff5c57 +orange = #f5b900 +yellow = #cf9c00 +green = #2dae58 +cyan = #13bbb7 +blue = #09a1ed +purple = #f767bb [Project] -root = #09a1ed -folder = #cf9c00 -file = #545554 -title = #2dae58 -chapter = #ff5c57 -scene = #09a1ed -note = #cf9c00 +root = blue +folder = yellow +file = faded +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #f3f4f5 -windowtext = #565869 +windowtext = default base = #fafbfc alternatebase = #eaeaeb -text = #565869 +text = default tooltipbase = #f5e9c2 -tooltiptext = #565869 +tooltiptext = default button = #fafbfc -buttontext = #565869 +buttontext = default brighttext = #ffffff -highlight = #09a1ed +highlight = blue highlightedtext = #ffffff -link = #09a1ed -linkvisited = #09a1ed +link = blue +linkvisited = blue [GUI] -helptext = #09a1ed -fadedtext = #545554 -errortext = #ff5c57 +helptext = blue +fadedtext = faded +errortext = red [Syntax] -background = #fafbfc -text = #565869 -link = #09a1ed -headertext = #2dae58 -headertag = #2dae58a0 -emphasis = #f767bb -dialog = #09a1ed -altdialog = #cf9c00 -note = #78bbb9 -hidden = #9194a2 -shortcode = #f767bb -keyword = #09a1ed -tag = #2dae58 -value = #cf9c00 -optional = #cf9c00 -spellcheckline = #ff5c57 -errorline = #2dae58 -replacetag = #13bbb7 -modifier = #f767bb -texthighlight = #cf9c0060 +background = #fafbfc +text = default +link = blue +headertext = green +headertag = #2dae58a0 +emphasis = purple +dialog = blue +altdialog = yellow +note = #78bbb9 +hidden = #9194a2 +shortcode = purple +keyword = blue +tag = green +value = yellow +optional = yellow +spellcheckline = red +errorline = green +replacetag = cyan +modifier = purple +texthighlight = #cf9c0060 diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf index 5cf4e157..495d68eb 100644 --- a/novelwriter/assets/themes/solarized_dark.conf +++ b/novelwriter/assets/themes/solarized_dark.conf @@ -27,64 +27,64 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE ## [Base] -default = #e6dfce -faded = #a6a195 -red = #dc322f -orange = #cb4b16 -yellow = #b58900 -green = #859900 -cyan = #2aa198 -blue = #268bd2 -purple = #6c71c4 +default = #fdf6e3 +faded = #eee8d5 +red = #dc322f +orange = #cb4b16 +yellow = #b58900 +green = #859900 +cyan = #2aa198 +blue = #268bd2 +purple = #6c71c4 [Project] -root = #2aa198 -folder = #2aa198 -file = #e6dfce -title = #859900 -chapter = #dc322f -scene = #268bd2 -note = #b58900 +root = cyan +folder = cyan +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #002b36 -windowtext = #fdf6e3 +windowtext = default base = #073642 alternatebase = #586e75 -text = #fdf6e3 -tooltipbase = #859900 +text = default +tooltipbase = yellow tooltiptext = #002b36 button = #073642 -buttontext = #fdf6e3 +buttontext = default brighttext = #073642 -highlight = #2aa198 +highlight = cyan highlightedtext = #002b36 -link = #268bd2 -linkvisited = #268bd2 +link = blue +linkvisited = blue [GUI] -helptext = #657b83 -fadedtext = #657b83 -errortext = #dc322f +helptext = purple +fadedtext = faded +errortext = red [Syntax] -background = #073642 -text = #fdf6e3 -link = #268bd2 -headertext = #93a1a1 -headertag = #2aa198 -emphasis = #268bd2 -dialog = #2aa198 -altdialog = #2aa198 -note = #65a19c -hidden = #93a1a1 -shortcode = #93a1a1 -keyword = #859900 -tag = #cb4b16 -value = #cb4b16 -optional = #93a1a1 -spellcheckline = #cb4b16 -errorline = #dc322f -replacetag = #859900 -modifier = #b58900 -texthighlight = #b5890060 +background = #073642 +text = default +link = blue +headertext = default:196 +headertag = cyan +emphasis = blue +dialog = cyan +altdialog = cyan +note = cyan:196 +hidden = default:196 +shortcode = yellow +keyword = green +tag = orange +value = orange +optional = cyan:196 +spellcheckline = orange +errorline = red +replacetag = green +modifier = yellow +texthighlight = yellow:128 diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf index f185bd73..bfdcdad1 100644 --- a/novelwriter/assets/themes/solarized_light.conf +++ b/novelwriter/assets/themes/solarized_light.conf @@ -27,64 +27,65 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE ## [Base] -default = #3b4447 -faded = #4e5b5f -red = #dc322f -orange = #cb4b16 -yellow = #b58900 -green = #859900 -cyan = #2aa198 -blue = #268bd2 -purple = #6c71c4 +default = #002b36 +faded = #073642 +red = #dc322f +orange = #cb4b16 +yellow = #b58900 +green = #859900 +cyan = #2aa198 +blue = #268bd2 +purple = #6c71c4 [Project] -root = #2aa198 -folder = #2aa198 -file = #3b4447 -title = #859900 -chapter = #dc322f -scene = #268bd2 -note = #b58900 +root = cyan +folder = cyan +file = default +title = green +chapter = red +scene = blue +note = yellow + [Palette] -window = #eee8d5 -windowtext = #002b36 -base = #fdf6e3 +window = #fdf6e3 +windowtext = default +base = #eee8d5 alternatebase = #93a1a1 -text = #002b36 -tooltipbase = #859900 +text = default +tooltipbase = yellow tooltiptext = #002b36 button = #eee8d5 -buttontext = #002b36 -brighttext = #fdf6e3 -highlight = #2aa198 +buttontext = default +brighttext = #eee8d5 +highlight = cyan highlightedtext = #fdf6e3 -link = #268bd2 -linkvisited = #268bd2 +link = blue +linkvisited = blue [GUI] -helptext = #4e5b5f -fadedtext = #4e5b5f -errortext = #dc322f +helptext = purple +fadedtext = faded +errortext = red [Syntax] -background = #fdf6e3 -text = #002b36 -link = #268bd2 -headertext = #586e75 -headertag = #2aa198 -emphasis = #268bd2 -dialog = #2aa198 -altdialog = #2aa198 -note = #1b6660 -hidden = #586e75 -shortcode = #586e75 -keyword = #859900 -tag = #cb4b16 -value = #cb4b16 -optional = #586e75 -spellcheckline = #cb4b16 -errorline = #dc322f -replacetag = #859900 -modifier = #b58900 -texthighlight = #b5890060 +background = #eee8d5 +text = default +link = blue +headertext = default:196 +headertag = cyan +emphasis = blue +dialog = cyan +altdialog = cyan +note = cyan:196 +hidden = default:196 +shortcode = yellow +keyword = green +tag = orange +value = orange +optional = cyan:196 +spellcheckline = orange +errorline = red +replacetag = green +modifier = yellow +texthighlight = yellow:128 diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf index 33e758f7..dd0b9746 100644 --- a/novelwriter/assets/themes/tango_dark.conf +++ b/novelwriter/assets/themes/tango_dark.conf @@ -5,37 +5,37 @@ author = Veronica Berglyd Olsen (adaptation) ## # Colours: -# Background = 30302f : 48, 48, 47 -# Foreground = eeeeec : 238, 238, 236 -# Comment = 8f8f8d : 143, 143, 141 -# Red = ef2929 : 239, 41, 41 -# Orange = c4a000 : 196, 160, 0 -# Yellow = fce94f : 252, 233, 79 -# Green = 8ae234 : 138, 226, 52 -# Cyan = 34e2e2 : 52, 226, 226 -# Blue = 3465a4 : 114, 159, 207 -# Purple = ad7fa8 : 173, 127, 168 +# Background = #30302f +# Foreground = #eeeeec +# Comment = #8f8f8d +# Red = #ef2929 +# Orange = #c4a000 +# Yellow = #fce94f +# Green = #8ae234 +# Cyan = #34e2e2 +# Blue = #3465a4 +# Purple = #ad7fa8 ## [Base] -default = #eeeeec -faded = #babdb6 -red = #ef2929 -orange = #fcaf3e -yellow = #fce94f -green = #8ae234 -cyan = #34e2e2 -blue = #729fcf -purple = #ad7fa8 +default = #eeeeec +faded = #babdb6 +red = #ef2929 +orange = #fcaf3e +yellow = #fce94f +green = #8ae234 +cyan = #34e2e2 +blue = #729fcf +purple = #ad7fa8 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #555753 @@ -54,28 +54,28 @@ link = blue linkvisited = blue [GUI] -helptext = #e9b96e -fadedtext = faded -errortext = red +helptext = #e9b96e +fadedtext = faded +errortext = red [Syntax] -background = #2e3436 -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #fcf2a4 -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = red -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = blue -texthighlight = yellow:96 +background = #2e3436 +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #fcf2a4 +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = red +optional = blue +spellcheckline = red +errorline = green +replacetag = cyan +modifier = blue +texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf index 877f71ac..047be605 100644 --- a/novelwriter/assets/themes/tango_light.conf +++ b/novelwriter/assets/themes/tango_light.conf @@ -5,37 +5,37 @@ author = Veronica Berglyd Olsen (adaptation) ## # Colours: -# Background = #eeeeec -# Foreground = #2e3436 -# Comment = 8f8f8d : 143, 143, 141 -# Red = #a40000 -# Orange = c4a000 : 196, 160, 0 -# Yellow = fce94f : 252, 233, 79 -# Green = 8ae234 : 138, 226, 52 -# Cyan = 34e2e2 : 52, 226, 226 -# Blue = 3465a4 : 114, 159, 207 -# Purple = ad7fa8 : 173, 127, 168 +# Background = #eeeeec +# Foreground = #2e3436 +# Comment = #8f8f8d +# Red = #a40000 +# Orange = #c4a000 +# Yellow = #fce94f +# Green = #8ae234 +# Cyan = #34e2e2 +# Blue = #3465a4 +# Purple = #ad7fa8 ## [Base] -default = #2e3436 -faded = #888a85 -red = #a40000 -orange = #ce5c00 -yellow = #c4a000 -green = #4e9a06 -cyan = #069a9a -blue = #204a87 -purple = #5c3566 +default = #2e3436 +faded = #888a85 +red = #a40000 +orange = #ce5c00 +yellow = #c4a000 +green = #4e9a06 +cyan = #069a9a +blue = #204a87 +purple = #5c3566 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #d3d7cf @@ -54,28 +54,28 @@ link = blue linkvisited = blue [GUI] -helptext = #8f5902 -fadedtext = faded -errortext = red +helptext = #8f5902 +fadedtext = faded +errortext = red [Syntax] -background = #eeeeec -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #a78800 -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = red -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = blue -texthighlight = yellow:96 +background = #eeeeec +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #a78800 +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = red +optional = blue +spellcheckline = red +errorline = green +replacetag = cyan +modifier = blue +texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow.conf b/novelwriter/assets/themes/tomorrow.conf index 974816c1..b37ab4be 100644 --- a/novelwriter/assets/themes/tomorrow.conf +++ b/novelwriter/assets/themes/tomorrow.conf @@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] -default = #484848 -faded = #6c6c6c -red = #c82829 -orange = #f5871f -yellow = #eab700 -green = #718c00 -cyan = #3e999f -blue = #4271ae -purple = #8959a8 +default = #484848 +faded = #6c6c6c +red = #c82829 +orange = #f5871f +yellow = #eab700 +green = #718c00 +cyan = #3e999f +blue = #4271ae +purple = #8959a8 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #efefef @@ -64,28 +64,28 @@ link = blue linkvisited = blue [GUI] -helptext = #5c5c5c -fadedtext = faded -errortext = red +helptext = #5c5c5c +fadedtext = faded +errortext = red [Syntax] -background = #ffffff -text = #4d4d4c -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #b38c00 -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = yellow -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = orange -texthighlight = yellow:96 +background = #ffffff +text = #4d4d4c +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #b38c00 +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = yellow +optional = blue +spellcheckline = red +errorline = green +replacetag = cyan +modifier = orange +texthighlight = yellow:96 diff --git a/novelwriter/assets/themes/tomorrow_night.conf b/novelwriter/assets/themes/tomorrow_night.conf index 94fecbc0..ea94cdec 100644 --- a/novelwriter/assets/themes/tomorrow_night.conf +++ b/novelwriter/assets/themes/tomorrow_night.conf @@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] -default = #c5c8c6 -faded = #969896 -red = #cc6666 -orange = #de935f -yellow = #f0c674 -green = #b5bd68 -cyan = #8abeb7 -blue = #81a2be -purple = #b294bb +default = #c5c8c6 +faded = #969896 +red = #cc6666 +orange = #de935f +yellow = #f0c674 +green = #b5bd68 +cyan = #8abeb7 +blue = #81a2be +purple = #b294bb [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #282a2e @@ -64,28 +64,28 @@ link = blue linkvisited = blue [GUI] -helptext = #a4a4a4 -fadedtext = #949494 -errortext = red +helptext = #a4a4a4 +fadedtext = #949494 +errortext = red [Syntax] -background = #1d1f21 -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #f0dbb2 -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = yellow -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = orange -texthighlight = yellow:96 +background = #1d1f21 +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #f0dbb2 +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = yellow +optional = blue +spellcheckline = red +errorline = green +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 88aac2e3..8ac01e1e 100644 --- a/novelwriter/assets/themes/tomorrow_night_blue.conf +++ b/novelwriter/assets/themes/tomorrow_night_blue.conf @@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] -default = #ffffff -faded = #7285b7 -red = #ff9da4 -orange = #ffc58f -yellow = #ffeead -green = #d1f1a9 -cyan = #99ffff -blue = #bbdaff -purple = #ebbbff +default = #ffffff +faded = #7285b7 +red = #ff9da4 +orange = #ffc58f +yellow = #ffeead +green = #d1f1a9 +cyan = #99ffff +blue = #bbdaff +purple = #ebbbff [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #00346e @@ -64,28 +64,28 @@ link = blue linkvisited = blue [GUI] -helptext = #a4a4a4 -fadedtext = #949494 -errortext = red +helptext = #a4a4a4 +fadedtext = #949494 +errortext = red [Syntax] -background = #002451 -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #fff4cc -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = yellow -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = orange -texthighlight = yellow:96 +background = #002451 +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #fff4cc +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = yellow +optional = blue +spellcheckline = red +errorline = green +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 ab3c4766..4a0bbd9c 100644 --- a/novelwriter/assets/themes/tomorrow_night_bright.conf +++ b/novelwriter/assets/themes/tomorrow_night_bright.conf @@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] -default = #eaeaea -faded = #969896 -red = #d54e53 -orange = #e78c45 -yellow = #e7c547 -green = #b9ca4a -cyan = #70c0b1 -blue = #7aa6da -purple = #c397d8 +default = #eaeaea +faded = #969896 +red = #d54e53 +orange = #e78c45 +yellow = #e7c547 +green = #b9ca4a +cyan = #70c0b1 +blue = #7aa6da +purple = #c397d8 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #2a2a2a @@ -64,28 +64,28 @@ link = blue linkvisited = blue [GUI] -helptext = #a4a4a4 -fadedtext = #949494 -errortext = red +helptext = #a4a4a4 +fadedtext = #949494 +errortext = red [Syntax] -background = #000000 -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #e7d696 -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = yellow -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = orange -texthighlight = yellow:96 +background = #000000 +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #e7d696 +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = yellow +optional = blue +spellcheckline = red +errorline = green +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 ed67eb95..8f9850fa 100644 --- a/novelwriter/assets/themes/tomorrow_night_eighties.conf +++ b/novelwriter/assets/themes/tomorrow_night_eighties.conf @@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] -default = #cccccc -faded = #999999 -red = #f2777a -orange = #f99157 -yellow = #ffcc66 -green = #99cc99 -cyan = #66cccc -blue = #6699cc -purple = #cc99cc +default = #cccccc +faded = #999999 +red = #f2777a +orange = #f99157 +yellow = #ffcc66 +green = #99cc99 +cyan = #66cccc +blue = #6699cc +purple = #cc99cc [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow [Palette] window = #393939 @@ -64,28 +64,28 @@ link = blue linkvisited = blue [GUI] -helptext = #a4a4a4 -fadedtext = #949494 -errortext = red +helptext = #a4a4a4 +fadedtext = #949494 +errortext = red [Syntax] -background = #2d2d2d -text = default -link = blue -headertext = blue -headertag = blue:160 -emphasis = orange -dialog = green -altdialog = yellow -note = #ffe6b3 -hidden = faded -shortcode = blue -keyword = red -tag = purple -value = yellow -optional = blue -spellcheckline = red -errorline = green -replacetag = cyan -modifier = orange -texthighlight = yellow:96 +background = #2d2d2d +text = default +link = blue +headertext = blue +headertag = blue:160 +emphasis = orange +dialog = green +altdialog = yellow +note = #ffe6b3 +hidden = faded +shortcode = blue +keyword = red +tag = purple +value = yellow +optional = blue +spellcheckline = red +errorline = green +replacetag = cyan +modifier = orange +texthighlight = yellow:96 diff --git a/tests/files/all_icons.json b/tests/files/all_icons.json new file mode 100644 index 00000000..3d85f818 --- /dev/null +++ b/tests/files/all_icons.json @@ -0,0 +1,114 @@ +[ + "alert_error", + "alert_info", + "alert_question", + "alert_warn", + + "cls_archive", + "cls_character", + "cls_custom", + "cls_entity", + "cls_none", + "cls_novel", + "cls_object", + "cls_plot", + "cls_template", + "cls_timeline", + "cls_trash", + "cls_world", + + "prj_folder", + "prj_document", + "prj_title", + "prj_chapter", + "prj_scene", + "prj_note", + + "fmt_bold", + "fmt_italic", + "fmt_mark", + "fmt_strike", + "fmt_subscript", + "fmt_superscript", + "fmt_underline", + "fmt_toolbar", + + "search", + "search_cancel", + "search_case", + "search_loop", + "search_preserve", + "search_project", + "search_regex", + "search_replace", + "search_word", + + "bullet-off", + "bullet-on", + "unfold-hide", + "unfold-show", + + "sb_build", + "sb_details", + "sb_novel", + "sb_outline", + "sb_project", + "sb_search", + "sb_stats", + + "theme_light", + "theme_dark", + "theme_auto", + + "add", + "bookmarks", + "browse", + "build_settings", + "cancel", + "checked", + "chevron_down", + "chevron_left", + "chevron_right", + "chevron_up", + "close", + "copy", + "document_add", + "document", + "edit", + "exclude", + "export", + "filter", + "fit_height", + "fit_width", + "folder", + "font", + "import", + "language", + "lines", + "list", + "margin_bottom", + "margin_left", + "margin_right", + "margin_top", + "maximise", + "minimise", + "more_arrow", + "more_vertical", + "noncheckable", + "open", + "panel", + "pin", + "project_copy", + "quote", + "refresh", + "remove", + "revert", + "settings", + "star", + "stats", + "text", + "timer_off", + "timer", + "unchecked", + "view" +] diff --git a/tests/test_gui/test_gui_theme.py b/tests/test_gui/test_gui_theme.py index 107fd125..d14304d1 100644 --- a/tests/test_gui/test_gui_theme.py +++ b/tests/test_gui/test_gui_theme.py @@ -20,6 +20,8 @@ along with this program. If not, see . """ from __future__ import annotations +import json + from configparser import ConfigParser from pathlib import Path from unittest.mock import MagicMock, Mock @@ -563,3 +565,114 @@ def testGuiTheme_LoadDecorations(monkeypatch): assert iconCache.getHeaderDecorationNarrow(4) == iconCache._headerDecNarrow[4] assert iconCache.getHeaderDecorationNarrow(5) == iconCache._headerDecNarrow[5] assert iconCache.getHeaderDecorationNarrow(6) == iconCache._headerDecNarrow[5] + + +THEMES = [] +_listContent(THEMES, CONFIG.assetPath("themes"), ".conf") + + +@pytest.mark.gui +@pytest.mark.parametrize("theme", [a.stem for a in THEMES]) +def testGuiTheme_CheckTheme(theme): + """Test loading all themes.""" + themes = GuiTheme() + themes.iconCache = MagicMock() + themes._scanThemes(THEMES) + + assert theme in themes.colourThemes + current = themes.colourThemes[theme] + if current.dark: + CONFIG.darkTheme = theme + CONFIG.themeMode = nwTheme.DARK + else: + CONFIG.lightTheme = theme + CONFIG.themeMode = nwTheme.LIGHT + + # Check loading + themes.loadTheme() + assert themes._meta.name == current.name + assert themes.isDarkTheme == current.dark + + # Check completeness + parser = ConfigParser() + parser.read(current.path, encoding="utf-8") + + sections = ["Main", "Base", "Project", "Palette", "GUI", "Syntax"] + assert sorted(parser.sections()) == sorted(sections) + + structure = { + "Main": [ + "name", "mode", # The rest are not required + ], + "Base": [ + "default", "faded", "red", "orange", "yellow", "green", "cyan", + "blue", "purple", + ], + "Project": [ + "root", "folder", "file", "title", "chapter", "scene", "note", + ], + "Palette": [ + "window", "windowtext", "base", "alternatebase", "text", + "tooltipbase", "tooltiptext", "button", "buttontext", "brighttext", + "highlight", "highlightedtext", "link", "linkvisited", + ], + "GUI": [ + "helptext", "fadedtext", "errortext", + ], + "Syntax": [ + "background", "text", "link", "headertext", "headertag", + "emphasis", "dialog", "altdialog", "hidden", "note", "shortcode", + "keyword", "tag", "value", "optional", "spellcheckline", + "errorline", "replacetag", "modifier", "texthighlight", + ], + } + optional = ["description", "author", "credit", "url", "license", "licenseurl"] + missing = [] + for section, options in structure.items(): + missing.extend(opt for opt in options if opt not in parser[section]) + assert missing == [], "Missing options in theme file" + + # Check deprecated + deprecated = [] + for section in sections: + deprecated.extend( + opt for opt in parser[section] + if opt not in structure[section] and opt not in optional + ) + assert deprecated == [], "Deprecated options in theme file" + + +ICONS = [] +_listContent(ICONS, CONFIG.assetPath("icons"), ".icons") + + +@pytest.mark.gui +@pytest.mark.parametrize("icons", [a.stem for a in ICONS]) +def testGuiTheme_CheckIcons(icons, tstPaths): + """Test loading all icons.""" + keysFile: Path = tstPaths.filesDir / "all_icons.json" + iconKeys = json.loads(keysFile.read_text(encoding="utf-8")) + assert isinstance(iconKeys, list) + + CONFIG.lightTheme = DEF_GUI_LIGHT + CONFIG.themeMode = nwTheme.LIGHT + + themes = GuiTheme() + themes.initThemes() + iconCache = themes.iconCache + + assert icons in iconCache.iconThemes + current = iconCache.iconThemes[icons] + CONFIG.iconTheme = icons + + # Check loading + iconCache.loadTheme(icons) + assert iconCache._meta.name == current.name + + # Check completeness + missing = [key for key in iconKeys if key not in iconCache._svgData] + assert missing == [], "Missing keys in icons file" + + # Check deprecated + deprecated = [key for key in iconCache._svgData if key not in iconKeys] + assert deprecated == [], "Deprecated keys in icons file" diff --git a/utils/icon_themes.py b/utils/icon_themes.py index 752b29e5..acb2e230 100644 --- a/utils/icon_themes.py +++ b/utils/icon_themes.py @@ -33,6 +33,7 @@ from utils.common import ROOT_DIR UTILS = Path(__file__).parent ET.register_namespace("", "http://www.w3.org/2000/svg") ICONS = [ + # Remember to also update tests/files/all_icons.json for test coverage "alert_error", "alert_info", "alert_question",