From c527198044b8713fcbef0c49cfb463291d5f9f8b Mon Sep 17 00:00:00 2001 From: forbes Date: Thu, 19 Feb 2026 14:46:59 -0600 Subject: [PATCH] refactor: extract theme from ztools into base distribution (#278) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add Spreadsheet color preferences to KindredCreate.cfg using FCText entries (TextColor, AliasedCellBackgroundColor, PositiveNumberColor, NegativeNumberColor) matching the C++ GetASCII() reader in SheetModel.cpp - Remove CatppuccinMocha install directive from CMakeLists.txt - Update ztools submodule: theme.py deleted, CatppuccinMocha preference pack removed, package.xml cleaned up The previous apply_spreadsheet_colors() in ztools was a no-op: it called SetUnsigned() but the Spreadsheet C++ reads GetASCII() — different param types in FreeCAD's parameter system. Now properly fixed via preference pack. Closes #278 --- mods/silo | 2 +- mods/ztools | 2 +- src/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg | 6 ++++++ src/Mod/Create/CMakeLists.txt | 6 ------ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mods/silo b/mods/silo index edbaf65923..43e905c00a 160000 --- a/mods/silo +++ b/mods/silo @@ -1 +1 @@ -Subproject commit edbaf65923eac1567908a9d8c50992dff7f2536d +Subproject commit 43e905c00a5d568c4fc37e0da1bf697a1b6119f7 diff --git a/mods/ztools b/mods/ztools index e256e0b81f..08e439b9ca 160000 --- a/mods/ztools +++ b/mods/ztools @@ -1 +1 @@ -Subproject commit e256e0b81f47b389215b6361ae05e2931efb0a46 +Subproject commit 08e439b9ca403b67be5910ad1ef483bcec780c02 diff --git a/src/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg b/src/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg index b3730e782e..fc590a5d57 100644 --- a/src/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg +++ b/src/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg @@ -136,6 +136,12 @@ + + #cdd6f4 + #313244 + #a6e3a1 + #f38ba8 + diff --git a/src/Mod/Create/CMakeLists.txt b/src/Mod/Create/CMakeLists.txt index f992c56c2b..f21c9ba832 100644 --- a/src/Mod/Create/CMakeLists.txt +++ b/src/Mod/Create/CMakeLists.txt @@ -48,12 +48,6 @@ install( DESTINATION mods/ztools ) -install( - DIRECTORY - ${CMAKE_SOURCE_DIR}/mods/ztools/CatppuccinMocha - DESTINATION - mods/ztools -) install( FILES ${CMAKE_SOURCE_DIR}/mods/ztools/package.xml -- 2.49.1