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

Add more theme fields (#2384)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-06-05 22:03:57 +02:00
committed by GitHub
parent 33f4efc5b1 8c0f3b037a
commit 1e58c47286
26 changed files with 412 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/assets/themes/cyberpunk_night.conf
+15 -10
View File
@@ -8,6 +8,7 @@ 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]
base = #000000
default = #888888 default = #888888
faded = #616161 faded = #616161
red = #f24817 red = #f24817
@@ -19,18 +20,21 @@ blue = #4d4dff
purple = #320064 purple = #320064
[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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #000000 window = base
windowtext = #969696 windowtext = #969696
base = #000000 base = base
alternatebase = #282828 alternatebase = #282828
text = #969696 text = #969696
tooltipbase = #281446 tooltipbase = #281446
@@ -42,6 +46,7 @@ highlight = #321e50
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = #320050 linkvisited = #320050
accent = #321e50
[GUI] [GUI]
helptext = faded helptext = faded
@@ -49,7 +54,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #000000 background = base
text = #969696 text = #969696
link = blue link = blue
headertext = #ffffff headertext = #ffffff
novelwriter/assets/themes/default_dark.conf
+19 -14
View File
@@ -9,10 +9,11 @@ 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]
base = #373737
default = #cccccc default = #cccccc
faded = #949494 faded = #949494
red = #f2777a red = #ff6666
orange = #f99139 orange = #ff9966
yellow = #ffcc66 yellow = #ffcc66
green = #99cc99 green = #99cc99
cyan = #66cccc cyan = #66cccc
@@ -20,29 +21,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #363636 window = #303030
windowtext = default windowtext = default
base = #3e3e3e base = base
alternatebase = #4e4e4e alternatebase = #4e4e4e
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #3e3e3e button = base
buttontext = default buttontext = default
brighttext = #3e3e3e brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
@@ -50,7 +55,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #363636 background = base
text = default text = default
link = blue link = blue
headertext = green headertext = green
novelwriter/assets/themes/default_light.conf
+23 -18
View File
@@ -9,40 +9,45 @@ 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]
base = #fcfcfc
default = #303030 default = #303030
faded = #6c6c6c faded = #6c6c6c
red = #a62a2d red = #a62a2d
orange = #b36829 orange = #b36829
yellow = #a68542 yellow = #a39c34
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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #efefef window = #efefef
windowtext = #000000 windowtext = default
base = #ffffff base = base
alternatebase = #e0e0e0 alternatebase = #e0e0e0
text = #000000 text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #efefef button = #efefef
buttontext = #000000 buttontext = default
brighttext = #ffffff brighttext = base
highlight = #3087c6 highlight = #3087c6
highlightedtext = #ffffff highlightedtext = base
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #3087c6
[GUI] [GUI]
helptext = #5c5c5c helptext = #5c5c5c
@@ -50,15 +55,15 @@ fadedtext = #6c6c6c
errortext = red errortext = red
[Syntax] [Syntax]
background = #ffffff background = base
text = #000000 text = default
link = blue link = blue
headertext = green headertext = green
headertag = green:L135 headertag = green:L135
emphasis = orange emphasis = orange
dialog = blue dialog = blue
altdialog = blue altdialog = blue
note = yellow note = yellow:D125
hidden = faded hidden = faded
shortcode = green shortcode = green
keyword = red keyword = red
@@ -69,4 +74,4 @@ spellcheckline = red
errorline = green errorline = green
replacetag = green replacetag = green
modifier = green modifier = green
texthighlight = #c8c80060 texthighlight = yellow:72
novelwriter/assets/themes/dracula.conf
+16 -11
View File
@@ -25,6 +25,7 @@ licenseurl = https://github.com/dracula/dracula-theme/blob/main/LICENSE
## ##
[Base] [Base]
base = #282a36
default = #e6e6e0 default = #e6e6e0
faded = #6272a4 faded = #6272a4
red = #ff5555 red = #ff5555
@@ -36,29 +37,33 @@ blue = #93cff9
purple = #bd93f9 purple = #bd93f9
[Project] [Project]
root = purple root = purple
folder = yellow folder = yellow
file = default file = default
title = green title = green
chapter = red chapter = red
scene = cyan scene = cyan
note = yellow note = yellow
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #44475a window = #44475a
windowtext = #f8f8f2 windowtext = #f8f8f2
base = #282a36 base = base
alternatebase = #333645 alternatebase = #333645
text = #f8f8f2 text = #f8f8f2
tooltipbase = yellow tooltipbase = yellow
tooltiptext = #282a36 tooltiptext = base
button = #505369 button = #505369
buttontext = #f8f8f2 buttontext = #f8f8f2
brighttext = #44475a brighttext = base
highlight = #a681da highlight = #a681da
highlightedtext = #f8f8f2 highlightedtext = #f8f8f2
link = cyan link = cyan
linkvisited = cyan linkvisited = cyan
accent = #a681da
[GUI] [GUI]
helptext = #ccacf9 helptext = #ccacf9
@@ -66,7 +71,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #282a36 background = base
text = #f8f8f2 text = #f8f8f2
link = #ff79c6 link = #ff79c6
headertext = purple headertext = purple
novelwriter/assets/themes/grey_dark.conf
+15 -10
View File
@@ -8,6 +8,7 @@ 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]
base = #3e3e3e
default = #c8c8c8 default = #c8c8c8
faded = #949494 faded = #949494
red = #f2777a red = #f2777a
@@ -19,29 +20,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #363636 window = #363636
windowtext = default windowtext = default
base = #3e3e3e base = base
alternatebase = #4e4e4e alternatebase = #4e4e4e
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #3e3e3e button = base
buttontext = default buttontext = default
brighttext = #3e3e3e brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = default:D120 helptext = default:D120
novelwriter/assets/themes/grey_light.conf
+16 -11
View File
@@ -8,6 +8,7 @@ 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]
base = #ffffff
default = #282828 default = #282828
faded = #6c6c6c faded = #6c6c6c
red = #a62a2d red = #a62a2d
@@ -19,29 +20,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #efefef window = #efefef
windowtext = default windowtext = default
base = #ffffff base = base
alternatebase = #e0e0e0 alternatebase = #e0e0e0
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #efefef button = #efefef
buttontext = default buttontext = default
brighttext = #ffffff brighttext = base
highlight = #3087c6 highlight = #3087c6
highlightedtext = #ffffff highlightedtext = base
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #3087c6
[GUI] [GUI]
helptext = default:L225 helptext = default:L225
@@ -49,7 +54,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #ffffff background = base
text = default text = default
link = default link = default
headertext = default:D200 headertext = default:D200
novelwriter/assets/themes/light_owl.conf
+16 -11
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
## ##
[Base] [Base]
base = #fbfbfb
default = #403f52 default = #403f52
faded = #989fb1 faded = #989fb1
red = #de3d3a red = #de3d3a
@@ -39,29 +40,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #eaeaea window = #eaeaea
windowtext = default windowtext = default
base = #fbfbfb base = base
alternatebase = #e0e0e0 alternatebase = #e0e0e0
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #eaeaea button = base
buttontext = default buttontext = default
brighttext = #eaeaea brighttext = base
highlight = #3087c6 highlight = #3087c6
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #3087c6
[GUI] [GUI]
helptext = blue helptext = blue
@@ -69,7 +74,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #fbfbfb background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/night_owl.conf
+16 -11
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
## ##
[Base] [Base]
base = #011627
default = #d6deeb default = #d6deeb
faded = #637777 faded = #637777
red = #f78c6c red = #f78c6c
@@ -39,29 +40,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #434652 window = #434652
windowtext = default windowtext = default
base = #011627 base = base
alternatebase = #32374d alternatebase = #32374d
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #434652 button = base
buttontext = default buttontext = default
brighttext = #434652 brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = blue helptext = blue
@@ -69,7 +74,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #011627 background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/primer_dark.conf
+34 -29
View File
@@ -1,40 +1,44 @@
[Main] [Main]
name = Primer Dark name = Primer Dark
mode = dark mode = dark
author = Myian (adaptation) author = Myian (adaptation)
credit = GitHub Inc. credit = GitHub Inc.
url = https://github.com/primer url = https://github.com/primer
license = MIT License license = MIT License
licenseurl = https://github.com/primer/brand/blob/main/LICENSE licenseurl = https://github.com/primer/brand/blob/main/LICENSE
[Base] [Base]
default = #f0f6fc base = #0c1117
faded = #a3b0be default = #f0f6fc
red = #ff7b72 faded = #a3b0be
orange = #ffa657 red = #ff7b72
yellow = #f8e3a1 orange = #ffa657
green = #7ee787 yellow = #f8e3a1
cyan = #57CCC5 green = #7ee787
blue = #79c0ff cyan = #57CCC5
purple = #bc8cff blue = #79c0ff
purple = #bc8cff
[Project] [Project]
root = purple root = purple
folder = orange folder = orange
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #141b23 window = #141b23
windowtext = default windowtext = default
base = #0c1117 base = base
alternatebase = #1e242a alternatebase = #1e242a
text = default text = default
tooltipbase = yellow tooltipbase = yellow
tooltiptext = #0c1117 tooltiptext = base
button = #212830 button = #212830
buttontext = default buttontext = default
brighttext = default brighttext = default
@@ -42,14 +46,15 @@ highlight = #104C35
highlightedtext = default highlightedtext = default
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #104C35
[GUI] [GUI]
helptext = faded helptext = faded
fadedtext = faded:128 fadedtext = faded:128
errortext = #f85149 errortext = #f85149
[Syntax] [Syntax]
background = #0c1117 background = base
text = faded text = faded
link = blue link = blue
headertext = default headertext = default
novelwriter/assets/themes/primer_light.conf
+33 -28
View File
@@ -1,36 +1,40 @@
[Main] [Main]
name = Primer Light name = Primer Light
mode = light mode = light
author = Myian (adaptation) author = Myian (adaptation)
credit = GitHub Inc. credit = GitHub Inc.
url = https://github.com/primer url = https://github.com/primer
license = MIT License license = MIT License
licenseurl = https://github.com/primer/brand/blob/main/LICENSE licenseurl = https://github.com/primer/brand/blob/main/LICENSE
[Base] [Base]
default = #1f2328 base = #ffffff
faded = #59636e default = #1f2328
red = #fa4549 faded = #59636e
orange = #e16f24 red = #fa4549
yellow = #d4a72c orange = #e16f24
green = #2da44e yellow = #d4a72c
cyan = #339D9B green = #2da44e
blue = #0969da cyan = #339D9B
purple = #a475f9 blue = #0969da
purple = #a475f9
[Project] [Project]
root = purple root = purple
folder = orange folder = orange
file = faded file = faded
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #eaeef2 window = #eaeef2
windowtext = default windowtext = default
base = #ffffff base = base
alternatebase = #dfe4e9 alternatebase = #dfe4e9
text = default text = default
tooltipbase = #fae17d tooltipbase = #fae17d
@@ -42,14 +46,15 @@ highlight = #dafbe1
highlightedtext = #1a7f37 highlightedtext = #1a7f37
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #dafbe1
[GUI] [GUI]
helptext = faded helptext = faded
fadedtext = faded:128 fadedtext = faded:128
errortext = #cf222e errortext = #cf222e
[Syntax] [Syntax]
background = #ffffff background = base
text = faded text = faded
link = blue link = blue
headertext = default headertext = default
novelwriter/assets/themes/snazzy.conf
+16 -11
View File
@@ -21,6 +21,7 @@ licenseurl = https://github.com/loilo/vscode-snazzy-light/blob/master/LICENSE
## ##
[Base] [Base]
base = #fafbfc
default = #565869 default = #565869
faded = #545554 faded = #545554
red = #ff5c57 red = #ff5c57
@@ -32,29 +33,33 @@ blue = #09a1ed
purple = #f767bb purple = #f767bb
[Project] [Project]
root = blue root = blue
folder = yellow folder = yellow
file = faded file = faded
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #f3f4f5 window = #f3f4f5
windowtext = default windowtext = default
base = #fafbfc base = base
alternatebase = #eaeaeb alternatebase = #eaeaeb
text = default text = default
tooltipbase = #f5e9c2 tooltipbase = #f5e9c2
tooltiptext = default tooltiptext = default
button = #fafbfc button = base
buttontext = default buttontext = default
brighttext = #ffffff brighttext = base
highlight = blue highlight = blue
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = blue
[GUI] [GUI]
helptext = blue helptext = blue
@@ -62,7 +67,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #fafbfc background = base
text = default text = default
link = blue link = blue
headertext = green headertext = green
novelwriter/assets/themes/solarized_dark.conf
+16 -11
View File
@@ -27,6 +27,7 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE
## ##
[Base] [Base]
base = #073642
default = #fdf6e3 default = #fdf6e3
faded = #eee8d5 faded = #eee8d5
red = #dc322f red = #dc322f
@@ -38,29 +39,33 @@ blue = #268bd2
purple = #6c71c4 purple = #6c71c4
[Project] [Project]
root = cyan root = cyan
folder = cyan folder = cyan
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #002b36 window = #002b36
windowtext = default windowtext = default
base = #073642 base = base
alternatebase = #586e75 alternatebase = #586e75
text = default text = default
tooltipbase = yellow tooltipbase = yellow
tooltiptext = #002b36 tooltiptext = #002b36
button = #073642 button = base
buttontext = default buttontext = default
brighttext = #073642 brighttext = base
highlight = cyan highlight = cyan
highlightedtext = default highlightedtext = default
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = cyan
[GUI] [GUI]
helptext = cyan helptext = cyan
@@ -68,7 +73,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #073642 background = base
text = default text = default
link = blue link = blue
headertext = default:D125 headertext = default:D125
novelwriter/assets/themes/solarized_light.conf
+16 -12
View File
@@ -27,6 +27,7 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE
## ##
[Base] [Base]
base = #eee8d5
default = #002b36 default = #002b36
faded = #073642 faded = #073642
red = #dc322f red = #dc322f
@@ -38,30 +39,33 @@ blue = #268bd2
purple = #6c71c4 purple = #6c71c4
[Project] [Project]
root = cyan root = cyan
folder = cyan folder = cyan
file = default file = default
title = green title = green
chapter = red chapter = red
scene = blue scene = blue
note = yellow note = yellow
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #fdf6e3 window = #fdf6e3
windowtext = default windowtext = default
base = #eee8d5 base = base
alternatebase = #93a1a1 alternatebase = #93a1a1
text = default text = default
tooltipbase = yellow tooltipbase = yellow
tooltiptext = #002b36 tooltiptext = #002b36
button = #eee8d5 button = base
buttontext = default buttontext = default
brighttext = #eee8d5 brighttext = base
highlight = cyan highlight = cyan
highlightedtext = default highlightedtext = default
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = cyan
[GUI] [GUI]
helptext = cyan helptext = cyan
@@ -69,7 +73,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #eee8d5 background = base
text = default text = default
link = blue link = blue
headertext = default:L125 headertext = default:L125
novelwriter/assets/themes/tango_dark.conf
+14 -9
View File
@@ -18,6 +18,7 @@ author = Veronica Berglyd Olsen (adaptation)
## ##
[Base] [Base]
base = #2e3436
default = #eeeeec default = #eeeeec
faded = #babdb6 faded = #babdb6
red = #ef2929 red = #ef2929
@@ -29,18 +30,21 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #555753 window = #555753
windowtext = default windowtext = default
base = #2e3436 base = base
alternatebase = #454e51 alternatebase = #454e51
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
@@ -52,6 +56,7 @@ highlight = blue
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = blue
[GUI] [GUI]
helptext = orange helptext = orange
@@ -59,7 +64,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #2e3436 background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/tango_light.conf
+14 -9
View File
@@ -18,6 +18,7 @@ author = Veronica Berglyd Olsen (adaptation)
## ##
[Base] [Base]
base = #eeeeec
default = #2e3436 default = #2e3436
faded = #888a85 faded = #888a85
red = #a40000 red = #a40000
@@ -29,18 +30,21 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #d3d7cf window = #d3d7cf
windowtext = default windowtext = default
base = #eeeeec base = base
alternatebase = #e0e0e0 alternatebase = #e0e0e0
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
@@ -52,6 +56,7 @@ highlight = blue:L200
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = blue:L150
[GUI] [GUI]
helptext = orange helptext = orange
@@ -59,7 +64,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #eeeeec background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/tomorrow.conf
+15 -10
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
base = #ffffff
default = #484848 default = #484848
faded = #6c6c6c faded = #6c6c6c
red = #c82829 red = #c82829
@@ -39,18 +40,21 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #efefef window = #efefef
windowtext = #000000 windowtext = #000000
base = #ffffff base = base
alternatebase = #d6d6d6 alternatebase = #d6d6d6
text = #000000 text = #000000
tooltipbase = #ffffc0 tooltipbase = #ffffc0
@@ -59,9 +63,10 @@ button = #efefef
buttontext = #000000 buttontext = #000000
brighttext = #efefef brighttext = #efefef
highlight = blue highlight = blue
highlightedtext = #ffffff highlightedtext = base
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = blue
[GUI] [GUI]
helptext = #5c5c5c helptext = #5c5c5c
@@ -69,7 +74,7 @@ fadedtext = faded
errortext = red errortext = red
[Syntax] [Syntax]
background = #ffffff background = base
text = #4d4d4c text = #4d4d4c
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/tomorrow_night.conf
+16 -11
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
base = #1d1f21
default = #c5c8c6 default = #c5c8c6
faded = #969896 faded = #969896
red = #cc6666 red = #cc6666
@@ -39,29 +40,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #282a2e window = #282a2e
windowtext = default windowtext = default
base = #1d1f21 base = base
alternatebase = #373b41 alternatebase = #373b41
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #1d1f21 button = base
buttontext = default buttontext = default
brighttext = #1d1f21 brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
@@ -69,7 +74,7 @@ fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #1d1f21 background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/tomorrow_night_blue.conf
+16 -11
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
base = #002451
default = #ffffff default = #ffffff
faded = #7285b7 faded = #7285b7
red = #ff9da4 red = #ff9da4
@@ -39,29 +40,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #00346e window = #00346e
windowtext = default windowtext = default
base = #002451 base = base
alternatebase = #003f8e alternatebase = #003f8e
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #002451 button = base
buttontext = default buttontext = default
brighttext = #002451 brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
@@ -69,7 +74,7 @@ fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #002451 background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/tomorrow_night_bright.conf
+16 -11
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
base = #000000
default = #eaeaea default = #eaeaea
faded = #969896 faded = #969896
red = #d54e53 red = #d54e53
@@ -39,29 +40,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #2a2a2a window = #2a2a2a
windowtext = default windowtext = default
base = #000000 base = base
alternatebase = #424242 alternatebase = #424242
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #000000 button = base
buttontext = default buttontext = default
brighttext = #000000 brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
@@ -69,7 +74,7 @@ fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #000000 background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/assets/themes/tomorrow_night_eighties.conf
+16 -11
View File
@@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
## ##
[Base] [Base]
base = #2d2d2d
default = #cccccc default = #cccccc
faded = #999999 faded = #999999
red = #f2777a red = #f2777a
@@ -39,29 +40,33 @@ 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
active = green
inactive = red
disabled = faded
[Palette] [Palette]
window = #393939 window = #393939
windowtext = default windowtext = default
base = #2d2d2d base = base
alternatebase = #515151 alternatebase = #515151
text = default text = default
tooltipbase = #ffffc0 tooltipbase = #ffffc0
tooltiptext = #15150d tooltiptext = #15150d
button = #2d2d2d button = base
buttontext = default buttontext = default
brighttext = #2d2d2d brighttext = base
highlight = #2c98f7 highlight = #2c98f7
highlightedtext = #ffffff highlightedtext = #ffffff
link = blue link = blue
linkvisited = blue linkvisited = blue
accent = #2c98f7
[GUI] [GUI]
helptext = #a4a4a4 helptext = #a4a4a4
@@ -69,7 +74,7 @@ fadedtext = #949494
errortext = red errortext = red
[Syntax] [Syntax]
background = #2d2d2d background = base
text = default text = default
link = blue link = blue
headertext = blue headertext = blue
novelwriter/constants.py
+1
View File
@@ -445,6 +445,7 @@ class nwLabels:
THEME_COLORS: Final[dict[str, str]] = { THEME_COLORS: Final[dict[str, str]] = {
"theme": QT_TRANSLATE_NOOP("Constant", "Theme Colours"), "theme": QT_TRANSLATE_NOOP("Constant", "Theme Colours"),
"default": QT_TRANSLATE_NOOP("Constant", "Foreground Colour"), "default": QT_TRANSLATE_NOOP("Constant", "Foreground Colour"),
"base": QT_TRANSLATE_NOOP("Constant", "Background Colour"),
"faded": QT_TRANSLATE_NOOP("Constant", "Faded Colour"), "faded": QT_TRANSLATE_NOOP("Constant", "Faded Colour"),
"red": QT_TRANSLATE_NOOP("Constant", "Red"), "red": QT_TRANSLATE_NOOP("Constant", "Red"),
"orange": QT_TRANSLATE_NOOP("Constant", "Orange"), "orange": QT_TRANSLATE_NOOP("Constant", "Orange"),
novelwriter/core/item.py
+4 -4
View File
@@ -363,13 +363,13 @@ class NWItem:
""" """
if self.isFileType(): if self.isFileType():
key = "checked" if self._active else "unchecked" key = "checked" if self._active else "unchecked"
color = "green" if self._active else "red" color = "active" if self._active else "inactive"
text = trConst(nwLabels.ACTIVE_NAME[key]) text = trConst(nwLabels.ACTIVE_NAME[key])
icon = SHARED.theme.getIcon(key, color)
else: else:
key = "noncheckable"
color = "disabled"
text = "" text = ""
icon = SHARED.theme.getIcon("noncheckable", "faded") return text, SHARED.theme.getIcon(key, color)
return text, icon
## ##
# Checker Methods # Checker Methods
novelwriter/extensions/switch.py
+5 -2
View File
@@ -33,7 +33,7 @@ from novelwriter.types import QtNoPen, QtPaintAntiAlias, QtSizeFixed
class NSwitch(QAbstractButton): class NSwitch(QAbstractButton):
__slots__ = ("_offset", "_rH", "_rR", "_xH", "_xR", "_xW") __slots__ = ("_cOff", "_cOn", "_offset", "_rH", "_rR", "_xH", "_xR", "_xW")
def __init__(self, parent: QWidget, height: int = 0) -> None: def __init__(self, parent: QWidget, height: int = 0) -> None:
super().__init__(parent=parent) super().__init__(parent=parent)
@@ -44,6 +44,9 @@ class NSwitch(QAbstractButton):
self._rH = self._xH - 4 self._rH = self._xH - 4
self._rR = self._xR - 2 self._rR = self._xR - 2
self._cOn = SHARED.theme.accentCol
self._cOff = self.palette().alternateBase()
self.setCheckable(True) self.setCheckable(True)
self.setSizePolicy(QtSizeFixed, QtSizeFixed) self.setSizePolicy(QtSizeFixed, QtSizeFixed)
self.setFixedWidth(self._xW) self.setFixedWidth(self._xW)
@@ -97,7 +100,7 @@ class NSwitch(QAbstractButton):
painter.setOpacity(1.0 if self.isEnabled() else 0.5) painter.setOpacity(1.0 if self.isEnabled() else 0.5)
painter.setPen(palette.highlight().color() if self.hasFocus() else palette.mid().color()) painter.setPen(palette.highlight().color() if self.hasFocus() else palette.mid().color())
painter.setBrush(palette.highlight() if self.isChecked() else palette.alternateBase()) painter.setBrush(self._cOn if self.isChecked() else self._cOff)
painter.drawRoundedRect(0, 0, self._xW, self._xH, self._xR, self._xR) painter.drawRoundedRect(0, 0, self._xW, self._xH, self._xR, self._xR)
painter.setPen(QtNoPen) painter.setPen(QtNoPen)
novelwriter/gui/itemdetails.py
+2 -8
View File
@@ -233,14 +233,8 @@ class GuiItemDetails(QWidget):
# Label # Label
# ===== # =====
if nwItem.isFileType(): _, icon = nwItem.getActiveStatus()
if nwItem.isActive: self.labelIcon.setPixmap(icon.pixmap(iPx, iPx))
self.labelIcon.setPixmap(SHARED.theme.getPixmap("checked", (iPx, iPx), "green"))
else:
self.labelIcon.setPixmap(SHARED.theme.getPixmap("unchecked", (iPx, iPx), "red"))
else:
self.labelIcon.setPixmap(SHARED.theme.getPixmap("noncheckable", (iPx, iPx), "faded"))
self.labelData.setText(elide(nwItem.itemName, 100)) self.labelData.setText(elide(nwItem.itemName, 100))
# Status # Status
novelwriter/gui/theme.py
+38 -27
View File
@@ -108,7 +108,7 @@ class GuiTheme:
__slots__ = ( __slots__ = (
"_allThemes", "_currentTheme", "_darkThemes", "_guiPalette", "_lightThemes", "_meta", "_allThemes", "_currentTheme", "_darkThemes", "_guiPalette", "_lightThemes", "_meta",
"_qColors", "_styleSheets", "_svgColors", "_syntaxList", "baseButtonHeight", "_qColors", "_styleSheets", "_svgColors", "_syntaxList", "accentCol", "baseButtonHeight",
"baseIconHeight", "baseIconSize", "buttonIconSize", "errorText", "fadedText", "baseIconHeight", "baseIconSize", "buttonIconSize", "errorText", "fadedText",
"fontPixelSize", "fontPointSize", "getDecoration", "getHeaderDecoration", "fontPixelSize", "fontPointSize", "getDecoration", "getHeaderDecoration",
"getHeaderDecorationNarrow", "getIcon", "getItemIcon", "getPixmap", "getToggleIcon", "getHeaderDecorationNarrow", "getIcon", "getItemIcon", "getPixmap", "getToggleIcon",
@@ -123,10 +123,11 @@ class GuiTheme:
self.syntaxTheme = SyntaxColors() self.syntaxTheme = SyntaxColors()
self.isDarkTheme = False self.isDarkTheme = False
# Special Text Colours # Special Colours
self.helpText = QColor(0, 0, 0) self.helpText = QColor(0, 0, 0)
self.fadedText = QColor(0, 0, 0) self.fadedText = QColor(0, 0, 0)
self.errorText = QColor(255, 0, 0) self.errorText = QColor(255, 0, 0)
self.accentCol = QColor(255, 0, 255) # Needed until we move to Qt 6.6
# Theme Data # Theme Data
self._meta = ThemeMeta() self._meta = ThemeMeta()
@@ -306,6 +307,7 @@ class GuiTheme:
# Base # Base
sec = "Base" sec = "Base"
if parser.has_section(sec): if parser.has_section(sec):
self._setBaseColor("base", self._readColor(parser, sec, "base"))
self._setBaseColor("default", self._readColor(parser, sec, "default")) self._setBaseColor("default", self._readColor(parser, sec, "default"))
self._setBaseColor("faded", self._readColor(parser, sec, "faded")) self._setBaseColor("faded", self._readColor(parser, sec, "faded"))
self._setBaseColor("red", self._readColor(parser, sec, "red")) self._setBaseColor("red", self._readColor(parser, sec, "red"))
@@ -319,13 +321,16 @@ class GuiTheme:
# Project # Project
sec = "Project" sec = "Project"
if parser.has_section(sec): if parser.has_section(sec):
self._setBaseColor("root", self._readColor(parser, sec, "root")) self._setBaseColor("root", self._readColor(parser, sec, "root"))
self._setBaseColor("folder", self._readColor(parser, sec, "folder")) self._setBaseColor("folder", self._readColor(parser, sec, "folder"))
self._setBaseColor("file", self._readColor(parser, sec, "file")) self._setBaseColor("file", self._readColor(parser, sec, "file"))
self._setBaseColor("title", self._readColor(parser, sec, "title")) self._setBaseColor("title", self._readColor(parser, sec, "title"))
self._setBaseColor("chapter", self._readColor(parser, sec, "chapter")) self._setBaseColor("chapter", self._readColor(parser, sec, "chapter"))
self._setBaseColor("scene", self._readColor(parser, sec, "scene")) self._setBaseColor("scene", self._readColor(parser, sec, "scene"))
self._setBaseColor("note", self._readColor(parser, sec, "note")) self._setBaseColor("note", self._readColor(parser, sec, "note"))
self._setBaseColor("active", self._readColor(parser, sec, "active"))
self._setBaseColor("inactive", self._readColor(parser, sec, "inactive"))
self._setBaseColor("disabled", self._readColor(parser, sec, "disabled"))
# Palette # Palette
sec = "Palette" sec = "Palette"
@@ -344,6 +349,7 @@ class GuiTheme:
self._setPalette(parser, sec, "highlightedtext", QPalette.ColorRole.HighlightedText) self._setPalette(parser, sec, "highlightedtext", QPalette.ColorRole.HighlightedText)
self._setPalette(parser, sec, "link", QPalette.ColorRole.Link) self._setPalette(parser, sec, "link", QPalette.ColorRole.Link)
self._setPalette(parser, sec, "linkvisited", QPalette.ColorRole.LinkVisited) self._setPalette(parser, sec, "linkvisited", QPalette.ColorRole.LinkVisited)
self.accentCol = self._readColor(parser, sec, "accent") # Special handling 'til Qt 6.6
# GUI # GUI
sec = "GUI" sec = "GUI"
@@ -427,8 +433,8 @@ class GuiTheme:
self._guiPalette.setBrush(QtColDisabled, QPalette.ColorRole.Highlight, grey) self._guiPalette.setBrush(QtColDisabled, QPalette.ColorRole.Highlight, grey)
if CONFIG.verQtValue >= 0x060600: if CONFIG.verQtValue >= 0x060600:
self._guiPalette.setBrush(QtColActive, QPalette.ColorRole.Accent, highlight) self._guiPalette.setBrush(QtColActive, QPalette.ColorRole.Accent, self.accentCol)
self._guiPalette.setBrush(QtColInactive, QPalette.ColorRole.Accent, highlight) self._guiPalette.setBrush(QtColInactive, QPalette.ColorRole.Accent, self.accentCol)
self._guiPalette.setBrush(QtColDisabled, QPalette.ColorRole.Accent, grey) self._guiPalette.setBrush(QtColDisabled, QPalette.ColorRole.Accent, grey)
# Set project override colours # Set project override colours
@@ -506,6 +512,7 @@ class GuiTheme:
isDark = self.isDesktopDarkMode() isDark = self.isDesktopDarkMode()
# Reset GUI Palette # Reset GUI Palette
base = palette.color(QPalette.ColorRole.Base)
default = palette.color(QPalette.ColorRole.Text) default = palette.color(QPalette.ColorRole.Text)
faded = QColor(128, 128, 128) faded = QColor(128, 128, 128)
dimmed = QColor(130, 130, 130) if isDark else QColor(190, 190, 190) dimmed = QColor(130, 130, 130) if isDark else QColor(190, 190, 190)
@@ -528,22 +535,26 @@ class GuiTheme:
self.iconCache.clear() self.iconCache.clear()
self._svgColors = {} self._svgColors = {}
self._qColors = {} self._qColors = {}
self._setBaseColor("default", default) self._setBaseColor("base", base)
self._setBaseColor("faded", faded) self._setBaseColor("default", default)
self._setBaseColor("red", red) self._setBaseColor("faded", faded)
self._setBaseColor("orange", orange) self._setBaseColor("red", red)
self._setBaseColor("yellow", yellow) self._setBaseColor("orange", orange)
self._setBaseColor("green", green) self._setBaseColor("yellow", yellow)
self._setBaseColor("cyan", cyan) self._setBaseColor("green", green)
self._setBaseColor("blue", blue) self._setBaseColor("cyan", cyan)
self._setBaseColor("purple", purple) self._setBaseColor("blue", blue)
self._setBaseColor("root", blue) self._setBaseColor("purple", purple)
self._setBaseColor("folder", yellow) self._setBaseColor("root", blue)
self._setBaseColor("file", default) self._setBaseColor("folder", yellow)
self._setBaseColor("title", green) self._setBaseColor("file", default)
self._setBaseColor("chapter", red) self._setBaseColor("title", green)
self._setBaseColor("scene", blue) self._setBaseColor("chapter", red)
self._setBaseColor("note", yellow) self._setBaseColor("scene", blue)
self._setBaseColor("note", yellow)
self._setBaseColor("active", green)
self._setBaseColor("inactive", red)
self._setBaseColor("disabled", faded)
return return
tests/test_gui/test_gui_theme.py
+4 -3
View File
@@ -616,16 +616,17 @@ def testGuiTheme_CheckTheme(theme):
"name", "mode", # The rest are not required "name", "mode", # The rest are not required
], ],
"Base": [ "Base": [
"default", "faded", "red", "orange", "yellow", "green", "cyan", "base", "default", "faded", "red", "orange", "yellow", "green",
"blue", "purple", "cyan", "blue", "purple",
], ],
"Project": [ "Project": [
"root", "folder", "file", "title", "chapter", "scene", "note", "root", "folder", "file", "title", "chapter", "scene", "note",
"active", "inactive", "disabled",
], ],
"Palette": [ "Palette": [
"window", "windowtext", "base", "alternatebase", "text", "window", "windowtext", "base", "alternatebase", "text",
"tooltipbase", "tooltiptext", "button", "buttontext", "brighttext", "tooltipbase", "tooltiptext", "button", "buttontext", "brighttext",
"highlight", "highlightedtext", "link", "linkvisited", "highlight", "highlightedtext", "link", "linkvisited", "accent",
], ],
"GUI": [ "GUI": [
"helptext", "fadedtext", "errortext", "helptext", "fadedtext", "errortext",