Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change how default theme colours are handled

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-13 19:07:15 +02:00
parent d574b2796f
commit 6f885efb7f
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/theme.py
+15 -5
View File
@@ -74,9 +74,9 @@ class GuiTheme:
self.isLightTheme = True self.isLightTheme = True
# GUI # GUI
self.statNone = QColor(120, 120, 120) self.statNone = QColor(0, 0, 0)
self.statUnsaved = QColor(200, 15, 39) self.statUnsaved = QColor(0, 0, 0)
self.statSaved = QColor(2, 133, 37) self.statSaved = QColor(0, 0, 0)
self.helpText = QColor(0, 0, 0) self.helpText = QColor(0, 0, 0)
# Loaded Syntax Settings # Loaded Syntax Settings
@@ -227,6 +227,10 @@ class GuiTheme:
logException() logException()
return False return False
# Reset Palette
self._guiPalette = QApplication.style().standardPalette()
self._resetGuiColors()
# Main # Main
sec = "Main" sec = "Main"
if parser.has_section(sec): if parser.has_section(sec):
@@ -256,8 +260,6 @@ class GuiTheme:
self._setPalette(parser, sec, "highlightedtext", QPalette.ColorRole.HighlightedText) self._setPalette(parser, sec, "highlightedtext", QPalette.ColorRole.HighlightedText)
self._setPalette(parser, sec, "link", QPalette.ColorRole.Link) self._setPalette(parser, sec, "link", QPalette.ColorRole.Link)
self._setPalette(parser, sec, "linkvisited", QPalette.ColorRole.LinkVisited) self._setPalette(parser, sec, "linkvisited", QPalette.ColorRole.LinkVisited)
else:
self._guiPalette = QApplication.style().standardPalette()
# GUI # GUI
sec = "GUI" sec = "GUI"
@@ -393,6 +395,14 @@ class GuiTheme:
# Internal Functions # Internal Functions
## ##
def _resetGuiColors(self) -> None:
"""Reset GUI colours to default values."""
self.statNone = QColor(120, 120, 120)
self.statUnsaved = QColor(200, 15, 39)
self.statSaved = QColor(2, 133, 37)
self.helpText = QColor(0, 0, 0)
return
def _setGuiFont(self) -> None: def _setGuiFont(self) -> None:
"""Update the GUI's font style from settings.""" """Update the GUI's font style from settings."""
font = QFont() font = QFont()
tests/test_gui/test_gui_theme.py
+3 -3
View File
@@ -186,11 +186,11 @@ def testGuiTheme_Theme(qtbot, monkeypatch, nwGUI):
# Check a few values # Check a few values
assert mainTheme._guiPalette.color( assert mainTheme._guiPalette.color(
QPalette.ColorRole.Window).getRgb() == (239, 239, 239, 255) QPalette.ColorRole.Window).getRgb() == (239, 239, 239, 255)
assert mainTheme._guiPalette.color( assert mainTheme._guiPalette.color(
QPalette.ColorRole.WindowText).getRgb() == (0, 0, 0, 255) QPalette.ColorRole.WindowText).getRgb() == (0, 0, 0, 255)
assert mainTheme._guiPalette.color( assert mainTheme._guiPalette.color(
QPalette.ColorRole.Base).getRgb() == (255, 255, 255, 255) QPalette.ColorRole.Base).getRgb() == (255, 255, 255, 255)
assert mainTheme._guiPalette.color( assert mainTheme._guiPalette.color(
QPalette.ColorRole.AlternateBase).getRgb() == (239, 239, 239, 255) QPalette.ColorRole.AlternateBase).getRgb() == (239, 239, 239, 255)