Merge pull request #108 from drunkenbot-ai/develop

Develop

Author: drunkenbot-ai

interface/app.py

@@ -94,6 +94,7 @@
 from engine.training_service import run_training_job
 
 from interface.startup_splash import StartupSplash
+from interface.theme import apply_theme, load_startup_theme
 
 from engine.license_client import load_stored_license_key
 from interface.license_activation_dialog import LicenseActivationDialog, run_license_check_responsively
@@ -269,6 +270,7 @@ def main(app: Optional[QApplication] = None, splash: Optional[StartupSplash] = N
         except Exception:
             LOGGER.exception("Could not set Windows app user model ID")
     app = app or QApplication(sys.argv)
+    apply_theme(load_startup_theme())
     app.setFont(QFont("Arial", 10))
     app.setWindowIcon(MainWindow._static_app_icon())
     splash = splash or StartupValidationSplash()

interface/charts.py

@@ -8,6 +8,24 @@
 from PySide6.QtGui import QCursor
 from PySide6.QtWidgets import QSizePolicy, QToolTip, QVBoxLayout, QWidget
 
+from interface.theme import DARK_THEME, current_theme
+
+
+def _apply_plot_theme(plot: pg.PlotWidget, title: str, x_label: str, y_label: str, theme: str) -> None:
+    """Apply colors to a pyqtgraph plot, which does not inherit Qt QSS."""
+    if theme == DARK_THEME:
+        background, foreground, axis = "#141414", "#eeeeee", "#6a6a6a"
+    else:
+        background, foreground, axis = "#ffffff", "#202020", "#8a8a8a"
+    plot.setBackground(background)
+    plot.setTitle(title, color=foreground, size="10pt")
+    plot.setLabel("bottom", x_label, color=foreground)
+    plot.setLabel("left", y_label, color=foreground)
+    plot.getAxis("bottom").setPen(pg.mkPen(axis))
+    plot.getAxis("left").setPen(pg.mkPen(axis))
+    plot.getAxis("bottom").setTextPen(pg.mkPen(foreground))
+    plot.getAxis("left").setTextPen(pg.mkPen(foreground))
+
 
 class DatasetBarChartWidget(QWidget):
     """Compact bar chart for dataset composition and token statistics."""
@@ -33,22 +51,18 @@ def __init__(
         self.labels: list[str] = []
         self.values: list[float] = []
         self.value_suffix = ""
+        self.title = title
+        self.y_label = y_label
 
         layout = QVBoxLayout(self)
         layout.setContentsMargins(0, 0, 0, 0)
         layout.setSpacing(0)
         pg.setConfigOptions(antialias=True)
         self.plot = pg.PlotWidget()
-        self.plot.setBackground("#141414")
-        self.plot.setTitle(title, color="#eeeeee", size="10pt")
-        self.plot.setLabel("left", y_label, color="#d7d7d7")
+        self.apply_theme(current_theme())
         self.plot.showGrid(x=False, y=True, alpha=0.24)
         self.plot.setMenuEnabled(False)
         self.plot.setMouseEnabled(x=False, y=False)
-        self.plot.getAxis("bottom").setPen(pg.mkPen("#6a6a6a"))
-        self.plot.getAxis("left").setPen(pg.mkPen("#6a6a6a"))
-        self.plot.getAxis("bottom").setTextPen(pg.mkPen("#cfcfcf"))
-        self.plot.getAxis("left").setTextPen(pg.mkPen("#cfcfcf"))
         self.plot.getPlotItem().setContentsMargins(8, 8, 8, 8)
         self.bar_item = pg.BarGraphItem(x=[], height=[], width=0.58, brush=pg.mkBrush("#f5b041"))
         self.plot.addItem(self.bar_item)
@@ -58,6 +72,10 @@ def __init__(
         layout.addWidget(self.plot)
         self.clear()
 
+    def apply_theme(self, theme: str) -> None:
+        """Refresh this custom plot for the selected application theme."""
+        _apply_plot_theme(self.plot, self.title, "", self.y_label, theme)
+
     def clear(self) -> None:
         """Clear chart values."""
 
@@ -163,17 +181,10 @@ def __init__(
         layout.setSpacing(0)
         pg.setConfigOptions(antialias=True)
         self.plot = pg.PlotWidget()
-        self.plot.setBackground("#141414")
-        self.plot.setTitle(title, color="#eeeeee", size="11pt")
-        self.plot.setLabel("bottom", "Optimizer step", color="#d7d7d7")
-        self.plot.setLabel("left", y_label, color="#d7d7d7")
+        self.apply_theme(current_theme())
         self.plot.showGrid(x=True, y=True, alpha=0.28)
         self.plot.setMenuEnabled(False)
         self.plot.setMouseEnabled(x=True, y=True)
-        self.plot.getAxis("bottom").setPen(pg.mkPen("#6a6a6a"))
-        self.plot.getAxis("left").setPen(pg.mkPen("#6a6a6a"))
-        self.plot.getAxis("bottom").setTextPen(pg.mkPen("#cfcfcf"))
-        self.plot.getAxis("left").setTextPen(pg.mkPen("#cfcfcf"))
         self.plot.getPlotItem().setContentsMargins(10, 8, 10, 8)
         self.legend = self.plot.addLegend(offset=(12, 8), brush=pg.mkBrush(20, 20, 20, 180), pen=pg.mkPen("#444444"))
         self.primary_curve = self.plot.plot([], [], pen=pg.mkPen("#f5b041", width=2), name=primary_label)
@@ -188,6 +199,10 @@ def __init__(
         layout.addWidget(self.plot)
         self._refresh_plot()
 
+    def apply_theme(self, theme: str) -> None:
+        """Refresh this custom plot for the selected application theme."""
+        _apply_plot_theme(self.plot, self.title, "Optimizer step", self.y_label, theme)
+
     def clear(self) -> None:
         """Remove all plotted loss values."""
 
@@ -397,4 +412,3 @@ def _nearest_point(self, x_value: float, y_value: float) -> Optional[tuple[str,
         )
         distance = ((nearest[1] - x_value) / x_span) ** 2 + ((nearest[2] - y_value) / y_span) ** 2
         return nearest if distance < 0.01 else None
-

interface/core/project_state.py

@@ -23,6 +23,8 @@ def _default_project_state(self) -> dict[str, Any]:
         return {
             "schema": "drunkenbot_ide_project",
             "version": 1,
+            "theme": "dark",
+            "theme_preference_version": 1,
             "project_name": "",
             "project_dir": "",
             "paths": {
@@ -254,6 +256,8 @@ def _project_state_dict(self, project_name: str, project_dir: Path) -> dict[str,
         return {
             "schema": "drunkenbot_ide_project",
             "version": 1,
+            "theme": self.theme_name,
+            "theme_preference_version": 1,
             "project_name": project_name,
             "project_dir": str(project_dir),
             "created_at": created_at,

interface/core/project_state_apply.py

@@ -3,6 +3,7 @@
 # ProjectStateApplyMixin mixin. Shared runtime names are provided by interface.app.
 from typing import Any, Optional, Union  # noqa: F401
 from interface import app as _app
+from interface.theme import project_theme
 
 globals().update({name: value for name, value in vars(_app).items() if not name.startswith("__")})
 
@@ -15,6 +16,7 @@ def _apply_project_state(self, data: dict[str, Any]) -> None:
             data: Project state loaded from JSON.
         """
 
+        self.set_theme(project_theme(data), persist=False)
         self.search_box.setText(str(data.get("project_name", "")))
         paths = data.get("paths", {})
         dataset = data.get("dataset", {})

interface/core/window_core.py

@@ -2,7 +2,8 @@
 
 # WindowCoreMixin mixin. Shared runtime names are provided by interface.app.
 from typing import Any, Optional, Union  # noqa: F401
-from interface.widgets.app_shell import build_main_shell
+from interface.widgets.app_shell import build_main_shell, update_navigation_icons
+from interface.theme import apply_theme, current_theme, normalize_theme
 from interface import app as _app
 
 globals().update({name: value for name, value in vars(_app).items() if not name.startswith("__")})
@@ -74,10 +75,12 @@ def __init__(self) -> None:
         self.job_manager_timer.setInterval(2500)
         self.job_manager_timer.timeout.connect(self.refresh_job_manager_tab)
 
-        self._apply_style()
+        self.theme_name = current_theme()
+        self._apply_theme()
 
         shell = self._build_shell()
         self.setCentralWidget(shell)
+        update_navigation_icons(self)
         self._install_ui_event_logging(shell)
         self._install_wheel_guard(shell)
         self._refresh_notification_manager()
@@ -152,6 +155,26 @@ def _install_ui_event_logging(self, root: QWidget) -> None:
                     lambda item=widget: self._log_ui_event("edited", item, item.text())
                 )
 
+    def edit_focused_widget(self, method_name: str) -> None:
+        """Run a standard edit operation on the currently focused editor.
+
+        Args:
+            method_name: Qt editor method to invoke, such as ``copy`` or
+                ``selectAll``.
+        """
+        widget = QApplication.focusWidget()
+        method = getattr(widget, method_name, None) if widget is not None else None
+        if callable(method):
+            method()
+
+    def show_about_dialog(self) -> None:
+        """Display the application identity and version."""
+        QMessageBox.information(
+            self,
+            f"About {APP_NAME}",
+            f"{APP_NAME} {APP_VERSION}\n\nA desktop environment for building, training, and using LLMs.",
+        )
+
     def _log_ui_event(self, action: str, widget: QWidget, value: Any) -> None:
         """Log a UI action or parameter value.
 
@@ -185,11 +208,31 @@ def _widget_log_name(widget: QWidget) -> str:
             return widget.objectName()
         return widget.__class__.__name__
 
-    def _apply_style(self) -> None:
-        """Load the application stylesheet from the QSS module file."""
+    def _apply_theme(self) -> None:
+        """Apply the window's selected theme application-wide."""
+        self.theme_name = apply_theme(self.theme_name)
 
-        qss_path = Path(_app.__file__).with_name("styles.qss")
-        self.setStyleSheet(qss_path.read_text(encoding="utf-8"))
+    def update_theme_actions(self) -> None:
+        """Synchronize the theme menu checks with the active theme."""
+        if not hasattr(self, "system_theme_action"):
+            return
+        self.system_theme_action.setChecked(self.theme_name == "system")
+        self.dark_theme_action.setChecked(self.theme_name == "dark")
+
+    def set_theme(self, theme: object, persist: bool = True) -> None:
+        """Select an application theme and persist it for the active project.
+
+        Args:
+            theme: Requested theme identifier.
+            persist: Whether to save the selection to the active project.
+        """
+        self.theme_name = normalize_theme(theme)
+        self._apply_theme()
+        if hasattr(self, "side_rail"):
+            update_navigation_icons(self)
+        self.update_theme_actions()
+        if persist and self.current_project_file is not None:
+            self.save_project()
 
     def _build_shell(self) -> QWidget:
         """Build the top-level dashboard shell from reusable widgets."""