add theme setting

Author: meowmeowahr

src/kevinbotlib_dashboard/__main__.py

@@ -5,7 +5,6 @@
 import sys
 
 from kevinbotlib.logger import Level, Logger, LoggerConfiguration
-from kevinbotlib.ui.theme import Theme, ThemeStyle
 from PySide6.QtCore import QCommandLineOption, QCommandLineParser, QCoreApplication
 from PySide6.QtWidgets import QApplication
 
@@ -18,8 +17,6 @@ def run():
     app.setApplicationName("KevinbotLib Dashboard")
     app.setApplicationVersion(__about__.__version__)
 
-    Theme(ThemeStyle.System).apply(app)
-
     parser = QCommandLineParser()
     parser.addHelpOption()
     parser.addVersionOption()
@@ -38,7 +35,7 @@ def run():
 
     logger.configure(LoggerConfiguration(level=log_level))
 
-    window = Application()
+    window = Application(app)
     window.show()
     sys.exit(app.exec())
 

src/kevinbotlib_dashboard/app.py

@@ -4,6 +4,8 @@
 
 from kevinbotlib.comm import CommunicationClient, BaseSendable
 from kevinbotlib.logger import Logger
+from kevinbotlib.ui.theme import Theme, ThemeStyle
+
 from PySide6.QtCore import (
     QItemSelection,
     QModelIndex,
@@ -40,9 +42,12 @@
     QTreeView,
     QVBoxLayout,
     QWidget,
+    QRadioButton,
+    QSizePolicy,
+    QApplication,
 )
 
-from kevinbotlib_dashboard.grid_theme import Themes
+from kevinbotlib_dashboard.grid_theme import Themes as GridThemes
 from kevinbotlib_dashboard.toast import Notifier, Severity
 from kevinbotlib_dashboard.tree import DictTreeModel
 from kevinbotlib_dashboard.widgets import Divider
@@ -203,7 +208,7 @@ def delete_self(self):
 
 
 class GridGraphicsView(QGraphicsView):
-    def __init__(self, parent=None, grid_size: int = 48, rows=10, cols=10, theme: Themes = Themes.Dark):
+    def __init__(self, parent=None, grid_size: int = 48, rows=10, cols=10, theme: GridThemes = GridThemes.Dark):
         super().__init__(parent)
         self.grid_size = grid_size
         self.rows, self.cols = rows, cols
@@ -223,6 +228,11 @@ def __init__(self, parent=None, grid_size: int = 48, rows=10, cols=10, theme: Th
         self.highlight_rect.setZValue(3)
         self.highlight_rect.hide()
 
+    def set_theme(self, theme: GridThemes):
+        self.theme = theme
+        self.setBackgroundBrush(QColor(theme.value.background))
+        self.update()
+
     def is_valid_drop_position(self, position, dragging_widget=None, span_x=1, span_y=1):
         grid_size = self.grid_size
         rows, cols = self.rows, self.cols
@@ -452,6 +462,11 @@ def __init__(self, parent, settings: QSettings):
         self.form = QFormLayout()
         self.root_layout.addLayout(self.form)
 
+        self.form.addRow(Divider("Theme"))
+
+        self.theme = UiColorSettingsSwitcher(settings, "theme", parent)
+        self.form.addRow("Theme", self.theme)
+
         self.form.addRow(Divider("Grid"))
 
         self.grid_size = QSpinBox(minimum=8, maximum=256, singleStep=2, value=self.settings.value("grid", 48, int))  # type: ignore
@@ -487,6 +502,49 @@ def apply(self):
         self.on_applied.emit()
 
 
+class UiColorSettingsSwitcher(QFrame):
+    def __init__(
+        self,
+        settings: QSettings,
+        key: str,
+        main_window: 'Application',
+    ):
+        super().__init__()
+        self.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
+
+        self.settings = settings
+        self.key = key
+        self.main_window = main_window
+
+        root_layout = QHBoxLayout()
+        self.setLayout(root_layout)
+
+        self.dark_mode = QRadioButton("Dark")
+        self.light_mode = QRadioButton("Light")
+        self.system_mode = QRadioButton("System")
+
+        root_layout.addWidget(self.dark_mode)
+        root_layout.addWidget(self.light_mode)
+        root_layout.addWidget(self.system_mode)
+
+        # Load saved theme setting
+        current_theme = self.settings.value(self.key, "Dark")
+        if current_theme == "Dark":
+            self.dark_mode.setChecked(True)
+        elif current_theme == "Light":
+            self.light_mode.setChecked(True)
+        else:
+            self.system_mode.setChecked(True)
+
+        self.dark_mode.toggled.connect(lambda: self.save_setting("Dark"))
+        self.light_mode.toggled.connect(lambda: self.save_setting("Light"))
+        self.system_mode.toggled.connect(lambda: self.save_setting("System"))
+
+    def save_setting(self, value: str):
+        self.settings.setValue(self.key, value)
+        self.settings.sync()
+        self.main_window.apply_theme()
+
 class TopicStatusPanel(QStackedWidget):
     def __init__(self, client: CommunicationClient):
         super().__init__()
@@ -530,7 +588,7 @@ def set_data(self, data: str | None):
 
 
 class Application(QMainWindow):
-    def __init__(self):
+    def __init__(self, app: QApplication):
         super().__init__()
         self.setWindowTitle("KevinbotLib Dashboard")
 
@@ -581,6 +639,7 @@ def __init__(self):
             grid_size=self.settings.value("grid", 48, int),  # type: ignore
             rows=self.settings.value("rows", 10, int),  # type: ignore
             cols=self.settings.value("cols", 10, int),  # type: ignore
+            theme=GridThemes.Dark,
         )
         palette = WidgetPalette(self.graphics_view, self.client)
         self.model = palette.model
@@ -605,6 +664,26 @@ def __init__(self):
         self.settings_window = SettingsWindow(self, self.settings)
         self.settings_window.on_applied.connect(self.refresh_settings)
 
+        self.theme = Theme(ThemeStyle.System)
+        self.apply_theme()
+
+    def apply_theme(self):
+        theme_name = self.settings.value("theme", "Dark")
+        if theme_name == "Dark":
+            self.theme.set_style(ThemeStyle.Dark)
+            self.graphics_view.set_theme(GridThemes.Dark)
+        elif theme_name == "Light":
+            self.theme.set_style(ThemeStyle.Light)
+            self.graphics_view.set_theme(GridThemes.Light)
+        else:
+            self.theme.set_style(ThemeStyle.System)
+            if self.theme.is_dark():
+                self.graphics_view.set_theme(GridThemes.Dark)
+            else:
+                self.graphics_view.set_theme(GridThemes.Light)
+        self.theme.apply(self)
+
+
     def update_latency(self):
         if self.client.websocket:
             self.latency_status.setText(f"Latency: {self.client.websocket.latency*1000:.2f}ms")

src/kevinbotlib_dashboard/grid_theme.py

@@ -14,9 +14,16 @@ class ThemeOptions:
 
 class Themes(Enum):
     Dark = ThemeOptions(
-        background="#1A1A1A",
-        item_background="#2E2E2E",
-        foreground="#E0E0E0",
-        primary="#005C9F",
-        border="#292929",
+        background="#1e272a",
+        item_background="#30383b",
+        foreground="#d0d8d8",
+        primary="#4682b4",
+        border="#2d3639",
+    )
+    Light = ThemeOptions(
+        background="#ffffff",
+        item_background="#dcdcdc",
+        foreground="#333333",
+        primary="#4682b4",
+        border="#d5d5d5",
     )