From 550cba2f43b3471d4f4cc6d6827ed07892054d01 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 5 Jun 2025 18:15:31 +0200 Subject: [PATCH 1/2] Add theme settings for active icons, a base colour, and accent palette colour (#2382) --- novelwriter/constants.py | 1 + novelwriter/core/item.py | 8 ++-- novelwriter/extensions/switch.py | 7 +++- novelwriter/gui/itemdetails.py | 10 +---- novelwriter/gui/theme.py | 65 +++++++++++++++++++------------- tests/test_gui/test_gui_theme.py | 7 ++-- 6 files changed, 54 insertions(+), 44 deletions(-) diff --git a/novelwriter/constants.py b/novelwriter/constants.py index 5b7b260d..8c9da88e 100644 --- a/novelwriter/constants.py +++ b/novelwriter/constants.py @@ -445,6 +445,7 @@ class nwLabels: THEME_COLORS: Final[dict[str, str]] = { "theme": QT_TRANSLATE_NOOP("Constant", "Theme Colours"), "default": QT_TRANSLATE_NOOP("Constant", "Foreground Colour"), + "base": QT_TRANSLATE_NOOP("Constant", "Background Colour"), "faded": QT_TRANSLATE_NOOP("Constant", "Faded Colour"), "red": QT_TRANSLATE_NOOP("Constant", "Red"), "orange": QT_TRANSLATE_NOOP("Constant", "Orange"), diff --git a/novelwriter/core/item.py b/novelwriter/core/item.py index a8f2fbbd..367fa446 100644 --- a/novelwriter/core/item.py +++ b/novelwriter/core/item.py @@ -363,13 +363,13 @@ class NWItem: """ if self.isFileType(): 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]) - icon = SHARED.theme.getIcon(key, color) else: + key = "noncheckable" + color = "disabled" text = "" - icon = SHARED.theme.getIcon("noncheckable", "faded") - return text, icon + return text, SHARED.theme.getIcon(key, color) ## # Checker Methods diff --git a/novelwriter/extensions/switch.py b/novelwriter/extensions/switch.py index 4699d50a..0a11f52f 100644 --- a/novelwriter/extensions/switch.py +++ b/novelwriter/extensions/switch.py @@ -33,7 +33,7 @@ from novelwriter.types import QtNoPen, QtPaintAntiAlias, QtSizeFixed 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: super().__init__(parent=parent) @@ -44,6 +44,9 @@ class NSwitch(QAbstractButton): self._rH = self._xH - 4 self._rR = self._xR - 2 + self._cOn = SHARED.theme.accentCol + self._cOff = self.palette().alternateBase() + self.setCheckable(True) self.setSizePolicy(QtSizeFixed, QtSizeFixed) self.setFixedWidth(self._xW) @@ -97,7 +100,7 @@ class NSwitch(QAbstractButton): painter.setOpacity(1.0 if self.isEnabled() else 0.5) 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.setPen(QtNoPen) diff --git a/novelwriter/gui/itemdetails.py b/novelwriter/gui/itemdetails.py index 9bece183..7bffb923 100644 --- a/novelwriter/gui/itemdetails.py +++ b/novelwriter/gui/itemdetails.py @@ -233,14 +233,8 @@ class GuiItemDetails(QWidget): # Label # ===== - if nwItem.isFileType(): - if nwItem.isActive: - 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")) - + _, icon = nwItem.getActiveStatus() + self.labelIcon.setPixmap(icon.pixmap(iPx, iPx)) self.labelData.setText(elide(nwItem.itemName, 100)) # Status diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index 89d3fecd..154802d5 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -108,7 +108,7 @@ class GuiTheme: __slots__ = ( "_allThemes", "_currentTheme", "_darkThemes", "_guiPalette", "_lightThemes", "_meta", - "_qColors", "_styleSheets", "_svgColors", "_syntaxList", "baseButtonHeight", + "_qColors", "_styleSheets", "_svgColors", "_syntaxList", "accentCol", "baseButtonHeight", "baseIconHeight", "baseIconSize", "buttonIconSize", "errorText", "fadedText", "fontPixelSize", "fontPointSize", "getDecoration", "getHeaderDecoration", "getHeaderDecorationNarrow", "getIcon", "getItemIcon", "getPixmap", "getToggleIcon", @@ -123,10 +123,11 @@ class GuiTheme: self.syntaxTheme = SyntaxColors() self.isDarkTheme = False - # Special Text Colours + # Special Colours self.helpText = QColor(0, 0, 0) self.fadedText = QColor(0, 0, 0) self.errorText = QColor(255, 0, 0) + self.accentCol = QColor(255, 0, 255) # Needed until we move to Qt 6.6 # Theme Data self._meta = ThemeMeta() @@ -306,6 +307,7 @@ class GuiTheme: # Base sec = "Base" if parser.has_section(sec): + self._setBaseColor("base", self._readColor(parser, sec, "base")) self._setBaseColor("default", self._readColor(parser, sec, "default")) self._setBaseColor("faded", self._readColor(parser, sec, "faded")) self._setBaseColor("red", self._readColor(parser, sec, "red")) @@ -319,13 +321,16 @@ class GuiTheme: # Project sec = "Project" if parser.has_section(sec): - self._setBaseColor("root", self._readColor(parser, sec, "root")) - self._setBaseColor("folder", self._readColor(parser, sec, "folder")) - self._setBaseColor("file", self._readColor(parser, sec, "file")) - self._setBaseColor("title", self._readColor(parser, sec, "title")) - self._setBaseColor("chapter", self._readColor(parser, sec, "chapter")) - self._setBaseColor("scene", self._readColor(parser, sec, "scene")) - self._setBaseColor("note", self._readColor(parser, sec, "note")) + self._setBaseColor("root", self._readColor(parser, sec, "root")) + self._setBaseColor("folder", self._readColor(parser, sec, "folder")) + self._setBaseColor("file", self._readColor(parser, sec, "file")) + self._setBaseColor("title", self._readColor(parser, sec, "title")) + self._setBaseColor("chapter", self._readColor(parser, sec, "chapter")) + self._setBaseColor("scene", self._readColor(parser, sec, "scene")) + 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 sec = "Palette" @@ -344,6 +349,7 @@ class GuiTheme: self._setPalette(parser, sec, "highlightedtext", QPalette.ColorRole.HighlightedText) self._setPalette(parser, sec, "link", QPalette.ColorRole.Link) self._setPalette(parser, sec, "linkvisited", QPalette.ColorRole.LinkVisited) + self.accentCol = self._readColor(parser, sec, "accent") # Special handling 'til Qt 6.6 # GUI sec = "GUI" @@ -427,8 +433,8 @@ class GuiTheme: self._guiPalette.setBrush(QtColDisabled, QPalette.ColorRole.Highlight, grey) if CONFIG.verQtValue >= 0x060600: - self._guiPalette.setBrush(QtColActive, QPalette.ColorRole.Accent, highlight) - self._guiPalette.setBrush(QtColInactive, QPalette.ColorRole.Accent, highlight) + self._guiPalette.setBrush(QtColActive, QPalette.ColorRole.Accent, self.accentCol) + self._guiPalette.setBrush(QtColInactive, QPalette.ColorRole.Accent, self.accentCol) self._guiPalette.setBrush(QtColDisabled, QPalette.ColorRole.Accent, grey) # Set project override colours @@ -506,6 +512,7 @@ class GuiTheme: isDark = self.isDesktopDarkMode() # Reset GUI Palette + base = palette.color(QPalette.ColorRole.Base) default = palette.color(QPalette.ColorRole.Text) faded = QColor(128, 128, 128) dimmed = QColor(130, 130, 130) if isDark else QColor(190, 190, 190) @@ -528,22 +535,26 @@ class GuiTheme: self.iconCache.clear() self._svgColors = {} self._qColors = {} - self._setBaseColor("default", default) - self._setBaseColor("faded", faded) - self._setBaseColor("red", red) - self._setBaseColor("orange", orange) - self._setBaseColor("yellow", yellow) - self._setBaseColor("green", green) - self._setBaseColor("cyan", cyan) - self._setBaseColor("blue", blue) - self._setBaseColor("purple", purple) - self._setBaseColor("root", blue) - self._setBaseColor("folder", yellow) - self._setBaseColor("file", default) - self._setBaseColor("title", green) - self._setBaseColor("chapter", red) - self._setBaseColor("scene", blue) - self._setBaseColor("note", yellow) + self._setBaseColor("base", base) + self._setBaseColor("default", default) + self._setBaseColor("faded", faded) + self._setBaseColor("red", red) + self._setBaseColor("orange", orange) + self._setBaseColor("yellow", yellow) + self._setBaseColor("green", green) + self._setBaseColor("cyan", cyan) + self._setBaseColor("blue", blue) + self._setBaseColor("purple", purple) + self._setBaseColor("root", blue) + self._setBaseColor("folder", yellow) + self._setBaseColor("file", default) + self._setBaseColor("title", green) + self._setBaseColor("chapter", red) + self._setBaseColor("scene", blue) + self._setBaseColor("note", yellow) + self._setBaseColor("active", green) + self._setBaseColor("inactive", red) + self._setBaseColor("disabled", faded) return diff --git a/tests/test_gui/test_gui_theme.py b/tests/test_gui/test_gui_theme.py index 4c834d38..27e5915d 100644 --- a/tests/test_gui/test_gui_theme.py +++ b/tests/test_gui/test_gui_theme.py @@ -616,16 +616,17 @@ def testGuiTheme_CheckTheme(theme): "name", "mode", # The rest are not required ], "Base": [ - "default", "faded", "red", "orange", "yellow", "green", "cyan", - "blue", "purple", + "base", "default", "faded", "red", "orange", "yellow", "green", + "cyan", "blue", "purple", ], "Project": [ "root", "folder", "file", "title", "chapter", "scene", "note", + "active", "inactive", "disabled", ], "Palette": [ "window", "windowtext", "base", "alternatebase", "text", "tooltipbase", "tooltiptext", "button", "buttontext", "brighttext", - "highlight", "highlightedtext", "link", "linkvisited", + "highlight", "highlightedtext", "link", "linkvisited", "accent", ], "GUI": [ "helptext", "fadedtext", "errortext", From 8c0f3b037ae79e663a73e14aafd1f56a47130acf Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 5 Jun 2025 21:55:08 +0200 Subject: [PATCH 2/2] Update themes --- .../assets/themes/cyberpunk_night.conf | 25 +++++--- novelwriter/assets/themes/default_dark.conf | 33 +++++----- novelwriter/assets/themes/default_light.conf | 41 ++++++------ novelwriter/assets/themes/dracula.conf | 27 ++++---- novelwriter/assets/themes/grey_dark.conf | 25 +++++--- novelwriter/assets/themes/grey_light.conf | 27 ++++---- novelwriter/assets/themes/light_owl.conf | 27 ++++---- novelwriter/assets/themes/night_owl.conf | 27 ++++---- novelwriter/assets/themes/primer_dark.conf | 63 ++++++++++--------- novelwriter/assets/themes/primer_light.conf | 61 +++++++++--------- novelwriter/assets/themes/snazzy.conf | 27 ++++---- novelwriter/assets/themes/solarized_dark.conf | 27 ++++---- .../assets/themes/solarized_light.conf | 28 +++++---- novelwriter/assets/themes/tango_dark.conf | 23 ++++--- novelwriter/assets/themes/tango_light.conf | 23 ++++--- novelwriter/assets/themes/tomorrow.conf | 25 +++++--- novelwriter/assets/themes/tomorrow_night.conf | 27 ++++---- .../assets/themes/tomorrow_night_blue.conf | 27 ++++---- .../assets/themes/tomorrow_night_bright.conf | 27 ++++---- .../themes/tomorrow_night_eighties.conf | 27 ++++---- 20 files changed, 358 insertions(+), 259 deletions(-) diff --git a/novelwriter/assets/themes/cyberpunk_night.conf b/novelwriter/assets/themes/cyberpunk_night.conf index 66c3932c..70996a22 100644 --- a/novelwriter/assets/themes/cyberpunk_night.conf +++ b/novelwriter/assets/themes/cyberpunk_night.conf @@ -8,6 +8,7 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] +base = #000000 default = #888888 faded = #616161 red = #f24817 @@ -19,18 +20,21 @@ blue = #4d4dff purple = #320064 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] -window = #000000 +window = base windowtext = #969696 -base = #000000 +base = base alternatebase = #282828 text = #969696 tooltipbase = #281446 @@ -42,6 +46,7 @@ highlight = #321e50 highlightedtext = #ffffff link = blue linkvisited = #320050 +accent = #321e50 [GUI] helptext = faded @@ -49,7 +54,7 @@ fadedtext = faded errortext = red [Syntax] -background = #000000 +background = base text = #969696 link = blue headertext = #ffffff diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 267fbcb0..a82f4adb 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -9,10 +9,11 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] +base = #373737 default = #cccccc faded = #949494 -red = #f2777a -orange = #f99139 +red = #ff6666 +orange = #ff9966 yellow = #ffcc66 green = #99cc99 cyan = #66cccc @@ -20,29 +21,33 @@ blue = #6699cc purple = #cc99cc [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] -window = #363636 +window = #303030 windowtext = default -base = #3e3e3e +base = base alternatebase = #4e4e4e text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #3e3e3e +button = base buttontext = default -brighttext = #3e3e3e +brighttext = base highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = #a4a4a4 @@ -50,7 +55,7 @@ fadedtext = faded errortext = red [Syntax] -background = #363636 +background = base text = default link = blue headertext = green diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index e08de69f..52c12d10 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -9,40 +9,45 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] +base = #fcfcfc default = #303030 faded = #6c6c6c red = #a62a2d orange = #b36829 -yellow = #a68542 +yellow = #a39c34 green = #296629 cyan = #269999 blue = #3a70a6 purple = #b35ab3 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #efefef -windowtext = #000000 -base = #ffffff +windowtext = default +base = base alternatebase = #e0e0e0 -text = #000000 +text = default tooltipbase = #ffffc0 tooltiptext = #15150d button = #efefef -buttontext = #000000 -brighttext = #ffffff +buttontext = default +brighttext = base highlight = #3087c6 -highlightedtext = #ffffff +highlightedtext = base link = blue linkvisited = blue +accent = #3087c6 [GUI] helptext = #5c5c5c @@ -50,15 +55,15 @@ fadedtext = #6c6c6c errortext = red [Syntax] -background = #ffffff -text = #000000 +background = base +text = default link = blue headertext = green headertag = green:L135 emphasis = orange dialog = blue altdialog = blue -note = yellow +note = yellow:D125 hidden = faded shortcode = green keyword = red @@ -69,4 +74,4 @@ spellcheckline = red errorline = green replacetag = green modifier = green -texthighlight = #c8c80060 +texthighlight = yellow:72 diff --git a/novelwriter/assets/themes/dracula.conf b/novelwriter/assets/themes/dracula.conf index ed1f1e92..8e0d0133 100644 --- a/novelwriter/assets/themes/dracula.conf +++ b/novelwriter/assets/themes/dracula.conf @@ -25,6 +25,7 @@ licenseurl = https://github.com/dracula/dracula-theme/blob/main/LICENSE ## [Base] +base = #282a36 default = #e6e6e0 faded = #6272a4 red = #ff5555 @@ -36,29 +37,33 @@ blue = #93cff9 purple = #bd93f9 [Project] -root = purple -folder = yellow -file = default -title = green -chapter = red -scene = cyan -note = yellow +root = purple +folder = yellow +file = default +title = green +chapter = red +scene = cyan +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #44475a windowtext = #f8f8f2 -base = #282a36 +base = base alternatebase = #333645 text = #f8f8f2 tooltipbase = yellow -tooltiptext = #282a36 +tooltiptext = base button = #505369 buttontext = #f8f8f2 -brighttext = #44475a +brighttext = base highlight = #a681da highlightedtext = #f8f8f2 link = cyan linkvisited = cyan +accent = #a681da [GUI] helptext = #ccacf9 @@ -66,7 +71,7 @@ fadedtext = faded errortext = red [Syntax] -background = #282a36 +background = base text = #f8f8f2 link = #ff79c6 headertext = purple diff --git a/novelwriter/assets/themes/grey_dark.conf b/novelwriter/assets/themes/grey_dark.conf index de9a1f35..862caaf3 100644 --- a/novelwriter/assets/themes/grey_dark.conf +++ b/novelwriter/assets/themes/grey_dark.conf @@ -8,6 +8,7 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] +base = #3e3e3e default = #c8c8c8 faded = #949494 red = #f2777a @@ -19,29 +20,33 @@ blue = #6699cc purple = #cc99cc [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #363636 windowtext = default -base = #3e3e3e +base = base alternatebase = #4e4e4e text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #3e3e3e +button = base buttontext = default -brighttext = #3e3e3e +brighttext = base highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = default:D120 diff --git a/novelwriter/assets/themes/grey_light.conf b/novelwriter/assets/themes/grey_light.conf index ace40f8c..2da58171 100644 --- a/novelwriter/assets/themes/grey_light.conf +++ b/novelwriter/assets/themes/grey_light.conf @@ -8,6 +8,7 @@ license = CC BY-SA 4.0 licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] +base = #ffffff default = #282828 faded = #6c6c6c red = #a62a2d @@ -19,29 +20,33 @@ blue = #3a70a6 purple = #b35ab3 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #efefef windowtext = default -base = #ffffff +base = base alternatebase = #e0e0e0 text = default tooltipbase = #ffffc0 tooltiptext = #15150d button = #efefef buttontext = default -brighttext = #ffffff +brighttext = base highlight = #3087c6 -highlightedtext = #ffffff +highlightedtext = base link = blue linkvisited = blue +accent = #3087c6 [GUI] helptext = default:L225 @@ -49,7 +54,7 @@ fadedtext = faded errortext = red [Syntax] -background = #ffffff +background = base text = default link = default headertext = default:D200 diff --git a/novelwriter/assets/themes/light_owl.conf b/novelwriter/assets/themes/light_owl.conf index 512f4019..208cb459 100644 --- a/novelwriter/assets/themes/light_owl.conf +++ b/novelwriter/assets/themes/light_owl.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE ## [Base] +base = #fbfbfb default = #403f52 faded = #989fb1 red = #de3d3a @@ -39,29 +40,33 @@ blue = #288ed7 purple = #964ac1 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #eaeaea windowtext = default -base = #fbfbfb +base = base alternatebase = #e0e0e0 text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #eaeaea +button = base buttontext = default -brighttext = #eaeaea +brighttext = base highlight = #3087c6 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #3087c6 [GUI] helptext = blue @@ -69,7 +74,7 @@ fadedtext = faded errortext = red [Syntax] -background = #fbfbfb +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf index 2fbf7d60..422b7374 100644 --- a/novelwriter/assets/themes/night_owl.conf +++ b/novelwriter/assets/themes/night_owl.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE ## [Base] +base = #011627 default = #d6deeb faded = #637777 red = #f78c6c @@ -39,29 +40,33 @@ blue = #82aaff purple = #c792ea [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #434652 windowtext = default -base = #011627 +base = base alternatebase = #32374d text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #434652 +button = base buttontext = default -brighttext = #434652 +brighttext = base highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = blue @@ -69,7 +74,7 @@ fadedtext = faded errortext = red [Syntax] -background = #011627 +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/primer_dark.conf b/novelwriter/assets/themes/primer_dark.conf index d8d334c0..8c26ce67 100644 --- a/novelwriter/assets/themes/primer_dark.conf +++ b/novelwriter/assets/themes/primer_dark.conf @@ -1,40 +1,44 @@ [Main] -name = Primer Dark -mode = dark -author = Myian (adaptation) -credit = GitHub Inc. -url = https://github.com/primer -license = MIT License -licenseurl = https://github.com/primer/brand/blob/main/LICENSE +name = Primer Dark +mode = dark +author = Myian (adaptation) +credit = GitHub Inc. +url = https://github.com/primer +license = MIT License +licenseurl = https://github.com/primer/brand/blob/main/LICENSE [Base] -default = #f0f6fc -faded = #a3b0be -red = #ff7b72 -orange = #ffa657 -yellow = #f8e3a1 -green = #7ee787 -cyan = #57CCC5 -blue = #79c0ff -purple = #bc8cff +base = #0c1117 +default = #f0f6fc +faded = #a3b0be +red = #ff7b72 +orange = #ffa657 +yellow = #f8e3a1 +green = #7ee787 +cyan = #57CCC5 +blue = #79c0ff +purple = #bc8cff [Project] -root = purple -folder = orange -file = default -title = green -chapter = red -scene = blue -note = yellow +root = purple +folder = orange +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #141b23 windowtext = default -base = #0c1117 +base = base alternatebase = #1e242a text = default tooltipbase = yellow -tooltiptext = #0c1117 +tooltiptext = base button = #212830 buttontext = default brighttext = default @@ -42,14 +46,15 @@ highlight = #104C35 highlightedtext = default link = blue linkvisited = blue +accent = #104C35 [GUI] -helptext = faded -fadedtext = faded:128 -errortext = #f85149 +helptext = faded +fadedtext = faded:128 +errortext = #f85149 [Syntax] -background = #0c1117 +background = base text = faded link = blue headertext = default diff --git a/novelwriter/assets/themes/primer_light.conf b/novelwriter/assets/themes/primer_light.conf index 3b6ba897..93e7a87b 100644 --- a/novelwriter/assets/themes/primer_light.conf +++ b/novelwriter/assets/themes/primer_light.conf @@ -1,36 +1,40 @@ [Main] -name = Primer Light -mode = light -author = Myian (adaptation) -credit = GitHub Inc. -url = https://github.com/primer -license = MIT License -licenseurl = https://github.com/primer/brand/blob/main/LICENSE +name = Primer Light +mode = light +author = Myian (adaptation) +credit = GitHub Inc. +url = https://github.com/primer +license = MIT License +licenseurl = https://github.com/primer/brand/blob/main/LICENSE [Base] -default = #1f2328 -faded = #59636e -red = #fa4549 -orange = #e16f24 -yellow = #d4a72c -green = #2da44e -cyan = #339D9B -blue = #0969da -purple = #a475f9 +base = #ffffff +default = #1f2328 +faded = #59636e +red = #fa4549 +orange = #e16f24 +yellow = #d4a72c +green = #2da44e +cyan = #339D9B +blue = #0969da +purple = #a475f9 [Project] -root = purple -folder = orange -file = faded -title = green -chapter = red -scene = blue -note = yellow +root = purple +folder = orange +file = faded +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #eaeef2 windowtext = default -base = #ffffff +base = base alternatebase = #dfe4e9 text = default tooltipbase = #fae17d @@ -42,14 +46,15 @@ highlight = #dafbe1 highlightedtext = #1a7f37 link = blue linkvisited = blue +accent = #dafbe1 [GUI] -helptext = faded -fadedtext = faded:128 -errortext = #cf222e +helptext = faded +fadedtext = faded:128 +errortext = #cf222e [Syntax] -background = #ffffff +background = base text = faded link = blue headertext = default diff --git a/novelwriter/assets/themes/snazzy.conf b/novelwriter/assets/themes/snazzy.conf index f2fa7785..0cec0326 100644 --- a/novelwriter/assets/themes/snazzy.conf +++ b/novelwriter/assets/themes/snazzy.conf @@ -21,6 +21,7 @@ licenseurl = https://github.com/loilo/vscode-snazzy-light/blob/master/LICENSE ## [Base] +base = #fafbfc default = #565869 faded = #545554 red = #ff5c57 @@ -32,29 +33,33 @@ blue = #09a1ed purple = #f767bb [Project] -root = blue -folder = yellow -file = faded -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = faded +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #f3f4f5 windowtext = default -base = #fafbfc +base = base alternatebase = #eaeaeb text = default tooltipbase = #f5e9c2 tooltiptext = default -button = #fafbfc +button = base buttontext = default -brighttext = #ffffff +brighttext = base highlight = blue highlightedtext = #ffffff link = blue linkvisited = blue +accent = blue [GUI] helptext = blue @@ -62,7 +67,7 @@ fadedtext = faded errortext = red [Syntax] -background = #fafbfc +background = base text = default link = blue headertext = green diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf index 8b07003a..e3f146ba 100644 --- a/novelwriter/assets/themes/solarized_dark.conf +++ b/novelwriter/assets/themes/solarized_dark.conf @@ -27,6 +27,7 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE ## [Base] +base = #073642 default = #fdf6e3 faded = #eee8d5 red = #dc322f @@ -38,29 +39,33 @@ blue = #268bd2 purple = #6c71c4 [Project] -root = cyan -folder = cyan -file = default -title = green -chapter = red -scene = blue -note = yellow +root = cyan +folder = cyan +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #002b36 windowtext = default -base = #073642 +base = base alternatebase = #586e75 text = default tooltipbase = yellow tooltiptext = #002b36 -button = #073642 +button = base buttontext = default -brighttext = #073642 +brighttext = base highlight = cyan highlightedtext = default link = blue linkvisited = blue +accent = cyan [GUI] helptext = cyan @@ -68,7 +73,7 @@ fadedtext = faded errortext = red [Syntax] -background = #073642 +background = base text = default link = blue headertext = default:D125 diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf index 22b165b9..76c2eec2 100644 --- a/novelwriter/assets/themes/solarized_light.conf +++ b/novelwriter/assets/themes/solarized_light.conf @@ -27,6 +27,7 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE ## [Base] +base = #eee8d5 default = #002b36 faded = #073642 red = #dc322f @@ -38,30 +39,33 @@ blue = #268bd2 purple = #6c71c4 [Project] -root = cyan -folder = cyan -file = default -title = green -chapter = red -scene = blue -note = yellow - +root = cyan +folder = cyan +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #fdf6e3 windowtext = default -base = #eee8d5 +base = base alternatebase = #93a1a1 text = default tooltipbase = yellow tooltiptext = #002b36 -button = #eee8d5 +button = base buttontext = default -brighttext = #eee8d5 +brighttext = base highlight = cyan highlightedtext = default link = blue linkvisited = blue +accent = cyan [GUI] helptext = cyan @@ -69,7 +73,7 @@ fadedtext = faded errortext = red [Syntax] -background = #eee8d5 +background = base text = default link = blue headertext = default:L125 diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf index 252bce4d..f987e44e 100644 --- a/novelwriter/assets/themes/tango_dark.conf +++ b/novelwriter/assets/themes/tango_dark.conf @@ -18,6 +18,7 @@ author = Veronica Berglyd Olsen (adaptation) ## [Base] +base = #2e3436 default = #eeeeec faded = #babdb6 red = #ef2929 @@ -29,18 +30,21 @@ blue = #729fcf purple = #ad7fa8 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #555753 windowtext = default -base = #2e3436 +base = base alternatebase = #454e51 text = default tooltipbase = #ffffc0 @@ -52,6 +56,7 @@ highlight = blue highlightedtext = #ffffff link = blue linkvisited = blue +accent = blue [GUI] helptext = orange @@ -59,7 +64,7 @@ fadedtext = faded errortext = red [Syntax] -background = #2e3436 +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf index c702de8d..afc6e15a 100644 --- a/novelwriter/assets/themes/tango_light.conf +++ b/novelwriter/assets/themes/tango_light.conf @@ -18,6 +18,7 @@ author = Veronica Berglyd Olsen (adaptation) ## [Base] +base = #eeeeec default = #2e3436 faded = #888a85 red = #a40000 @@ -29,18 +30,21 @@ blue = #204a87 purple = #5c3566 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #d3d7cf windowtext = default -base = #eeeeec +base = base alternatebase = #e0e0e0 text = default tooltipbase = #ffffc0 @@ -52,6 +56,7 @@ highlight = blue:L200 highlightedtext = #ffffff link = blue linkvisited = blue +accent = blue:L150 [GUI] helptext = orange @@ -59,7 +64,7 @@ fadedtext = faded errortext = red [Syntax] -background = #eeeeec +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/tomorrow.conf b/novelwriter/assets/themes/tomorrow.conf index 2736fdae..3175e68b 100644 --- a/novelwriter/assets/themes/tomorrow.conf +++ b/novelwriter/assets/themes/tomorrow.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] +base = #ffffff default = #484848 faded = #6c6c6c red = #c82829 @@ -39,18 +40,21 @@ blue = #4271ae purple = #8959a8 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #efefef windowtext = #000000 -base = #ffffff +base = base alternatebase = #d6d6d6 text = #000000 tooltipbase = #ffffc0 @@ -59,9 +63,10 @@ button = #efefef buttontext = #000000 brighttext = #efefef highlight = blue -highlightedtext = #ffffff +highlightedtext = base link = blue linkvisited = blue +accent = blue [GUI] helptext = #5c5c5c @@ -69,7 +74,7 @@ fadedtext = faded errortext = red [Syntax] -background = #ffffff +background = base text = #4d4d4c link = blue headertext = blue diff --git a/novelwriter/assets/themes/tomorrow_night.conf b/novelwriter/assets/themes/tomorrow_night.conf index c266b31d..671d1a9c 100644 --- a/novelwriter/assets/themes/tomorrow_night.conf +++ b/novelwriter/assets/themes/tomorrow_night.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] +base = #1d1f21 default = #c5c8c6 faded = #969896 red = #cc6666 @@ -39,29 +40,33 @@ blue = #81a2be purple = #b294bb [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #282a2e windowtext = default -base = #1d1f21 +base = base alternatebase = #373b41 text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #1d1f21 +button = base buttontext = default -brighttext = #1d1f21 +brighttext = base highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = #a4a4a4 @@ -69,7 +74,7 @@ fadedtext = #949494 errortext = red [Syntax] -background = #1d1f21 +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/tomorrow_night_blue.conf b/novelwriter/assets/themes/tomorrow_night_blue.conf index f96448af..326eb9d2 100644 --- a/novelwriter/assets/themes/tomorrow_night_blue.conf +++ b/novelwriter/assets/themes/tomorrow_night_blue.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] +base = #002451 default = #ffffff faded = #7285b7 red = #ff9da4 @@ -39,29 +40,33 @@ blue = #bbdaff purple = #ebbbff [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #00346e windowtext = default -base = #002451 +base = base alternatebase = #003f8e text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #002451 +button = base buttontext = default -brighttext = #002451 +brighttext = base highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = #a4a4a4 @@ -69,7 +74,7 @@ fadedtext = #949494 errortext = red [Syntax] -background = #002451 +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/tomorrow_night_bright.conf b/novelwriter/assets/themes/tomorrow_night_bright.conf index 82cac1d0..311ee3f1 100644 --- a/novelwriter/assets/themes/tomorrow_night_bright.conf +++ b/novelwriter/assets/themes/tomorrow_night_bright.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] +base = #000000 default = #eaeaea faded = #969896 red = #d54e53 @@ -39,29 +40,33 @@ blue = #7aa6da purple = #c397d8 [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #2a2a2a windowtext = default -base = #000000 +base = base alternatebase = #424242 text = default tooltipbase = #ffffc0 tooltiptext = #15150d -button = #000000 +button = base buttontext = default -brighttext = #000000 +brighttext = base highlight = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = #a4a4a4 @@ -69,7 +74,7 @@ fadedtext = #949494 errortext = red [Syntax] -background = #000000 +background = base text = default link = blue headertext = blue diff --git a/novelwriter/assets/themes/tomorrow_night_eighties.conf b/novelwriter/assets/themes/tomorrow_night_eighties.conf index e14b0dac..367e1968 100644 --- a/novelwriter/assets/themes/tomorrow_night_eighties.conf +++ b/novelwriter/assets/themes/tomorrow_night_eighties.conf @@ -28,6 +28,7 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE. ## [Base] +base = #2d2d2d default = #cccccc faded = #999999 red = #f2777a @@ -39,29 +40,33 @@ blue = #6699cc purple = #cc99cc [Project] -root = blue -folder = yellow -file = default -title = green -chapter = red -scene = blue -note = yellow +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded [Palette] window = #393939 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 = #2c98f7 highlightedtext = #ffffff link = blue linkvisited = blue +accent = #2c98f7 [GUI] helptext = #a4a4a4 @@ -69,7 +74,7 @@ fadedtext = #949494 errortext = red [Syntax] -background = #2d2d2d +background = base text = default link = blue headertext = blue