From 2b0c6774c0727bee5f64a268ef0adc306d84f905 Mon Sep 17 00:00:00 2001
From: forbes-0023 <joseph.forbes@kindred-systems.com>
Date: Thu, 12 Feb 2026 12:06:48 -0600
Subject: [PATCH] feat(prefs): dev build defaults and skip version migration

- Set PACKAGE_VERSION_SUFFIX to "dev" so isDevelopmentVersion()
  returns true for local and CI dev builds.  Release build scripts
  (build.sh, build.bat) override this to "" via cmake -D flag.
- Skip the version migration dialog for dev builds in
  DlgVersionMigrator::exec(), alongside the existing
  usingCustomDirectories() check.
- Set UserParameterTemplate to the KindredCreate preference pack so
  first-run installs start with the Catppuccin Mocha theme defaults
  instead of bare FreeCAD defaults.
---
 CMakeLists.txt                         | 2 +-
 package/rattler-build/build.bat        | 1 +
 package/rattler-build/build.sh         | 1 +
 src/Gui/Dialogs/DlgVersionMigrator.cpp | 4 ++++
 src/Main/MainGui.cpp                   | 6 ++++--
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cbf373c90..5193dbe6d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ set(FREECAD_VERSION "${FREECAD_VERSION_MAJOR}.${FREECAD_VERSION_MINOR}.${FREECAD
 set(PACKAGE_VERSION_MAJOR ${KINDRED_CREATE_VERSION_MAJOR})
 set(PACKAGE_VERSION_MINOR ${KINDRED_CREATE_VERSION_MINOR})
 set(PACKAGE_VERSION_PATCH ${KINDRED_CREATE_VERSION_PATCH})
-set(PACKAGE_VERSION_SUFFIX "") # either "dev" for development snapshot or "" (empty string)
+set(PACKAGE_VERSION_SUFFIX "dev") # cleared to "" by release build scripts
 set(PACKAGE_BUILD_VERSION "0") # used when the same version will be re-released
 
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
diff --git a/package/rattler-build/build.bat b/package/rattler-build/build.bat
index 41bead4c04..d97392679a 100644
--- a/package/rattler-build/build.bat
+++ b/package/rattler-build/build.bat
@@ -29,6 +29,7 @@ cmake ^
     -D Python3_EXECUTABLE:FILEPATH="%PYTHON%" ^
     -D SMESH_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include/smesh" ^
     -D SMESH_LIBRARY:FILEPATH="%LIBRARY_PREFIX%/lib/SMESH.lib" ^
+    -D PACKAGE_VERSION_SUFFIX:STRING="" ^
     -B build ^
     -S .
 if %ERRORLEVEL% neq 0 exit 1
diff --git a/package/rattler-build/build.sh b/package/rattler-build/build.sh
index b723e75e3b..77aee35400 100644
--- a/package/rattler-build/build.sh
+++ b/package/rattler-build/build.sh
@@ -51,6 +51,7 @@ cmake \
     -D Python_EXECUTABLE:FILEPATH="$PYTHON" \
     -D Python3_EXECUTABLE:FILEPATH="$PYTHON" \
     -D BUILD_DYNAMIC_LINK_PYTHON:BOOL=OFF \
+    -D PACKAGE_VERSION_SUFFIX:STRING="" \
     -B build \
     -S .
 
diff --git a/src/Gui/Dialogs/DlgVersionMigrator.cpp b/src/Gui/Dialogs/DlgVersionMigrator.cpp
index e632c30eb9..ee4fbc9486 100644
--- a/src/Gui/Dialogs/DlgVersionMigrator.cpp
+++ b/src/Gui/Dialogs/DlgVersionMigrator.cpp
@@ -182,6 +182,10 @@ int DlgVersionMigrator::exec()
     if (App::Application::directories()->usingCustomDirectories()) {
         return 0;
     }
+    // Dev builds share a single config directory; skip versioned migration
+    if (App::Application::isDevelopmentVersion()) {
+        return 0;
+    }
     if (!isCurrentVersionKnown()) {
         calculateMigrationSize();
         QDialog::exec();
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
index 6517d5b03f..108354d7f2 100644
--- a/src/Main/MainGui.cpp
+++ b/src/Main/MainGui.cpp
@@ -199,11 +199,13 @@ int main(int argc, char** argv)
     App::Application::Config()["StartWorkbench"] = "PartDesignWorkbench";
     // App::Application::Config()["HiddenDockWindow"] = "Property editor";
     App::Application::Config()["SplashAlignment"] = "Bottom|Left";
-    App::Application::Config()["SplashTextColor"] = "#cdd6f4";  // Catppuccin Mocha text
+    App::Application::Config()["SplashTextColor"] = "#cdd6f4";     // Catppuccin Mocha text
     App::Application::Config()["SplashWarningColor"] = "#f38ba8";  // Catppuccin Mocha red
-    App::Application::Config()["SplashInfoColor"] = "#a6adc8";  // Catppuccin Mocha subtext0
+    App::Application::Config()["SplashInfoColor"] = "#a6adc8";     // Catppuccin Mocha subtext0
     App::Application::Config()["SplashInfoPosition"] = "6,75";
     App::Application::Config()["DesktopFileName"] = "net.kindredsystems.KindredCreate";
+    App::Application::Config()["UserParameterTemplate"]
+        = "data/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg";
 
     try {
         // Init phase ===========================================================
-- 
2.49.1