From c08771dc5685f810942fcb20fab077dfa5cc6e46 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 4 Jun 2025 23:36:20 +0200 Subject: [PATCH 1/3] Add blue streak initial theme --- .../assets/themes/blue_streak_dark.conf | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 novelwriter/assets/themes/blue_streak_dark.conf diff --git a/novelwriter/assets/themes/blue_streak_dark.conf b/novelwriter/assets/themes/blue_streak_dark.conf new file mode 100644 index 00000000..8d0d390e --- /dev/null +++ b/novelwriter/assets/themes/blue_streak_dark.conf @@ -0,0 +1,71 @@ +[Main] +name = Blue Streak Dark +mode = 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/ + +[Base] +default = #cccccc +faded = #999999 +red = #ff6666 +orange = #ff9966 +yellow = #ffcc66 +green = #99cc99 +cyan = #66cccc +blue = #6699cc +purple = #cc99cc + +[Project] +root = blue +folder = default +file = default +title = blue:D150 +chapter = blue +scene = blue:L150 +note = yellow + +[Palette] +window = #393939 +windowtext = default +base = #2d2d2d +alternatebase = #515151 +text = default +tooltipbase = #ffffc0 +tooltiptext = #15150d +button = #2d2d2d +buttontext = default +brighttext = #2d2d2d +highlight = blue +highlightedtext = #ffffff +link = blue +linkvisited = blue + +[GUI] +helptext = blue +fadedtext = faded +errortext = red + +[Syntax] +background = #2d2d2d +text = default +link = blue +headertext = blue +headertag = blue:D150 +emphasis = blue:L150 +dialog = blue +altdialog = blue:L150 +note = blue:L150 +hidden = faded +shortcode = blue:D150 +keyword = blue:D125 +tag = blue +value = blue +optional = blue +spellcheckline = red +errorline = green +replacetag = blue:L150 +modifier = blue:D125 +texthighlight = blue:96 From d280cb510d5569edd866170e4683deee0c959948 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 5 Jun 2025 22:10:33 +0200 Subject: [PATCH 2/3] Update blue streak dark theme with new settings --- .../assets/themes/blue_streak_dark.conf | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/novelwriter/assets/themes/blue_streak_dark.conf b/novelwriter/assets/themes/blue_streak_dark.conf index 8d0d390e..00d9a747 100644 --- a/novelwriter/assets/themes/blue_streak_dark.conf +++ b/novelwriter/assets/themes/blue_streak_dark.conf @@ -8,6 +8,7 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] +base = #2d2d2d default = #cccccc faded = #999999 red = #ff6666 @@ -19,37 +20,41 @@ blue = #6699cc purple = #cc99cc [Project] -root = blue -folder = default -file = default -title = blue:D150 -chapter = blue -scene = blue:L150 -note = yellow +root = blue +folder = default +file = default +title = blue:D150 +chapter = blue +scene = blue:L150 +note = yellow +active = blue:L150 +inactive = blue:D150 +disabled = faded [Palette] -window = #393939 +window = base:L130 windowtext = default -base = #2d2d2d +base = base alternatebase = #515151 text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #2d2d2d +button = base buttontext = default -brighttext = #2d2d2d +brighttext = base highlight = blue highlightedtext = #ffffff link = blue linkvisited = blue +accent = blue [GUI] -helptext = blue +helptext = blue:L125 fadedtext = faded errortext = red [Syntax] -background = #2d2d2d +background = base text = default link = blue headertext = blue @@ -59,7 +64,7 @@ dialog = blue altdialog = blue:L150 note = blue:L150 hidden = faded -shortcode = blue:D150 +shortcode = blue:D125 keyword = blue:D125 tag = blue value = blue From 0a37981251866aad9041105dee10f349e13a04c0 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 6 Jun 2025 18:25:45 +0200 Subject: [PATCH 3/3] Add Blue Streak Light, and update dark theme --- .../assets/themes/blue_streak_dark.conf | 10 +-- .../assets/themes/blue_streak_light.conf | 76 +++++++++++++++++++ novelwriter/gui/theme.py | 2 +- 3 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 novelwriter/assets/themes/blue_streak_light.conf diff --git a/novelwriter/assets/themes/blue_streak_dark.conf b/novelwriter/assets/themes/blue_streak_dark.conf index 00d9a747..ed0f912d 100644 --- a/novelwriter/assets/themes/blue_streak_dark.conf +++ b/novelwriter/assets/themes/blue_streak_dark.conf @@ -32,18 +32,18 @@ inactive = blue:D150 disabled = faded [Palette] -window = base:L130 +window = base:L125 windowtext = default base = base -alternatebase = #515151 +alternatebase = base:L150 text = default -tooltipbase = #ffffc0 -tooltiptext = #15150d +tooltipbase = yellow:L140 +tooltiptext = base:D150 button = base buttontext = default brighttext = base highlight = blue -highlightedtext = #ffffff +highlightedtext = default:L120 link = blue linkvisited = blue accent = blue diff --git a/novelwriter/assets/themes/blue_streak_light.conf b/novelwriter/assets/themes/blue_streak_light.conf new file mode 100644 index 00000000..0a3673b1 --- /dev/null +++ b/novelwriter/assets/themes/blue_streak_light.conf @@ -0,0 +1,76 @@ +[Main] +name = Blue Streak Light +mode = 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/ + +[Base] +base = #fcfcfc +default = #303030 +faded = #6c6c6c +red = #cc3939 +orange = #cc7239 +yellow = #cca339 +green = #72a372 +cyan = #39a3a3 +blue = #3972a3 +purple = #a372a3 + +[Project] +root = blue +folder = faded +file = faded +title = blue:D150 +chapter = blue +scene = blue:L125 +note = yellow +active = blue:L115 +inactive = blue:D150 +disabled = faded + +[Palette] +window = base:D105 +windowtext = default +base = base +alternatebase = base:D110 +text = default +tooltipbase = yellow:L150 +tooltiptext = default:D150 +button = base +buttontext = default +brighttext = base +highlight = blue:L110 +highlightedtext = base +link = blue +linkvisited = blue +accent = blue + +[GUI] +helptext = blue +fadedtext = faded +errortext = red + +[Syntax] +background = base +text = default +link = blue +headertext = blue +headertag = blue:D150 +emphasis = blue:L125 +dialog = blue +altdialog = blue:L125 +note = blue:L125 +hidden = faded +shortcode = blue:D125 +keyword = blue:D125 +tag = blue +value = blue +optional = blue +spellcheckline = red +errorline = green +replacetag = blue:L125 +modifier = blue:D125 +texthighlight = blue:96 diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index 154802d5..ee0e559f 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -481,7 +481,7 @@ class GuiTheme: # Assume #RRGGBBAA and convert to #AARRGGBB return QColor.fromString(f"#{value[7:9]}{value[1:7]}") elif ":" in value: - # Colour name and alpha + # Colour name and lighter, darker or alpha name, _, adjust = value.partition(":") color = QColor(self._qColors.get(name.strip(), default)) if adjust.startswith("L"):