Make some minor tweaks to themes and update docs (#2396)

docs/source/more/customise.rst

@@ -59,40 +59,45 @@ A colour theme ``.conf`` file consists of the following settings:
    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
+   root     = blue
-   folder  = yellow
+   folder   = yellow
-   file    = default
+   file     = default
-   title   = green
+   title    = green
-   chapter = red
+   chapter  = red
-   scene   = blue
+   scene    = blue
-   note    = yellow
+   note     = yellow
+   active   = green
+   inactive = red
+   disabled = faded
 
    [Palette]
-   window          = #efefef
+   window          = base:D105
-   windowtext      = #000000
+   windowtext      = default
-   base            = #ffffff
+   base            = base
    alternatebase   = #e0e0e0
-   text            = #000000
+   text            = default
    tooltipbase     = #ffffc0
    tooltiptext     = #15150d
    button          = #efefef
-   buttontext      = #000000
+   buttontext      = default
-   brighttext      = #ffffff
+   brighttext      = base
    highlight       = #3087c6
-   highlightedtext = #ffffff
+   highlightedtext = base
    link            = blue
    linkvisited     = blue
+   accent          = #3087c6
 
    [GUI]
    helptext  = #5c5c5c
@@ -100,15 +105,15 @@ A colour theme ``.conf`` file consists of the following settings:
    errortext = red
 
    [Syntax]
-   background     = #ffffff
+   background     = base
-   text           = #000000
+   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
@@ -119,7 +124,7 @@ A colour theme ``.conf`` file consists of the following settings:
    errorline      = green
    replacetag     = green
    modifier       = green
-   texthighlight  = #c8c80060
+   texthighlight  = yellow:72
 
 
 Theme Sections

novelwriter/assets/themes/default_dark.conf

@@ -33,7 +33,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #303030
+window          = base:L125
 windowtext      = default
 base            = base
 alternatebase   = #4e4e4e

novelwriter/assets/themes/default_light.conf

@@ -33,7 +33,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #efefef
+window          = base:D105
 windowtext      = default
 base            = base
 alternatebase   = #e0e0e0

novelwriter/assets/themes/night_owl.conf

@@ -52,7 +52,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #434652
+window          = base:L140
 windowtext      = default
 base            = base
 alternatebase   = #32374d

novelwriter/assets/themes/tango_dark.conf

@@ -42,7 +42,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #555753
+window          = base:L140
 windowtext      = default
 base            = base
 alternatebase   = #454e51

novelwriter/assets/themes/tango_light.conf

@@ -5,10 +5,10 @@ author = Veronica Berglyd Olsen (adaptation)
 
 ##
 # Colours:
-# Background = #eeeeec 
+# Background = #eeeeec
-# Foreground = #2e3436 
+# Foreground = #2e3436
 # Comment    = #8f8f8d
-# Red        = #a40000 
+# Red        = #a40000
 # Orange     = #c4a000
 # Yellow     = #fce94f
 # Green      = #8ae234
@@ -20,7 +20,7 @@ author = Veronica Berglyd Olsen (adaptation)
 [Base]
 base    = #eeeeec
 default = #2e3436
-faded   = #888a85 
+faded   = #888a85
 red     = #a40000
 orange  = #ce5c00
 yellow  = #c4a000
@@ -42,7 +42,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #d3d7cf
+window          = base:D110
 windowtext      = default
 base            = base
 alternatebase   = #e0e0e0

novelwriter/assets/themes/tomorrow_night_blue.conf

@@ -52,7 +52,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #00346e
+window          = base:L125
 windowtext      = default
 base            = base
 alternatebase   = #003f8e

novelwriter/assets/themes/tomorrow_night_bright.conf

@@ -52,7 +52,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #2a2a2a
+window          = #181818
 windowtext      = default
 base            = base
 alternatebase   = #424242

novelwriter/extensions/pagedsidebar.py

@@ -156,7 +156,7 @@ class _PagedToolButton(QToolButton):
 
         if self.isChecked():
             painter.setBrush(palette.highlight())
-            painter.setOpacity(0.35)
+            painter.setOpacity(0.8)
             painter.drawRoundedRect(0, 0, width, height, 4, 4)
             textCol = palette.highlightedText().color()
         else:

novelwriter/tools/welcome.py

@@ -419,7 +419,7 @@ class _ProjectListItem(QStyledItemDelegate):
         painter.save()
         if opt.state & QtSelected == QtSelected:
             painter.setOpacity(0.25)
-            painter.fillRect(rect, QApplication.palette().highlight())
+            painter.fillRect(rect, QApplication.palette().text())
             painter.setOpacity(1.0)
 
         painter.drawPixmap(2, rect.top() + 6, self._icon)