novelWriter 2.4.4__py3-none-any.whl → 2.5__py3-none-any.whl

novelwriter/gui/theme.py

@@ -46,12 +46,11 @@ STYLES_MIN_TOOLBUTTON = "minimalToolButton"
 STYLES_BIG_TOOLBUTTON = "bigToolButton"
 
 
-# =============================================================================================== #
-#  Gui Theme Class
-#  Handles the look and feel of novelWriter
-# =============================================================================================== #
-
 class GuiTheme:
+    """Gui Theme Class
+
+    Handles the look and feel of novelWriter.
+    """
 
     def __init__(self) -> None:
 
@@ -76,6 +75,8 @@ class GuiTheme:
         self.statUnsaved = QColor(0, 0, 0)
         self.statSaved   = QColor(0, 0, 0)
         self.helpText    = QColor(0, 0, 0)
+        self.fadedText   = QColor(0, 0, 0)
+        self.errorText   = QColor(255, 0, 0)
 
         # Loaded Syntax Settings
         # ======================
@@ -97,11 +98,12 @@ class GuiTheme:
         self.colHeadH  = QColor(0, 0, 0)
         self.colEmph   = QColor(0, 0, 0)
         self.colDialN  = QColor(0, 0, 0)
-        self.colDialD  = QColor(0, 0, 0)
-        self.colDialS  = QColor(0, 0, 0)
+        self.colDialA  = QColor(0, 0, 0)
         self.colHidden = QColor(0, 0, 0)
+        self.colNote   = QColor(0, 0, 0)
         self.colCode   = QColor(0, 0, 0)
         self.colKey    = QColor(0, 0, 0)
+        self.colTag    = QColor(0, 0, 0)
         self.colVal    = QColor(0, 0, 0)
         self.colOpt    = QColor(0, 0, 0)
         self.colSpell  = QColor(0, 0, 0)
@@ -113,9 +115,6 @@ class GuiTheme:
         # Class Setup
         # ===========
 
-        # Init GUI Font
-        self._setGuiFont()
-
         # Load Themes
         self._guiPalette = QPalette()
         self._themeList: list[tuple[str, str]] = []
@@ -265,6 +264,8 @@ class GuiTheme:
         sec = "GUI"
         if parser.has_section(sec):
             self.helpText    = self._parseColour(parser, sec, "helptext")
+            self.fadedText   = self._parseColour(parser, sec, "fadedtext")
+            self.errorText   = self._parseColour(parser, sec, "errortext")
             self.statNone    = self._parseColour(parser, sec, "statusnone")
             self.statUnsaved = self._parseColour(parser, sec, "statusunsaved")
             self.statSaved   = self._parseColour(parser, sec, "statussaved")
@@ -282,6 +283,10 @@ class GuiTheme:
             else:
                 helpLCol = backLNess + 0.65*(textLNess - backLNess)
             self.helpText = QColor.fromHsl(0, 0, int(255*helpLCol))
+            logger.debug(
+                "Computed help text colour: rgb(%d, %d, %d)",
+                self.helpText.red(), self.helpText.green(), self.helpText.blue()
+            )
 
         # Icons
         defaultIcons = "typicons_light" if backLNess >= 0.5 else "typicons_dark"
@@ -339,12 +344,13 @@ class GuiTheme:
             self.colHead   = self._parseColour(confParser, cnfSec, "headertext")
             self.colHeadH  = self._parseColour(confParser, cnfSec, "headertag")
             self.colEmph   = self._parseColour(confParser, cnfSec, "emphasis")
-            self.colDialN  = self._parseColour(confParser, cnfSec, "straightquotes")
-            self.colDialD  = self._parseColour(confParser, cnfSec, "doublequotes")
-            self.colDialS  = self._parseColour(confParser, cnfSec, "singlequotes")
+            self.colDialN  = self._parseColour(confParser, cnfSec, "dialog")
+            self.colDialA  = self._parseColour(confParser, cnfSec, "altdialog")
             self.colHidden = self._parseColour(confParser, cnfSec, "hidden")
+            self.colNote   = self._parseColour(confParser, cnfSec, "note")
             self.colCode   = self._parseColour(confParser, cnfSec, "shortcode")
             self.colKey    = self._parseColour(confParser, cnfSec, "keyword")
+            self.colTag    = self._parseColour(confParser, cnfSec, "tag")
             self.colVal    = self._parseColour(confParser, cnfSec, "value")
             self.colOpt    = self._parseColour(confParser, cnfSec, "optional")
             self.colSpell  = self._parseColour(confParser, cnfSec, "spellcheckline")
@@ -401,27 +407,8 @@ class GuiTheme:
         self.statUnsaved = QColor(200, 15, 39)
         self.statSaved   = QColor(2, 133, 37)
         self.helpText    = QColor(0, 0, 0)
-        return
-
-    def _setGuiFont(self) -> None:
-        """Update the GUI's font style from settings."""
-        font = QFont()
-        fontDB = QFontDatabase()
-        if CONFIG.guiFont not in fontDB.families():
-            if CONFIG.osWindows and "Arial" in fontDB.families():
-                # On Windows we default to Arial if possible
-                font.setFamily("Arial")
-                font.setPointSize(10)
-            else:
-                font = fontDB.systemFont(QFontDatabase.SystemFont.GeneralFont)
-            CONFIG.guiFont = font.family()
-            CONFIG.guiFontSize = font.pointSize()
-        else:
-            font.setFamily(CONFIG.guiFont)
-            font.setPointSize(CONFIG.guiFontSize)
-
-        QApplication.setFont(font)
-
+        self.fadedText   = QColor(128, 128, 128)
+        self.errorText   = QColor(255, 0, 0)
         return
 
     def _listConf(self, targetDict: dict, checkDir: Path) -> bool:
@@ -480,12 +467,6 @@ class GuiTheme:
 
         return
 
-# End Class GuiTheme
-
-
-# =============================================================================================== #
-#  Icons Class
-# =============================================================================================== #
 
 class GuiIcons:
     """The icon class manages the content of the assets/icons folder,
@@ -523,9 +504,9 @@ class GuiIcons:
 
         # General Button Icons
         "add", "add_document", "backward", "bookmark", "browse", "checked", "close", "cross",
-        "document", "down", "edit", "export", "forward", "import", "list", "maximise", "menu",
-        "minimise", "more", "noncheckable", "open", "panel", "refresh", "remove", "revert",
-        "search_replace", "search", "settings", "star", "unchecked", "up", "view",
+        "document", "down", "edit", "export", "font", "forward", "import", "list", "maximise",
+        "menu", "minimise", "more", "noncheckable", "open", "panel", "quote", "refresh", "remove",
+        "revert", "search_replace", "search", "settings", "star", "unchecked", "up", "view",
 
         # Switches
         "sticky-on", "sticky-off",
@@ -793,12 +774,9 @@ class GuiIcons:
 
         return self._noIcon
 
-# END Class GuiIcons
-
 
-# =============================================================================================== #
-#  Module Functions
-# =============================================================================================== #
+# Module Functions
+# ================
 
 
 def _sortTheme(data: tuple[str, str]) -> str: