From ed9470d9efccdcc7c3eacd67fc01a0750fc2bf17 Mon Sep 17 00:00:00 2001 From: SRHTNIN Date: Tue, 13 Oct 2026 19:24:37 +0200 Subject: [PATCH] Create the shared themes folder with the built-in themes Co-Authored-By: Claude Opus 5.5 --- Core.py | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/Core.py b/Core.py index aede4a4..3e97e03 100644 --- a/Core.py +++ b/Core.py @@ -52,8 +52,8 @@ AudioExtensions = { BundleDir = Path(getattr(sys, "_MEIPASS", Path(__file__).resolve().parent)) AssetsDir = BundleDir / "assets" -# Themes SaraFem seeds into ThemesDir. Only other themes travel with an -# export as full palettes (same rule as SaraFem's ExportSettings). +# Only themes other than these travel with an export as full palettes (same +# rule as SaraFem's ExportSettings). BuiltinThemeNames = {"CatppuccinMocha", "Forest", "Gruvbox"} @@ -85,10 +85,49 @@ _ThemeRoleMap = { } +# The themes every SaraSuite program seeds into ThemesDir if they're missing +# (same values as SaraFem's and SaraView's), so whichever program is installed +# first, the folder and these three are there to choose from. +BuiltinThemes: dict[str, dict[str, str]] = { + "CatppuccinMocha": { + "Background": "#1e1e2e", "Surface": "#181825", "SurfaceAlt": "#313244", "Border": "#45475a", + "Text": "#cdd6f4", "TextMuted": "#6c7086", "Black": "#11111b", "White": "#cdd6f4", + "Red": "#f38ba8", "Orange": "#fab387", "Yellow": "#f9e2af", "Green": "#a6e3a1", + "Blue": "#89b4fa", "Purple": "#cba6f7", + }, + "Forest": { + "Background": "#1b2420", "Surface": "#141b17", "SurfaceAlt": "#243029", "Border": "#334539", + "Text": "#d6e5d0", "TextMuted": "#7c9184", "Black": "#0d120f", "White": "#eef5ea", + "Red": "#e0685a", "Orange": "#e0a458", "Yellow": "#e0c458", "Green": "#7fb069", + "Blue": "#5c9e8f", "Purple": "#9b7fb0", + }, + "Gruvbox": { + "Background": "#282828", "Surface": "#1d2021", "SurfaceAlt": "#3c3836", "Border": "#504945", + "Text": "#ebdbb2", "TextMuted": "#a89984", "Black": "#1d2021", "White": "#fbf1c7", + "Red": "#fb4934", "Orange": "#fe8019", "Yellow": "#fabd2f", "Green": "#b8bb26", + "Blue": "#83a598", "Purple": "#d3869b", + }, +} + + +def EnsureSharedThemes() -> None: + """Create ThemesDir with the built-in themes that aren't there yet + (never overwriting one: it may have been edited).""" + try: + ThemesDir.mkdir(parents=True, exist_ok=True) + for Name, RoleValues in BuiltinThemes.items(): + ThemeFile = ThemesDir / f"{Name}.toml" + if not ThemeFile.exists(): + ThemeFile.write_text(tomlkit.dumps({"Palette": RoleValues})) + except OSError: + pass # read-only or full: the built-in Catppuccin Mocha values still apply + + def ApplyTheme(ThemeName: str) -> None: """Mutate Palette in place from ~/.config/SaraSuite/Themes/.toml. Keeps the built-in Catppuccin Mocha values if the file is missing. Must run before any control reads Palette.X.""" + EnsureSharedThemes() ThemeFile = ThemesDir / f"{ThemeName}.toml" if not ThemeFile.exists(): return @@ -102,6 +141,7 @@ def ApplyTheme(ThemeName: str) -> None: def AvailableThemes() -> list[str]: + EnsureSharedThemes() Names = {ThemePath.stem for ThemePath in ThemesDir.glob("*.toml")} if ThemesDir.is_dir() else set() Names.add("CatppuccinMocha") return sorted(Names)