Merge branch 'main' into updates/shapes

This commit is contained in:
Veronica Berglyd Olsen
2024-04-13 19:22:05 +02:00
committed by GitHub
42 changed files with 3036 additions and 2939 deletions
+15 -5
View File
@@ -74,9 +74,9 @@ class GuiTheme:
self.isLightTheme = True
# GUI
self.statNone = QColor(120, 120, 120)
self.statUnsaved = QColor(200, 15, 39)
self.statSaved = QColor(2, 133, 37)
self.statNone = QColor(0, 0, 0)
self.statUnsaved = QColor(0, 0, 0)
self.statSaved = QColor(0, 0, 0)
self.helpText = QColor(0, 0, 0)
# Loaded Syntax Settings
@@ -227,6 +227,10 @@ class GuiTheme:
logException()
return False
# Reset Palette
self._guiPalette = QApplication.style().standardPalette()
self._resetGuiColors()
# Main
sec = "Main"
if parser.has_section(sec):
@@ -256,8 +260,6 @@ 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)
else:
self._guiPalette = QApplication.style().standardPalette()
# GUI
sec = "GUI"
@@ -393,6 +395,14 @@ class GuiTheme:
# 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:
"""Update the GUI's font style from settings."""
font = QFont()