Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into Add-Primer-Dark-theme

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-06-04 15:10:46 +02:00
committed by GitHub
parent d850d901e9 d06731ff19
commit e276a5d825
21 changed files with 947 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/assets/themes/cyberpunk_night.conf
+40 -40
View File
@@ -8,24 +8,24 @@ license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Base] [Base]
default = #888888 default = #888888
faded = #616161 faded = #616161
red = #f24817 red = #f24817
orange = #ff960a orange = #ff960a
yellow = #ffff00 yellow = #ffff00
green = #00ff00 green = #00ff00
cyan = #00ffff cyan = #00ffff
blue = #4d4dff blue = #4d4dff
purple = #320064 purple = #320064
[Project] [Project]
root = #4d4dff root = blue
folder = #ffff00 folder = yellow
file = #888888 file = default
title = #00ff00 title = green
chapter = #f24817 chapter = red
scene = #4d4dff scene = blue
note = #ffff00 note = yellow
[Palette] [Palette]
window = #000000 window = #000000
@@ -40,32 +40,32 @@ buttontext = #969696
brighttext = #ffffff brighttext = #ffffff
highlight = #321e50 highlight = #321e50
highlightedtext = #ffffff highlightedtext = #ffffff
link = #4d4dff link = blue
linkvisited = #320050 linkvisited = #320050
[GUI] [GUI]
helptext = #616161 helptext = faded
fadedtext = #616161 fadedtext = faded
errortext = #f24817 errortext = red
[Syntax] [Syntax]
background = #000000 background = #000000
text = #969696 text = #969696
link = #4d4dff link = blue
headertext = #ffffff headertext = #ffffff
headertag = #320064 headertag = purple
emphasis = #00ffff emphasis = cyan
dialog = #00ff00 dialog = green
altdialog = #008cff altdialog = #008cff
note = #969696 note = #969696
hidden = #4d4d64 hidden = #4d4d64
shortcode = #ffff00 shortcode = yellow
keyword = #ff64ff keyword = #ff64ff
tag = #ff960a tag = orange
value = #ff960a value = orange
spellcheckline = #f24817 spellcheckline = red
errorline = #bada04 errorline = #bada04
replacetag = #0000b4 replacetag = #0000b4
modifier = #908eb0 modifier = #908eb0
optional = #b4b4b4 optional = #b4b4b4
texthighlight = #ffff8460 texthighlight = #ffff8460
novelwriter/assets/themes/default_dark.conf
+39 -39
View File
@@ -9,24 +9,24 @@ license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Base] [Base]
default = #cccccc default = #cccccc
faded = #949494 faded = #949494
red = #f2777a red = #f2777a
orange = #f99139 orange = #f99139
yellow = #ffcc66 yellow = #ffcc66
green = #99cc99 green = #99cc99
cyan = #66cccc cyan = #66cccc
blue = #6699cc blue = #6699cc
purple = #cc99cc purple = #cc99cc
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #363636 window = #363636
@@ -45,28 +45,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #363636 background = #363636
text = default text = default
link = blue link = blue
headertext = green headertext = green
headertag = green:160 headertag = green:160
emphasis = orange emphasis = orange
dialog = blue dialog = blue
altdialog = blue altdialog = blue
note = yellow note = yellow
hidden = faded hidden = faded
shortcode = green shortcode = green
keyword = red keyword = red
tag = green tag = green
value = blue value = blue
optional = green optional = green
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = green replacetag = green
modifier = green modifier = green
texthighlight = yellow:72 texthighlight = yellow:72
novelwriter/assets/themes/default_light.conf
+39 -39
View File
@@ -9,24 +9,24 @@ license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Base] [Base]
default = #303030 default = #303030
faded = #6c6c6c faded = #6c6c6c
red = #a62a2d red = #a62a2d
orange = #b36829 orange = #b36829
yellow = #a68542 yellow = #a68542
green = #296629 green = #296629
cyan = #269999 cyan = #269999
blue = #3a70a6 blue = #3a70a6
purple = #b35ab3 purple = #b35ab3
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #efefef window = #efefef
@@ -45,28 +45,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #5c5c5c helptext = #5c5c5c
fadedtext = #6c6c6c fadedtext = #6c6c6c
errortext = red errortext = red
[Syntax] [Syntax]
background = #ffffff background = #ffffff
text = #000000 text = #000000
link = blue link = blue
headertext = green headertext = green
headertag = green:160 headertag = green:160
emphasis = orange emphasis = orange
dialog = blue dialog = blue
altdialog = blue altdialog = blue
note = yellow note = yellow
hidden = faded hidden = faded
shortcode = green shortcode = green
keyword = red keyword = red
tag = green tag = green
value = blue value = blue
optional = green optional = green
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = green replacetag = green
modifier = green modifier = green
texthighlight = #c8c80060 texthighlight = #c8c80060
novelwriter/assets/themes/dracula.conf
+42 -42
View File
@@ -25,24 +25,24 @@ licenseurl = https://github.com/dracula/dracula-theme/blob/main/LICENSE
## ##
[Base] [Base]
default = #e6e6e0 default = #e6e6e0
faded = #6272a4 faded = #6272a4
red = #ff5555 red = #ff5555
orange = #ffb86c orange = #ffb86c
yellow = #f1fa8c yellow = #f1fa8c
green = #50fa7b green = #50fa7b
cyan = #8be9fd cyan = #8be9fd
blue = #93cff9 blue = #93cff9
purple = #bd93f9 purple = #bd93f9
[Project] [Project]
root = #bd93f9 root = purple
folder = #f1fa8c folder = yellow
file = #e6e6e0 file = default
title = #50fa7b title = green
chapter = #ff5555 chapter = red
scene = #8be9fd scene = cyan
note = #f1fa8c note = yellow
[Palette] [Palette]
window = #44475a window = #44475a
@@ -50,39 +50,39 @@ windowtext = #f8f8f2
base = #282a36 base = #282a36
alternatebase = #333645 alternatebase = #333645
text = #f8f8f2 text = #f8f8f2
tooltipbase = #f1fa8c tooltipbase = yellow
tooltiptext = #282a36 tooltiptext = #282a36
button = #505369 button = #505369
buttontext = #f8f8f2 buttontext = #f8f8f2
brighttext = #44475a brighttext = #44475a
highlight = #a681da highlight = #a681da
highlightedtext = #f8f8f2 highlightedtext = #f8f8f2
link = #8be9fd link = cyan
linkvisited = #8be9fd linkvisited = cyan
[GUI] [GUI]
helptext = #ccacf9 helptext = #ccacf9
fadedtext = #6272a4 fadedtext = faded
errortext = #ff5555 errortext = red
[Syntax] [Syntax]
background = #282a36 background = #282a36
text = #f8f8f2 text = #f8f8f2
link = #ff79c6 link = #ff79c6
headertext = #bd93f9 headertext = purple
headertag = #bd93f9a0 headertag = #bd93f9a0
emphasis = #ffb86c emphasis = orange
dialog = #50fa7b dialog = green
altdialog = #f1fa8c altdialog = yellow
note = #ffcce9 note = #ffcce9
hidden = #6272a4 hidden = faded
shortcode = #8be9fd shortcode = cyan
keyword = #ff79c6 keyword = #ff79c6
tag = #ffb86c tag = orange
value = #ffb86c value = orange
optional = #50fa7b optional = green
spellcheckline = #ff5555 spellcheckline = red
errorline = #50fa7b errorline = green
replacetag = #f1fa8c replacetag = yellow
modifier = #8be9fd modifier = cyan
texthighlight = #f1fa8c60 texthighlight = #f1fa8c60
novelwriter/assets/themes/grey_dark.conf
+19 -19
View File
@@ -8,24 +8,24 @@ license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Base] [Base]
default = #cccccc default = #cccccc
faded = #949494 faded = #949494
red = #f2777a red = #f2777a
orange = #f99139 orange = #f99139
yellow = #ffcc66 yellow = #ffcc66
green = #99cc99 green = #99cc99
cyan = #66cccc cyan = #66cccc
blue = #6699cc blue = #6699cc
purple = #cc99cc purple = #cc99cc
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #363636 window = #363636
@@ -44,9 +44,9 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #363636 background = #363636
novelwriter/assets/themes/grey_light.conf
+19 -19
View File
@@ -8,24 +8,24 @@ license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Base] [Base]
default = #303030 default = #303030
faded = #6c6c6c faded = #6c6c6c
red = #a62a2d red = #a62a2d
orange = #b36829 orange = #b36829
yellow = #a68542 yellow = #a68542
green = #296629 green = #296629
cyan = #269999 cyan = #269999
blue = #3a70a6 blue = #3a70a6
purple = #b35ab3 purple = #b35ab3
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #efefef window = #efefef
@@ -44,9 +44,9 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #5c5c5c helptext = #5c5c5c
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #ffffff background = #ffffff
novelwriter/assets/themes/light_owl.conf
+43 -43
View File
@@ -14,7 +14,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
## ##
# Colours: # Colours:
# Background = #fbfbfb # Background = #fbfbfb
# Current Line = #e0e0e0 # Current Line = #eaeaea
# Selection = #e0e0e0 # Selection = #e0e0e0
# Foreground = #403f52 # Foreground = #403f52
# Comment = #989fb1 # Comment = #989fb1
@@ -28,64 +28,64 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
## ##
[Base] [Base]
default = #403f52 default = #403f52
faded = #989fb1 faded = #989fb1
red = #de3d3a red = #de3d3a
orange = #e0af05 orange = #e0af05
yellow = #daaa01 yellow = #daaa01
green = #08916a green = #08916a
cyan = #2aa298 cyan = #2aa298
blue = #288ed7 blue = #288ed7
purple = #964ac1 purple = #964ac1
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #e0e0e0 window = #eaeaea
windowtext = default windowtext = default
base = #fbfbfb base = #fbfbfb
alternatebase = #e0e0e0 alternatebase = #e0e0e0
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #e0e0e0 button = #eaeaea
buttontext = default buttontext = default
brighttext = #e0e0e0 brighttext = #eaeaea
highlight = #3087c6 highlight = #3087c6
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = blue helptext = blue
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #fbfbfb background = #fbfbfb
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #80764b note = #80764b
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = orange value = orange
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = green modifier = green
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/night_owl.conf
+43 -43
View File
@@ -14,7 +14,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
## ##
# Colours: # Colours:
# Background = #011627 # Background = #011627
# Current Line = #32374d # Current Line = #434652
# Selection = #32374d # Selection = #32374d
# Foreground = #d6deeb # Foreground = #d6deeb
# Comment = #637777 # Comment = #637777
@@ -28,64 +28,64 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
## ##
[Base] [Base]
default = #d6deeb default = #d6deeb
faded = #637777 faded = #637777
red = #f78c6c red = #f78c6c
orange = #ecc48d orange = #ecc48d
yellow = #addb67 yellow = #addb67
green = #addb67 green = #addb67
cyan = #7fdbca cyan = #7fdbca
blue = #82aaff blue = #82aaff
purple = #c792ea purple = #c792ea
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #32374d window = #434652
windowtext = default windowtext = default
base = #011627 base = #011627
alternatebase = #32374d alternatebase = #32374d
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #32374d button = #434652
buttontext = default buttontext = default
brighttext = #32374d brighttext = #434652
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = blue helptext = blue
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #011627 background = #011627
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #fff9ca note = #fff9ca
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = orange value = orange
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = green modifier = green
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/snazzy.conf
+46 -46
View File
@@ -21,64 +21,64 @@ licenseurl = https://github.com/loilo/vscode-snazzy-light/blob/master/LICENSE
## ##
[Base] [Base]
default = #565869 default = #565869
faded = #545554 faded = #545554
red = #ff5c57 red = #ff5c57
orange = #f5b900 orange = #f5b900
yellow = #cf9c00 yellow = #cf9c00
green = #2dae58 green = #2dae58
cyan = #13bbb7 cyan = #13bbb7
blue = #09a1ed blue = #09a1ed
purple = #f767bb purple = #f767bb
[Project] [Project]
root = #09a1ed root = blue
folder = #cf9c00 folder = yellow
file = #545554 file = faded
title = #2dae58 title = green
chapter = #ff5c57 chapter = red
scene = #09a1ed scene = blue
note = #cf9c00 note = yellow
[Palette] [Palette]
window = #f3f4f5 window = #f3f4f5
windowtext = #565869 windowtext = default
base = #fafbfc base = #fafbfc
alternatebase = #eaeaeb alternatebase = #eaeaeb
text = #565869 text = default
tooltipbase = #f5e9c2 tooltipbase = #f5e9c2
tooltiptext = #565869 tooltiptext = default
button = #fafbfc button = #fafbfc
buttontext = #565869 buttontext = default
brighttext = #ffffff brighttext = #ffffff
highlight = #09a1ed highlight = blue
highlightedtext = #ffffff highlightedtext = #ffffff
link = #09a1ed link = blue
linkvisited = #09a1ed linkvisited = blue
[GUI] [GUI]
helptext = #09a1ed helptext = blue
fadedtext = #545554 fadedtext = faded
errortext = #ff5c57 errortext = red
[Syntax] [Syntax]
background = #fafbfc background = #fafbfc
text = #565869 text = default
link = #09a1ed link = blue
headertext = #2dae58 headertext = green
headertag = #2dae58a0 headertag = #2dae58a0
emphasis = #f767bb emphasis = purple
dialog = #09a1ed dialog = blue
altdialog = #cf9c00 altdialog = yellow
note = #78bbb9 note = #78bbb9
hidden = #9194a2 hidden = #9194a2
shortcode = #f767bb shortcode = purple
keyword = #09a1ed keyword = blue
tag = #2dae58 tag = green
value = #cf9c00 value = yellow
optional = #cf9c00 optional = yellow
spellcheckline = #ff5c57 spellcheckline = red
errorline = #2dae58 errorline = green
replacetag = #13bbb7 replacetag = cyan
modifier = #f767bb modifier = purple
texthighlight = #cf9c0060 texthighlight = #cf9c0060
novelwriter/assets/themes/solarized_dark.conf
+46 -46
View File
@@ -27,64 +27,64 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE
## ##
[Base] [Base]
default = #e6dfce default = #fdf6e3
faded = #a6a195 faded = #eee8d5
red = #dc322f red = #dc322f
orange = #cb4b16 orange = #cb4b16
yellow = #b58900 yellow = #b58900
green = #859900 green = #859900
cyan = #2aa198 cyan = #2aa198
blue = #268bd2 blue = #268bd2
purple = #6c71c4 purple = #6c71c4
[Project] [Project]
root = #2aa198 root = cyan
folder = #2aa198 folder = cyan
file = #e6dfce file = default
title = #859900 title = green
chapter = #dc322f chapter = red
scene = #268bd2 scene = blue
note = #b58900 note = yellow
[Palette] [Palette]
window = #002b36 window = #002b36
windowtext = #fdf6e3 windowtext = default
base = #073642 base = #073642
alternatebase = #586e75 alternatebase = #586e75
text = #fdf6e3 text = default
tooltipbase = #859900 tooltipbase = yellow
tooltiptext = #002b36 tooltiptext = #002b36
button = #073642 button = #073642
buttontext = #fdf6e3 buttontext = default
brighttext = #073642 brighttext = #073642
highlight = #2aa198 highlight = cyan
highlightedtext = #002b36 highlightedtext = #002b36
link = #268bd2 link = blue
linkvisited = #268bd2 linkvisited = blue
[GUI] [GUI]
helptext = #657b83 helptext = purple
fadedtext = #657b83 fadedtext = faded
errortext = #dc322f errortext = red
[Syntax] [Syntax]
background = #073642 background = #073642
text = #fdf6e3 text = default
link = #268bd2 link = blue
headertext = #93a1a1 headertext = default:196
headertag = #2aa198 headertag = cyan
emphasis = #268bd2 emphasis = blue
dialog = #2aa198 dialog = cyan
altdialog = #2aa198 altdialog = cyan
note = #65a19c note = cyan:196
hidden = #93a1a1 hidden = default:196
shortcode = #93a1a1 shortcode = yellow
keyword = #859900 keyword = green
tag = #cb4b16 tag = orange
value = #cb4b16 value = orange
optional = #93a1a1 optional = cyan:196
spellcheckline = #cb4b16 spellcheckline = orange
errorline = #dc322f errorline = red
replacetag = #859900 replacetag = green
modifier = #b58900 modifier = yellow
texthighlight = #b5890060 texthighlight = yellow:128
novelwriter/assets/themes/solarized_light.conf
+50 -49
View File
@@ -27,64 +27,65 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE
## ##
[Base] [Base]
default = #3b4447 default = #002b36
faded = #4e5b5f faded = #073642
red = #dc322f red = #dc322f
orange = #cb4b16 orange = #cb4b16
yellow = #b58900 yellow = #b58900
green = #859900 green = #859900
cyan = #2aa198 cyan = #2aa198
blue = #268bd2 blue = #268bd2
purple = #6c71c4 purple = #6c71c4
[Project] [Project]
root = #2aa198 root = cyan
folder = #2aa198 folder = cyan
file = #3b4447 file = default
title = #859900 title = green
chapter = #dc322f chapter = red
scene = #268bd2 scene = blue
note = #b58900 note = yellow
[Palette] [Palette]
window = #eee8d5 window = #fdf6e3
windowtext = #002b36 windowtext = default
base = #fdf6e3 base = #eee8d5
alternatebase = #93a1a1 alternatebase = #93a1a1
text = #002b36 text = default
tooltipbase = #859900 tooltipbase = yellow
tooltiptext = #002b36 tooltiptext = #002b36
button = #eee8d5 button = #eee8d5
buttontext = #002b36 buttontext = default
brighttext = #fdf6e3 brighttext = #eee8d5
highlight = #2aa198 highlight = cyan
highlightedtext = #fdf6e3 highlightedtext = #fdf6e3
link = #268bd2 link = blue
linkvisited = #268bd2 linkvisited = blue
[GUI] [GUI]
helptext = #4e5b5f helptext = purple
fadedtext = #4e5b5f fadedtext = faded
errortext = #dc322f errortext = red
[Syntax] [Syntax]
background = #fdf6e3 background = #eee8d5
text = #002b36 text = default
link = #268bd2 link = blue
headertext = #586e75 headertext = default:196
headertag = #2aa198 headertag = cyan
emphasis = #268bd2 emphasis = blue
dialog = #2aa198 dialog = cyan
altdialog = #2aa198 altdialog = cyan
note = #1b6660 note = cyan:196
hidden = #586e75 hidden = default:196
shortcode = #586e75 shortcode = yellow
keyword = #859900 keyword = green
tag = #cb4b16 tag = orange
value = #cb4b16 value = orange
optional = #586e75 optional = cyan:196
spellcheckline = #cb4b16 spellcheckline = orange
errorline = #dc322f errorline = red
replacetag = #859900 replacetag = green
modifier = #b58900 modifier = yellow
texthighlight = #b5890060 texthighlight = yellow:128
novelwriter/assets/themes/tango_dark.conf
+49 -49
View File
@@ -5,37 +5,37 @@ author = Veronica Berglyd Olsen (adaptation)
## ##
# Colours: # Colours:
# Background = 30302f : 48, 48, 47 # Background = #30302f
# Foreground = eeeeec : 238, 238, 236 # Foreground = #eeeeec
# Comment = 8f8f8d : 143, 143, 141 # Comment = #8f8f8d
# Red = ef2929 : 239, 41, 41 # Red = #ef2929
# Orange = c4a000 : 196, 160, 0 # Orange = #c4a000
# Yellow = fce94f : 252, 233, 79 # Yellow = #fce94f
# Green = 8ae234 : 138, 226, 52 # Green = #8ae234
# Cyan = 34e2e2 : 52, 226, 226 # Cyan = #34e2e2
# Blue = 3465a4 : 114, 159, 207 # Blue = #3465a4
# Purple = ad7fa8 : 173, 127, 168 # Purple = #ad7fa8
## ##
[Base] [Base]
default = #eeeeec default = #eeeeec
faded = #babdb6 faded = #babdb6
red = #ef2929 red = #ef2929
orange = #fcaf3e orange = #fcaf3e
yellow = #fce94f yellow = #fce94f
green = #8ae234 green = #8ae234
cyan = #34e2e2 cyan = #34e2e2
blue = #729fcf blue = #729fcf
purple = #ad7fa8 purple = #ad7fa8
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #555753 window = #555753
@@ -54,28 +54,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #e9b96e helptext = #e9b96e
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #2e3436 background = #2e3436
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #fcf2a4 note = #fcf2a4
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = red value = red
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = blue modifier = blue
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/tango_light.conf
+49 -49
View File
@@ -5,37 +5,37 @@ author = Veronica Berglyd Olsen (adaptation)
## ##
# Colours: # Colours:
# Background = #eeeeec # Background = #eeeeec
# Foreground = #2e3436 # Foreground = #2e3436
# Comment = 8f8f8d : 143, 143, 141 # Comment = #8f8f8d
# Red = #a40000 # Red = #a40000
# Orange = c4a000 : 196, 160, 0 # Orange = #c4a000
# Yellow = fce94f : 252, 233, 79 # Yellow = #fce94f
# Green = 8ae234 : 138, 226, 52 # Green = #8ae234
# Cyan = 34e2e2 : 52, 226, 226 # Cyan = #34e2e2
# Blue = 3465a4 : 114, 159, 207 # Blue = #3465a4
# Purple = ad7fa8 : 173, 127, 168 # Purple = #ad7fa8
## ##
[Base] [Base]
default = #2e3436 default = #2e3436
faded = #888a85 faded = #888a85
red = #a40000 red = #a40000
orange = #ce5c00 orange = #ce5c00
yellow = #c4a000 yellow = #c4a000
green = #4e9a06 green = #4e9a06
cyan = #069a9a cyan = #069a9a
blue = #204a87 blue = #204a87
purple = #5c3566 purple = #5c3566
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #d3d7cf window = #d3d7cf
@@ -54,28 +54,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #8f5902 helptext = #8f5902
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #eeeeec background = #eeeeec
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #a78800 note = #a78800
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = red value = red
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = blue modifier = blue
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/tomorrow.conf
+39 -39
View File
@@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
default = #484848 default = #484848
faded = #6c6c6c faded = #6c6c6c
red = #c82829 red = #c82829
orange = #f5871f orange = #f5871f
yellow = #eab700 yellow = #eab700
green = #718c00 green = #718c00
cyan = #3e999f cyan = #3e999f
blue = #4271ae blue = #4271ae
purple = #8959a8 purple = #8959a8
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #efefef window = #efefef
@@ -64,28 +64,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #5c5c5c helptext = #5c5c5c
fadedtext = faded fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #ffffff background = #ffffff
text = #4d4d4c text = #4d4d4c
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #b38c00 note = #b38c00
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = yellow value = yellow
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = orange modifier = orange
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/tomorrow_night.conf
+39 -39
View File
@@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
default = #c5c8c6 default = #c5c8c6
faded = #969896 faded = #969896
red = #cc6666 red = #cc6666
orange = #de935f orange = #de935f
yellow = #f0c674 yellow = #f0c674
green = #b5bd68 green = #b5bd68
cyan = #8abeb7 cyan = #8abeb7
blue = #81a2be blue = #81a2be
purple = #b294bb purple = #b294bb
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #282a2e window = #282a2e
@@ -64,28 +64,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
fadedtext = #949494 fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #1d1f21 background = #1d1f21
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #f0dbb2 note = #f0dbb2
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = yellow value = yellow
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = orange modifier = orange
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/tomorrow_night_blue.conf
+39 -39
View File
@@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
default = #ffffff default = #ffffff
faded = #7285b7 faded = #7285b7
red = #ff9da4 red = #ff9da4
orange = #ffc58f orange = #ffc58f
yellow = #ffeead yellow = #ffeead
green = #d1f1a9 green = #d1f1a9
cyan = #99ffff cyan = #99ffff
blue = #bbdaff blue = #bbdaff
purple = #ebbbff purple = #ebbbff
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #00346e window = #00346e
@@ -64,28 +64,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
fadedtext = #949494 fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #002451 background = #002451
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #fff4cc note = #fff4cc
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = yellow value = yellow
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = orange modifier = orange
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/tomorrow_night_bright.conf
+39 -39
View File
@@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
default = #eaeaea default = #eaeaea
faded = #969896 faded = #969896
red = #d54e53 red = #d54e53
orange = #e78c45 orange = #e78c45
yellow = #e7c547 yellow = #e7c547
green = #b9ca4a green = #b9ca4a
cyan = #70c0b1 cyan = #70c0b1
blue = #7aa6da blue = #7aa6da
purple = #c397d8 purple = #c397d8
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #2a2a2a window = #2a2a2a
@@ -64,28 +64,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
fadedtext = #949494 fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #000000 background = #000000
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #e7d696 note = #e7d696
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = yellow value = yellow
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = orange modifier = orange
texthighlight = yellow:96 texthighlight = yellow:96
novelwriter/assets/themes/tomorrow_night_eighties.conf
+39 -39
View File
@@ -28,24 +28,24 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
default = #cccccc default = #cccccc
faded = #999999 faded = #999999
red = #f2777a red = #f2777a
orange = #f99157 orange = #f99157
yellow = #ffcc66 yellow = #ffcc66
green = #99cc99 green = #99cc99
cyan = #66cccc cyan = #66cccc
blue = #6699cc blue = #6699cc
purple = #cc99cc purple = #cc99cc
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
[Palette] [Palette]
window = #393939 window = #393939
@@ -64,28 +64,28 @@ link = blue
linkvisited = blue linkvisited = blue
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
fadedtext = #949494 fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #2d2d2d background = #2d2d2d
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
headertag = blue:160 headertag = blue:160
emphasis = orange emphasis = orange
dialog = green dialog = green
altdialog = yellow altdialog = yellow
note = #ffe6b3 note = #ffe6b3
hidden = faded hidden = faded
shortcode = blue shortcode = blue
keyword = red keyword = red
tag = purple tag = purple
value = yellow value = yellow
optional = blue optional = blue
spellcheckline = red spellcheckline = red
errorline = green errorline = green
replacetag = cyan replacetag = cyan
modifier = orange modifier = orange
texthighlight = yellow:96 texthighlight = yellow:96
tests/files/all_icons.json
+114
View File
@@ -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"
]
tests/test_gui/test_gui_theme.py
+113
View File
@@ -20,6 +20,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
""" """
from __future__ import annotations from __future__ import annotations
import json
from configparser import ConfigParser from configparser import ConfigParser
from pathlib import Path from pathlib import Path
from unittest.mock import MagicMock, Mock from unittest.mock import MagicMock, Mock
@@ -563,3 +565,114 @@ def testGuiTheme_LoadDecorations(monkeypatch):
assert iconCache.getHeaderDecorationNarrow(4) == iconCache._headerDecNarrow[4] assert iconCache.getHeaderDecorationNarrow(4) == iconCache._headerDecNarrow[4]
assert iconCache.getHeaderDecorationNarrow(5) == iconCache._headerDecNarrow[5] assert iconCache.getHeaderDecorationNarrow(5) == iconCache._headerDecNarrow[5]
assert iconCache.getHeaderDecorationNarrow(6) == 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"
utils/icon_themes.py
+1
View File
@@ -33,6 +33,7 @@ from utils.common import ROOT_DIR
UTILS = Path(__file__).parent UTILS = Path(__file__).parent
ET.register_namespace("", "http://www.w3.org/2000/svg") ET.register_namespace("", "http://www.w3.org/2000/svg")
ICONS = [ ICONS = [
# Remember to also update tests/files/all_icons.json for test coverage
"alert_error", "alert_error",
"alert_info", "alert_info",
"alert_question", "alert_question",