Skip to content

Commit 33f4efc

Browse files
authored
Improve welcome dialog and add more theme colour options (#2380)
2 parents c63336a + a92f9d7 commit 33f4efc

24 files changed

+173
-155
lines changed

docs/source/more/customise.rst

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,24 @@ A colour theme ``.conf`` file consists of the following settings:
5959
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
6060
6161
[Base]
62-
default = #303030
63-
faded = #6c6c6c
64-
red = #a62a2d
65-
orange = #b36829
66-
yellow = #a68542
67-
green = #296629
68-
cyan = #269999
69-
blue = #3a70a6
70-
purple = #b35ab3
62+
default = #303030
63+
faded = #6c6c6c
64+
red = #a62a2d
65+
orange = #b36829
66+
yellow = #a68542
67+
green = #296629
68+
cyan = #269999
69+
blue = #3a70a6
70+
purple = #b35ab3
7171
7272
[Project]
73-
root = blue
74-
folder = yellow
75-
file = default
76-
title = green
77-
chapter = red
78-
scene = blue
79-
note = yellow
73+
root = blue
74+
folder = yellow
75+
file = default
76+
title = green
77+
chapter = red
78+
scene = blue
79+
note = yellow
8080
8181
[Palette]
8282
window = #efefef
@@ -95,31 +95,31 @@ A colour theme ``.conf`` file consists of the following settings:
9595
linkvisited = blue
9696
9797
[GUI]
98-
helptext = #5c5c5c
99-
fadedtext = #6c6c6c
100-
errortext = red
98+
helptext = #5c5c5c
99+
fadedtext = #6c6c6c
100+
errortext = red
101101
102102
[Syntax]
103-
background = #ffffff
104-
text = #000000
105-
link = blue
106-
headertext = green
107-
headertag = green:160
108-
emphasis = orange
109-
dialog = blue
110-
altdialog = blue
111-
note = yellow
112-
hidden = faded
113-
shortcode = green
114-
keyword = red
115-
tag = green
116-
value = blue
117-
optional = green
118-
spellcheckline = red
119-
errorline = green
120-
replacetag = green
121-
modifier = green
122-
texthighlight = #c8c80060
103+
background = #ffffff
104+
text = #000000
105+
link = blue
106+
headertext = green
107+
headertag = green:L135
108+
emphasis = orange
109+
dialog = blue
110+
altdialog = blue
111+
note = yellow
112+
hidden = faded
113+
shortcode = green
114+
keyword = red
115+
tag = green
116+
value = blue
117+
optional = green
118+
spellcheckline = red
119+
errorline = green
120+
replacetag = green
121+
modifier = green
122+
texthighlight = #c8c80060
123123
124124
125125
Theme Sections
@@ -149,12 +149,15 @@ There are several ways to enter colour values:
149149

150150
.. csv-table:: Colour Formats
151151
:header: "Syntax", "Description"
152+
:widths: 15, 85
152153
:class: "tight-table"
153154

154155
"``#RRGGBB``", "A CSS style hexadecimal values, like ``#ff0000`` for red."
155156
"``#RRGGBBAA``", "A CSS style hexadecimal values with transparency, like ``#ff00007f`` for half-transparent red."
156157
"``name``", "A name referring to one of the colours already specified under the ``[Base]`` section, like ``red``. Note that you should not use named colours in the ``[Base]`` section itself as that may have unintended results."
157-
"``name:alpha``", "A name referring to one of the colours already specified under the ``[Base]`` section, with a transparency value added. The alpha value must be in the range ``0`` to ``255``, like ``red:127`` for half-transparent red."
158+
"``name:255``", "A name referring to one of the colours already specified under the ``[Base]`` section, with a transparency value added. The value must be in the range ``0`` to ``255``, like ``red:127`` for half-transparent red."
159+
"``name:L100``", "A name referring to one of the colours already specified under the ``[Base]`` section, where the L-number is a percentage value that makes it lighter. The value must be greater than ``0``. ``L100`` means no change."
160+
"``name:D100``", "A name referring to one of the colours already specified under the ``[Base]`` section, where the D-number is a percentage value that makes it darker. The value must be greater than ``0``. ``D100`` means no change."
158161
"``r, g, b``", "A set of red, green and blue numbers in the range ``0`` to ``255``, like ``255, 0, 0`` for red."
159162
"``r, g, b, a``", "A set of red, green, blue and alpha numbers in the range ``0`` to ``255``, like ``255, 0, 0, 127`` for half-transparent red."
160163

-292 KB
Binary file not shown.
-273 KB
Binary file not shown.
344 KB
Loading

novelwriter/assets/themes/default_dark.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ background = #363636
5454
text = default
5555
link = blue
5656
headertext = green
57-
headertag = green:160
57+
headertag = green:D150
5858
emphasis = orange
5959
dialog = blue
6060
altdialog = blue

novelwriter/assets/themes/default_light.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ background = #ffffff
5454
text = #000000
5555
link = blue
5656
headertext = green
57-
headertag = green:160
57+
headertag = green:L135
5858
emphasis = orange
5959
dialog = blue
6060
altdialog = blue

novelwriter/assets/themes/dracula.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ background = #282a36
7070
text = #f8f8f2
7171
link = #ff79c6
7272
headertext = purple
73-
headertag = #bd93f9a0
73+
headertag = purple:D150
7474
emphasis = orange
7575
dialog = green
7676
altdialog = yellow
@@ -85,4 +85,4 @@ spellcheckline = red
8585
errorline = green
8686
replacetag = yellow
8787
modifier = cyan
88-
texthighlight = #f1fa8c60
88+
texthighlight = yellow:96

novelwriter/assets/themes/grey_dark.conf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = CC BY-SA 4.0
88
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
99

1010
[Base]
11-
default = #cccccc
11+
default = #c8c8c8
1212
faded = #949494
1313
red = #f2777a
1414
orange = #f99139
@@ -44,28 +44,28 @@ link = blue
4444
linkvisited = blue
4545

4646
[GUI]
47-
helptext = #a4a4a4
47+
helptext = default:D120
4848
fadedtext = faded
4949
errortext = red
5050

5151
[Syntax]
5252
background = #363636
53-
text = #c8c8c8
54-
link = #c8c8c8
55-
headertext = #e1e1e1
56-
headertag = #e1e1e1a0
57-
emphasis = #c8c8c8
58-
dialog = #c8c8c8
59-
altdialog = #c8c8c8
60-
note = #c8c8c8
53+
text = default
54+
link = default
55+
headertext = default:L115
56+
headertag = default:D125
57+
emphasis = default
58+
dialog = default
59+
altdialog = default
60+
note = default
6161
hidden = faded
62-
shortcode = #e1e1e1
63-
keyword = #e1e1e1
64-
tag = #c8c8c8
65-
value = #c8c8c8
66-
optional = #e1e1e1
62+
shortcode = default:L115
63+
keyword = default:L115
64+
tag = default
65+
value = default
66+
optional = default:L115
6767
spellcheckline = red
6868
errorline = green
69-
replacetag = #e1e1e1
70-
modifier = #e1e1e1
69+
replacetag = default:L115
70+
modifier = default:L115
7171
texthighlight = #ffffff40

novelwriter/assets/themes/grey_light.conf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = CC BY-SA 4.0
88
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
99

1010
[Base]
11-
default = #303030
11+
default = #282828
1212
faded = #6c6c6c
1313
red = #a62a2d
1414
orange = #b36829
@@ -44,28 +44,28 @@ link = blue
4444
linkvisited = blue
4545

4646
[GUI]
47-
helptext = #5c5c5c
47+
helptext = default:L225
4848
fadedtext = faded
4949
errortext = red
5050

5151
[Syntax]
5252
background = #ffffff
53-
text = #141414
54-
link = #141414
55-
headertext = #000000
56-
headertag = #000000a0
57-
emphasis = #141414
58-
dialog = #141414
59-
altdialog = #141414
60-
note = #141414
53+
text = default
54+
link = default
55+
headertext = default:D200
56+
headertag = default:L400
57+
emphasis = default
58+
dialog = default
59+
altdialog = default
60+
note = default
6161
hidden = faded
62-
shortcode = #000000
63-
keyword = #000000
64-
tag = #141414
65-
value = #141414
66-
optional = #000000
62+
shortcode = default:D200
63+
keyword = default:D200
64+
tag = default
65+
value = default
66+
optional = default:D200
6767
spellcheckline = red
6868
errorline = green
69-
replacetag = #000000
70-
modifier = #000000
69+
replacetag = default:D200
70+
modifier = default:D200
7171
texthighlight = #00000040

novelwriter/assets/themes/light_owl.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ headertag = blue:160
7777
emphasis = orange
7878
dialog = green
7979
altdialog = yellow
80-
note = #80764b
80+
note = yellow:D175
8181
hidden = faded
8282
shortcode = blue
8383
keyword = red

0 commit comments

Comments
 (0)