Merge and update the default themes

This commit is contained in:
Veronica Berglyd Olsen
2025-06-02 18:40:58 +02:00
parent 04526385d1
commit 072d0f0acd
5 changed files with 113 additions and 153 deletions
@@ -1,42 +0,0 @@
[Main]
name = Default Dark
author = Veronica Berglyd Olsen
credit = Veronica Berglyd Olsen
url = https://github.com/vkbo/novelWriter
license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
##
# Colours:
# Background = 2a2a2a : 42, 42, 42
# Foreground = cccccc : 204, 204, 204
# Comment = 969696 : 150, 150, 150
# Red = e64250 : 230, 66, 80
# Orange = f99157 : 249, 145, 87
# Yellow = ffff84 : 255, 255, 132
# Green = 99cc99 : 153, 204, 153
# Blue = 288ed7 : 102, 153, 204
# Purple = 8c56d7 : 140, 86, 215
##
[Syntax]
background = 42, 42, 42
text = 204, 204, 204
link = 102, 153, 204
headertext = 153, 204, 153
headertag = 153, 204, 153, 160
emphasis = 249, 145, 87
dialog = 102, 153, 204
altdialog = 102, 153, 204
note = 255, 255, 216
hidden = 150, 150, 150
shortcode = 153, 204, 153
keyword = 230, 66, 80
tag = 153, 204, 153
value = 102, 153, 204
optional = 153, 204, 153
spellcheckline = 230, 66, 80
errorline = 153, 204, 153
replacetag = 153, 204, 153
modifier = 153, 204, 153
texthighlight = 255, 255, 132, 96
@@ -1,42 +0,0 @@
[Main]
name = Default Light
author = Veronica Berglyd Olsen
credit = Veronica Berglyd Olsen
url = https://github.com/vkbo/novelWriter
license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
##
# Colours:
# Background = ffffff : 255, 255, 255
# Foreground = 000000 : 0, 0, 0
# Comment = 646464 : 100, 100, 100
# Red = c83232 : 200, 50, 50
# Orange = ae6e1e : 174, 110, 30
# Yellow = 969600 : 150, 150, 0
# Green = 006400 : 0, 100, 0
# Blue = 0000c8 : 0, 0, 200
# Purple = 6400ae : 100, 0, 174
##
[Syntax]
background = 255, 255, 255
text = 0, 0, 0
link = 0, 0, 200
headertext = 0, 100, 0
headertag = 0, 100, 0, 160
emphasis = 174, 110, 30
dialog = 0, 0, 200
altdialog = 0, 0, 200
note = 100, 100, 0
hidden = 100, 100, 100
shortcode = 0, 100, 0
keyword = 200, 50, 50
tag = 0, 100, 0
value = 0, 0, 200
optional = 0, 100, 0
spellcheckline = 200, 50, 50
errorline = 0, 100, 0
replacetag = 0, 100, 0
modifier = 0, 100, 0
texthighlight = 150, 150, 0, 96
+56 -34
View File
@@ -8,43 +8,65 @@ url = https://github.com/vkbo/novelWriter
license = CC BY-SA 4.0 license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Icons] [Base]
default = 184, 184, 184 default = #cccccc
faded = 148, 148, 148 faded = #949494
red = 242, 119, 122 red = #f2777a
orange = 249, 145, 57 orange = #f99139
yellow = 255, 204, 102 yellow = #ffcc66
green = 153, 204, 153 green = #99cc99
aqua = 102, 204, 204 aqua = #66cccc
blue = 102, 153, 204 blue = #6699cc
purple = 204, 153, 204 purple = #cc99cc
[Project] [Project]
root = 102, 153, 204 root = blue
folder = 255, 204, 102 folder = yellow
file = 184, 184, 184 file = default
title = 153, 204, 153 title = green
chapter = 242, 119, 122 chapter = red
scene = 102, 153, 204 scene = blue
note = 255, 204, 102 note = yellow
[Palette] [Palette]
window = 54, 54, 54 window = #363636
windowtext = 204, 204, 204 windowtext = default
base = 62, 62, 62 base = #3e3e3e
alternatebase = 78, 78, 78 alternatebase = #4e4e4e
text = 204, 204, 204 text = default
tooltipbase = 255, 255, 192 tooltipbase = #ffffc0
tooltiptext = 21, 21, 13 tooltiptext = #15150d
button = 62, 62, 62 button = #3e3e3e
buttontext = 204, 204, 204 buttontext = default
brighttext = 62, 62, 62 brighttext = #3e3e3e
highlight = 44, 152, 247 highlight = #2c98f7
highlightedtext = 255, 255, 255 highlightedtext = #ffffff
link = 102, 153, 204 link = blue
linkvisited = 102, 153, 204 linkvisited = blue
[GUI] [GUI]
helptext = 164, 164, 164 helptext = #a4a4a4
fadedtext = 148, 148, 148 fadedtext = #949494
errortext = 255, 164, 164 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
+56 -34
View File
@@ -8,43 +8,65 @@ url = https://github.com/vkbo/novelWriter
license = CC BY-SA 4.0 license = CC BY-SA 4.0
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
[Icons] [Base]
default = 72, 72, 72 default = #303030
faded = 108, 108, 108 faded = #6c6c6c
red = 240, 40, 41 red = #a62a2d
orange = 245, 135, 31 orange = #b36829
yellow = 234, 183, 0 yellow = #a68542
green = 113, 140, 0 green = #296629
aqua = 62, 153, 159 aqua = #269999
blue = 66, 113, 174 blue = #3a70a6
purple = 137, 89, 168 purple = #b35ab3
[Project] [Project]
root = 66, 113, 174 root = blue
folder = 234, 183, 0 folder = yellow
file = 72, 72, 72 file = default
title = 113, 140, 0 title = green
chapter = 240, 40, 41 chapter = red
scene = 66, 113, 174 scene = blue
note = 234, 183, 0 note = yellow
[Palette] [Palette]
window = 239, 239, 239 window = #efefef
windowtext = 0, 0, 0 windowtext = #000000
base = 255, 255, 255 base = #ffffff
alternatebase = 224, 224, 224 alternatebase = #e0e0e0
text = 0, 0, 0 text = #000000
tooltipbase = 255, 255, 220 tooltipbase = #ffffdc
tooltiptext = 0, 0, 0 tooltiptext = #000000
button = 239, 239, 239 button = #efefef
buttontext = 0, 0, 0 buttontext = #000000
brighttext = 255, 255, 255 brighttext = #ffffff
highlight = 48, 135, 198 highlight = #3087c6
highlightedtext = 255, 255, 255 highlightedtext = #ffffff
link = 66, 113, 174 link = blue
linkvisited = 66, 113, 174 linkvisited = blue
[GUI] [GUI]
helptext = 92, 92, 92 helptext = #5c5c5c
fadedtext = 108, 108, 108 fadedtext = #6c6c6c
errortext = 255, 92, 92 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
+1 -1
View File
@@ -244,7 +244,7 @@ class GuiTheme:
entries = len(data) entries = len(data)
if entries == 2: if entries == 2:
# Assume name, alpha # Assume name, alpha
color = self._qColors.get(data[0].strip(), default) color = QColor(self._qColors.get(data[0].strip(), default))
color.setAlpha(checkInt(data[1], 255)) color.setAlpha(checkInt(data[1], 255))
return color return color
else: else: