From ad244bf8d4fded4356e3ececbb6e03f696309b93 Mon Sep 17 00:00:00 2001
From: 3x380V <58604845+3x380V@users.noreply.github.com>
Date: Tue, 22 Apr 2025 21:53:58 +0200
Subject: [PATCH] Fix SolverCalculiX object refactor (#20913)

Rename original SolverCalculix.ui to SolverCcxTools.ui to prevent
collision on case insensitive filesystems.

Fixes: 4f7a835e22d7 ("Fem: SolverCalculiX object refactor")
---
 src/Mod/Fem/Gui/CMakeLists.txt                                 | 2 +-
 src/Mod/Fem/Gui/Resources/Fem.qrc                              | 3 ++-
 .../Gui/Resources/ui/{SolverCalculix.ui => SolverCcxTools.ui}  | 0
 src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py              | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename src/Mod/Fem/Gui/Resources/ui/{SolverCalculix.ui => SolverCcxTools.ui} (100%)

diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index 17c7ca28ce..2a83b2f50e 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -428,8 +428,8 @@ SET(FemGuiPythonUI_SRCS
     Resources/ui/MeshRegion.ui
     Resources/ui/ResultHints.ui
     Resources/ui/ResultShow.ui
-    Resources/ui/SolverCalculix.ui
     Resources/ui/SolverCalculiX.ui
+    Resources/ui/SolverCcxTools.ui
 )
 
 ADD_CUSTOM_TARGET(FemPythonUi ALL
diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc
index 2b23520d06..f57b979456 100755
--- a/src/Mod/Fem/Gui/Resources/Fem.qrc
+++ b/src/Mod/Fem/Gui/Resources/Fem.qrc
@@ -148,6 +148,7 @@
         <file>ui/MeshRegion.ui</file>
         <file>ui/ResultHints.ui</file>
         <file>ui/ResultShow.ui</file>
-        <file>ui/SolverCalculix.ui</file>
+        <file>ui/SolverCalculiX.ui</file>
+        <file>ui/SolverCcxTools.ui</file>
     </qresource>
 </RCC>
diff --git a/src/Mod/Fem/Gui/Resources/ui/SolverCalculix.ui b/src/Mod/Fem/Gui/Resources/ui/SolverCcxTools.ui
similarity index 100%
rename from src/Mod/Fem/Gui/Resources/ui/SolverCalculix.ui
rename to src/Mod/Fem/Gui/Resources/ui/SolverCcxTools.ui
diff --git a/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py b/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py
index a55c7c9790..814317b1cc 100644
--- a/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py
+++ b/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py
@@ -56,7 +56,7 @@ class _TaskPanel:
 
     def __init__(self, solver_object):
         self.form = FreeCADGui.PySideUic.loadUi(
-            FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/SolverCalculix.ui"
+            FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/SolverCcxTools.ui"
         )
 
         from femtools.ccxtools import CcxTools as ccx