diff --git a/docs/source/more/customise.rst b/docs/source/more/customise.rst index b871bf09..89a74ba0 100644 --- a/docs/source/more/customise.rst +++ b/docs/source/more/customise.rst @@ -110,18 +110,18 @@ A colour theme ``.conf`` file consists of the following settings: headertag = green:L135 emphasis = orange dialog = blue - altdialog = blue + altdialog = red note = yellow:D125 hidden = faded - shortcode = green + shortcode = blue keyword = red tag = green - value = blue - optional = green + value = green + optional = blue spellcheckline = red errorline = green replacetag = green - modifier = green + modifier = blue texthighlight = yellow:72 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 90c1a411..1f7359bb 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -63,11 +63,11 @@ dialog = blue altdialog = red note = yellow hidden = faded -shortcode = green +shortcode = blue keyword = red tag = green value = green -optional = green +optional = blue spellcheckline = red errorline = green replacetag = green diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index 1424db8d..da7784f5 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -63,11 +63,11 @@ dialog = blue altdialog = red note = yellow:D125 hidden = faded -shortcode = green +shortcode = blue keyword = red tag = green value = green -optional = green +optional = blue spellcheckline = red errorline = green replacetag = green diff --git a/sample/content/14298de4d9524.nwd b/sample/content/14298de4d9524.nwd index b37ae5a8..bf0d1e32 100644 --- a/sample/content/14298de4d9524.nwd +++ b/sample/content/14298de4d9524.nwd @@ -1,12 +1,12 @@ %%~name: John Smith %%~path: f7e2d9f330615/14298de4d9524 %%~kind: CHARACTER/NOTE -%%~hash: f85b4da6ba4a557db0c4d5f1b59f33ba01542606 -%%~date: Unknown/2024-01-30 10:58:18 +%%~hash: d344894f612ee7b6f75e60a8d2cfdf32c78d1b0a +%%~date: Unknown/2025-07-16 12:09:00 # John Smith @tag: John | John Smith -% Short: The sidekick +%Short: The sidekick He’s pretty cool. Not Brad Pitt though. diff --git a/sample/content/6a2d6d5f4f401.nwd b/sample/content/6a2d6d5f4f401.nwd index d9a6bb24..479f6117 100644 --- a/sample/content/6a2d6d5f4f401.nwd +++ b/sample/content/6a2d6d5f4f401.nwd @@ -1,13 +1,13 @@ %%~name: Chapter One %%~path: 7031beac91f75/6a2d6d5f4f401 %%~kind: NOVEL/DOCUMENT -%%~hash: 89687756c204742d17f1d37a0ba7fa3aadaf00f2 -%%~date: Unknown/2023-08-25 16:51:56 +%%~hash: 4310d3f9d399b5cf1eef66d7d7caa8b022fc6663 +%%~date: Unknown/2025-07-16 12:09:14 ## So it Begins @pov: Jane @location: Earth -% Synopsis: We can add a chapter document, but keep the scene files separate. In the chapter document we can set the meta data that applies to the whole chapter if we wish to. You can add the scenes as child documents directly under the chapter. +%Synopsis: We can add a chapter document, but keep the scene files separate. In the chapter document we can set the meta data that applies to the whole chapter if we wish to. You can add the scenes as child documents directly under the chapter. A chapter can contain leading text before the first scene, like this piece of text. diff --git a/sample/content/a520879ca0b45.nwd b/sample/content/a520879ca0b45.nwd index a8afd6ce..010f77fd 100644 --- a/sample/content/a520879ca0b45.nwd +++ b/sample/content/a520879ca0b45.nwd @@ -1,13 +1,13 @@ %%~name: Chapter One %%~path: e5e47ebf63b1c/a520879ca0b45 %%~kind: NOVEL/DOCUMENT -%%~hash: 2285256b970dbb3ccf833d9275cd5f8935b6aff1 -%%~date: Unknown/2023-08-25 16:52:02 +%%~hash: 223ba31c0cd6c59ebb14df7f26e722c3ef3eea42 +%%~date: Unknown/2025-07-16 12:09:42 ## Chapter One @pov: Jane -% Synopsis: Remember Jane and John? +%Synopsis: Remember Jane and John? ### Scene One diff --git a/sample/content/bacb7059e3083.nwd b/sample/content/bacb7059e3083.nwd index 309b3d3c..bd47eae1 100644 --- a/sample/content/bacb7059e3083.nwd +++ b/sample/content/bacb7059e3083.nwd @@ -1,10 +1,10 @@ %%~name: Title Page %%~path: e5e47ebf63b1c/bacb7059e3083 %%~kind: NOVEL/DOCUMENT -%%~hash: 16b55dd0f8dc6bbba266384930a87ec211d471df -%%~date: Unknown/2023-08-25 16:52:01 +%%~hash: 4805628d99711129c7296b01e5059410993ebd02 +%%~date: Unknown/2025-07-16 12:09:35 #! Sequel Novel >> **By Jane Doh** << -% Synopsis: Jane and John are back in a sequel to My Novel! +%Synopsis: Jane and John are back in a sequel to My Novel! diff --git a/sample/content/bb2c23b3c42cc.nwd b/sample/content/bb2c23b3c42cc.nwd index 9c18a616..0b2350fa 100644 --- a/sample/content/bb2c23b3c42cc.nwd +++ b/sample/content/bb2c23b3c42cc.nwd @@ -1,12 +1,12 @@ %%~name: Jane Smith %%~path: f7e2d9f330615/bb2c23b3c42cc %%~kind: CHARACTER/NOTE -%%~hash: 10f072a4bf7389b0c178a4181e50833d39b945af -%%~date: Unknown/2024-01-30 11:05:37 +%%~hash: d3911172cd384130e57b3754ea8a3ff30633f825 +%%~date: Unknown/2025-07-16 12:09:50 # Jane Smith @tag: Jane | Jane Smith -% Short: The heroine +%Short: The heroine She’s pretty cool. Not Angelina Jolie though. diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index c70e6a03..5418f7c6 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,6 +1,6 @@ - - + + Sample Project Jane Smith @@ -54,7 +54,7 @@ Part One - + Chapter One @@ -86,11 +86,11 @@ Sequel - + Title Page - + Chapter One @@ -102,11 +102,11 @@ Main Characters - + John Smith - + Jane Smith diff --git a/tests/test_gui/test_gui_dochighlighter.py b/tests/test_gui/test_gui_dochighlighter.py index 87aa6a71..ff3fe41d 100644 --- a/tests/test_gui/test_gui_dochighlighter.py +++ b/tests/test_gui/test_gui_dochighlighter.py @@ -37,7 +37,7 @@ T_HANDLE = "0123456789abc" @pytest.fixture() def syntax(nwGUI): """Create a syntax object for use with testing.""" - CONFIG.lightTheme = "tomorrow" + CONFIG.lightTheme = "default_light" CONFIG.themeMode = nwTheme.LIGHT CONFIG.dialogStyle = 3 @@ -48,8 +48,8 @@ def syntax(nwGUI): theme = SHARED.theme theme.loadTheme(force=True) - assert theme._guiPalette.base().color().getRgb() == (0xff, 0xff, 0xff, 0xff) - assert theme.syntaxTheme.text.getRgb() == (0x4d, 0x4d, 0x4c, 0xff) + assert theme._guiPalette.base().color().getRgb() == (0xfc, 0xfc, 0xfc, 0xff) + assert theme.syntaxTheme.text.getRgb() == (0x30, 0x30, 0x30, 0xff) doc = QTextDocument() syntax = GuiDocHighlighter(doc)