Preserve structure across themes

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: baremetalgo

interface/startup.py

@@ -32,7 +32,7 @@
     _run_startup_validations,
     _validate_writable_directory,
 )
-from .theme import apply_theme, load_startup_theme
+from .theme import DARK_THEME, apply_theme, current_theme, load_startup_theme
 
 
 APP_NAME = "DrunkenBot-IDE"
@@ -271,18 +271,23 @@ def showEvent(self, event: QEvent) -> None:
         _apply_windows_taskbar_icon(self)
 
     def _render_checks(self) -> None:
+        colors = (
+            {"done": "#ffffff", "running": "#e2cfaa", "failed": "#ff9a9a", "pending": "#bdbdbd"}
+            if current_theme() == DARK_THEME
+            else {"done": "#202020", "running": "#7a5100", "failed": "#a82d2d", "pending": "#555555"}
+        )
         rows: list[str] = ["<ul style='margin:0; padding-left:18px; line-height:1.8;'>"]
         for label in self._check_order:
             state = self._checks.get(label, "pending")
             escaped = html.escape(label)
             if state == "done":
-                rows.append(f"<li style='color:#ffffff;'>[OK] {escaped}</li>")
+                rows.append(f"<li style='color:{colors['done']};'>[OK] {escaped}</li>")
             elif state == "running":
-                rows.append(f"<li style='color:#e2cfaa;'>[*] {escaped}</li>")
+                rows.append(f"<li style='color:{colors['running']};'>[*] {escaped}</li>")
             elif state == "failed":
-                rows.append(f"<li style='color:#ff9a9a;'>[FAIL] {escaped}</li>")
+                rows.append(f"<li style='color:{colors['failed']};'>[FAIL] {escaped}</li>")
             else:
-                rows.append(f"<li style='color:#bdbdbd;'>- {escaped}</li>")
+                rows.append(f"<li style='color:{colors['pending']};'>- {escaped}</li>")
         rows.append("</ul>")
         self.checks_view.setHtml("".join(rows))
         QApplication.processEvents()

interface/startup_splash.py

@@ -9,7 +9,7 @@
 from PySide6.QtGui import QFont, QPixmap
 from PySide6.QtWidgets import QDialog, QLabel, QHBoxLayout, QProgressBar, QTextBrowser, QVBoxLayout
 
-from interface.theme import apply_theme, load_startup_theme
+from interface.theme import DARK_THEME, apply_theme, current_theme, load_startup_theme
 
 
 class StartupSplash(QDialog):
@@ -107,12 +107,17 @@ def mark_check_failed(self, label: str) -> None:
         self._render_checks()
 
     def _render_checks(self) -> None:
+        colors = (
+            {"done": "#ffffff", "running": "#e2cfaa", "failed": "#ff9a9a", "pending": "#bdbdbd"}
+            if current_theme() == DARK_THEME
+            else {"done": "#202020", "running": "#7a5100", "failed": "#a82d2d", "pending": "#555555"}
+        )
         rows = ["<ul style='margin:0; padding-left:18px; line-height:1.8;'>"]
         for label in self._check_order:
             state = self._checks.get(label, "pending")
             escaped = html.escape(label)
             marker = {"done": "[OK]", "running": "[*]", "failed": "[FAIL]"}.get(state, "-")
-            color = {"done": "#ffffff", "running": "#e2cfaa", "failed": "#ff9a9a"}.get(state, "#bdbdbd")
+            color = colors.get(state, colors["pending"])
             rows.append(f"<li style='color:{color};'>{marker} {escaped}</li>")
         rows.append("</ul>")
         self.checks_view.setHtml("".join(rows))

interface/theme.py

@@ -4,6 +4,7 @@
 
 import json
 from pathlib import Path
+import re
 
 from PySide6.QtWidgets import QApplication
 
@@ -13,6 +14,39 @@
 THEME_PREFERENCE_VERSION = 1
 _THEME_PROPERTY = "application_theme"
 _RECENT_PROJECTS_PATH = Path.home() / ".drunkenbot_ide" / "recent_projects.json"
+_SYSTEM_COLOR_MAP = {
+    "#111111": "#f5f5f5",
+    "#eeeeee": "#202020",
+    "#1f1f1f": "#ededed",
+    "#3a3a3a": "#b8b8b8",
+    "#171717": "#f0f0f0",
+    "#181818": "#f7f7f7",
+    "#242424": "#ffffff",
+    "#3d3d3d": "#c4c4c4",
+    "#141414": "#ffffff",
+    "#dddddd": "#202020",
+    "#f2f2f2": "#151515",
+    "#d8eec2": "#29451b",
+    "#20231d": "#f2f7ec",
+    "#8fbf5a": "#7aa844",
+    "#b6d77a": "#476d21",
+    "#1b1f18": "#f7fbf3",
+    "#6f8f45": "#7aa844",
+    "#171a14": "#f7fbf3",
+    "#f0f0f0": "#202020",
+    "#555555": "#8a8a8a",
+    "#6a6a6a": "#8a8a8a",
+    "#1d1d1d": "#f0f0f0",
+    "#777777": "#6a6a6a",
+    "#333333": "#b8b8b8",
+    "#4a4a4a": "#a0a0a0",
+    "#d4d4d4": "#303030",
+    "#2a2a2a": "#eeeeee",
+    "#3a3326": "#fff7e8",
+    "#c98f2e": "#b66a00",
+    "#050505": "#fafafa",
+    "#2b2b2b": "#c4c4c4",
+}
 
 
 def normalize_theme(theme: object) -> str:
@@ -56,17 +90,26 @@ def current_theme() -> str:
     return normalize_theme(app.property(_THEME_PROPERTY) if app is not None else DEFAULT_THEME)
 
 
+def _stylesheet_for_theme(theme: str) -> str:
+    """Return the shared widget stylesheet with the requested color palette."""
+    stylesheet_path = Path(__file__).with_name("styles.qss")
+    dark_stylesheet = stylesheet_path.read_text(encoding="utf-8")
+    if theme == DARK_THEME:
+        return dark_stylesheet
+    return re.sub(
+        r"#[0-9a-fA-F]{6}",
+        lambda match: _SYSTEM_COLOR_MAP.get(match.group(0).lower(), match.group(0)),
+        dark_stylesheet,
+    )
+
+
 def apply_theme(theme: object) -> str:
     """Apply the selected application-wide theme and return its normalized name."""
     selected_theme = normalize_theme(theme)
     app = QApplication.instance()
     if app is None:
         return selected_theme
-    stylesheet = ""
-    if selected_theme == DARK_THEME:
-        stylesheet_path = Path(__file__).with_name("styles.qss")
-        stylesheet = stylesheet_path.read_text(encoding="utf-8")
-    app.setStyleSheet(stylesheet)
+    app.setStyleSheet(_stylesheet_for_theme(selected_theme))
     app.setProperty(_THEME_PROPERTY, selected_theme)
     for widget in app.allWidgets():
         refresh = getattr(widget, "apply_theme", None)