From c930bd26045f1f86faa4e19dd082aec5e1754a83 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:36:44 +1100 Subject: [PATCH] feat: switch to qtengine --- src/caelestia/data/templates/qtct.conf | 6 ----- src/caelestia/data/templates/qtengine.json | 22 ++++++++++++++++++ src/caelestia/utils/theme.py | 27 ++++------------------ 3 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 src/caelestia/data/templates/qtct.conf create mode 100644 src/caelestia/data/templates/qtengine.json diff --git a/src/caelestia/data/templates/qtct.conf b/src/caelestia/data/templates/qtct.conf deleted file mode 100644 index 578085a..0000000 --- a/src/caelestia/data/templates/qtct.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Appearance] -color_scheme_path={{ $config }}/colors/caelestia.colors -custom_palette=true -icon_theme=Papirus-{{ $mode }} -standard_dialogs=default -style=Darkly diff --git a/src/caelestia/data/templates/qtengine.json b/src/caelestia/data/templates/qtengine.json new file mode 100644 index 0000000..a340a7c --- /dev/null +++ b/src/caelestia/data/templates/qtengine.json @@ -0,0 +1,22 @@ +{ + "theme": { + "colorScheme": "~/.config/qtengine/caelestia.colors", + "iconTheme": "Papirus-{{ $mode }}", + "style": "Darkly", + "font": { + "family": "Sans Serif", + "size": 12, + "weight": -1 + }, + "fontFixed": { + "family": "Monospace", + "size": 12, + "weight": -1 + } + }, + "misc": { + "menusHaveIcons": true, + "singleClickActivate": false, + "shortcutsForContextMenus": true + } +} diff --git a/src/caelestia/utils/theme.py b/src/caelestia/utils/theme.py index c36de9b..c5ced3a 100644 --- a/src/caelestia/utils/theme.py +++ b/src/caelestia/utils/theme.py @@ -320,29 +320,12 @@ def apply_gtk(colours: dict[str, str], mode: str) -> None: @log_exception def apply_qt(colours: dict[str, str], mode: str) -> None: - template = gen_replace(colours, templates_dir / f"qt{mode}.colors", hash=True) - write_file(config_dir / "qt5ct/colors/caelestia.colors", template) - write_file(config_dir / "qt6ct/colors/caelestia.colors", template) + colours = gen_replace(colours, templates_dir / f"qt{mode}.colors", hash=True) + write_file(config_dir / "qtengine/caelestia.colors", colours) - qtct = (templates_dir / "qtct.conf").read_text() - qtct = qtct.replace("{{ $mode }}", mode.capitalize()) - - for ver in 5, 6: - conf = qtct.replace("{{ $config }}", str(config_dir / f"qt{ver}ct")) - - if ver == 5: - conf += """ -[Fonts] -fixed="Monospace,12,-1,5,50,0,0,0,0,0" -general="Sans Serif,12,-1,5,50,0,0,0,0,0" -""" - else: - conf += """ -[Fonts] -fixed="Monospace,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" -general="Sans Serif,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" -""" - write_file(config_dir / f"qt{ver}ct/qt{ver}ct.conf", conf) + config = (templates_dir / "qtengine.json").read_text() + config = config.replace("{{ $mode }}", mode.capitalize()) + write_file(config_dir / "qtengine/config.json", config) @log_exception