Update version to 1.0.0RC4

This reverts commit 00c992ff34.

.github/workflows/actions/linux/generateCacheKey/action.yml

@@ -28,6 +28,9 @@ inputs:
   compiler:
     description: "Binary name/path of compiler to be used"
     required: true
+  qt_major_version:
+    description: "Major version number of qt to be used"
+    required: true
 outputs:
   cacheKey:
     description: "Cache key with distro and compiler version"
@@ -39,6 +42,6 @@ runs:
     - id: generateCacheKey
       shell: bash -l {0}
       run: |
-        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)
+        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)-qt${{ inputs.qt_major_version }}
         echo "Generated cache key : $cacheKey"
         echo "cacheKey=$cacheKey" >> $GITHUB_OUTPUT

.github/workflows/actions/windows/getCcache/action.yml

@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.ccachebindir }}
-        key: ccacheforwin
+        key: ccacheforwin-${{ inputs.ccacheversion }}
     - name: Download ccache
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/actions/windows/getLibpack/action.yml

@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.libpackdir }}
-        key: libpackforwin
+        key: libpackforwin-${{ inputs.libpackname }}
     - name: Download libpack
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildUbuntu2004.yml

@@ -152,6 +152,7 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with:

.github/workflows/sub_buildUbuntu2204Conda.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
@@ -102,6 +102,7 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with:

.github/workflows/sub_buildUbuntu2204CondaQt6.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env-qt6.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
@@ -108,15 +108,16 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 6
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with:
           save-always: true
           path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}-qt6
+          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
           restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-qt6-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-qt6-
+            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-
+            FC-${{ steps.genCacheKey.outputs.cacheKey }}-
       - name: Print CCache statistics before build, reset stats and print config
         run: |
           ccache -s

.github/workflows/sub_buildWindowsConda.yml

@@ -71,7 +71,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_lint.yml

@@ -318,7 +318,7 @@ jobs:
           pylintWarnings=0
           pylintRefactorings=0
           pylintConventions=0
-          pip install pylint
+          pip install --break-system-packages pylint
           # List enabled pylint checks
           pylint --list-msgs-enabled > ${{ env.logdir }}pylint-enabled-checks.log
           # Run pylint on all python files
@@ -378,7 +378,7 @@ jobs:
         run: |
           blackReformats=0
           blackFails=0
-          pip install black
+          pip install --break-system-packages black
           set +e
           black --check ${{ inputs.changedPythonFiles }} &> ${{ env.logdir }}black.log
           exitCode=$?
@@ -444,7 +444,7 @@ jobs:
                             libqt5x11extras5-dev                        \
                             libshiboken2-dev                            \
                             libspnav-dev                                \
-                            libvtk7-dev                                 \
+                            libvtk9-dev                                 \
                             libx11-dev                                  \
                             libxerces-c-dev                             \
                             libyaml-cpp-dev                             \
@@ -452,7 +452,6 @@ jobs:
                             netgen                                      \
                             netgen-headers                              \
                             occt-draw                                   \
-                            pyqt5-dev-tools                             \
                             pyside2-tools                               \
                             python3-dev                                 \
                             python3-git                                 \
@@ -516,7 +515,7 @@ jobs:
         continue-on-error: ${{ inputs.cpplintFailSilent }}
         run: |
           cpplintErrors=0
-          pip install cpplint
+          pip install --break-system-packages cpplint
           # Run cpplint
           for file in ${{ inputs.changedCppFiles }}
           do
@@ -581,7 +580,7 @@ jobs:
         if: inputs.checkSpelling && always()
         continue-on-error: ${{ inputs.codespellFailSilent }}
         run: |
-          pip install codespell
+          pip install --break-system-packages codespell
           wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary.txt
           #wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary_rare.txt
           set +e

CMakeLists.txt

@@ -27,11 +27,10 @@ endif()
 
 project(FreeCAD)
 
-set(PACKAGE_VERSION_NAME "Vulcan")
-set(PACKAGE_VERSION_MAJOR "0")
-set(PACKAGE_VERSION_MINOR "22")
+set(PACKAGE_VERSION_MAJOR "1")
+set(PACKAGE_VERSION_MINOR "0")
 set(PACKAGE_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
-set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string)
+set(PACKAGE_VERSION_SUFFIX "RC4") # either "dev" for development snapshot or "" (empty string)
 set(PACKAGE_BUILD_VERSION "0") # used when the same FreeCAD version will be re-released (for example using an updated LibPack)
 
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")

CMakePresets.json

@@ -151,6 +151,10 @@
         },
         "cmakeExecutable": "${sourceDir}/conda/cmake.sh",
         "cacheVariables": {
+          "CMAKE_IGNORE_PREFIX_PATH": {
+            "type": "STRING",
+            "value": "/opt/homebrew;/usr/local/homebrew"
+          },
           "CMAKE_INCLUDE_PATH": {
             "type": "FILEPATH",
             "value": "${sourceDir}/.conda/freecad/include"

README.md

@@ -2,7 +2,7 @@
 
 ### Your own 3D parametric modeler
 
-[Website](https://www.freecad.org) • 
+[Website](https://www.freecad.org) •
 [Documentation](https://wiki.freecad.org) •
 [Forum](https://forum.freecad.org/) •
 [Bug tracker](https://github.com/FreeCAD/FreeCAD/issues) •
@@ -12,7 +12,7 @@
 
 [![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
 
-<img src="https://user-images.githubusercontent.com/1828501/174066870-1692005b-f8d7-43fb-a289-6d2f07f73d7f.png" width="800"/>
+<img src="/.github/images/partdesign.png" width="800"/>
 
 Overview
 --------

cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake

@@ -28,10 +28,11 @@ macro(CheckInterModuleDependencies)
     REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH BUILD_SMESH)
     REQUIRES_MODS(BUILD_FLAT_MESH          BUILD_MESH_PART)
     REQUIRES_MODS(BUILD_OPENSCAD           BUILD_MESH_PART BUILD_DRAFT)
+    REQUIRES_MODS(BUILD_PART               BUILD_MATERIAL)
     REQUIRES_MODS(BUILD_PART_DESIGN        BUILD_SKETCHER)
     # REQUIRES_MODS(BUILD_CAM              BUILD_PART BUILD_MESH BUILD_ROBOT)
     REQUIRES_MODS(BUILD_CAM                BUILD_PART BUILD_MESH)
-    REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH)
+    REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH BUILD_POINTS)
     REQUIRES_MODS(BUILD_ROBOT              BUILD_PART)
     REQUIRES_MODS(BUILD_SANDBOX            BUILD_PART BUILD_MESH)
     REQUIRES_MODS(BUILD_SKETCHER           BUILD_PART)

cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake

@@ -46,7 +46,7 @@ macro(CompilerChecksAndSetups)
         set(CMAKE_CXX_STANDARD 23)
     elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+20")
         set(CMAKE_CXX_STANDARD 20)
-    elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+17")
+    else()#Enabled C++17
         set(CMAKE_CXX_STANDARD 17)
     endif()
 

cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake

@@ -34,6 +34,7 @@ macro(SetGlobalCompilerAndLinkerSettings)
         if(FREECAD_RELEASE_PDB)
             set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
             set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
+            set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
         endif(FREECAD_RELEASE_PDB)
         if(FREECAD_RELEASE_SEH)
             # remove /EHsc or /EHs flags because they are incompatible with /EHa

conda/conda-env-qt6.yaml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - conda-devenv
 - mamba
 - python==3.12.*

conda/conda-env.yaml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - conda-devenv
 - mamba
 - python==3.11.*

conda/environment-qt6.devenv.yml

@@ -3,6 +3,7 @@ channels:
 - conda-forge
 - conda-forge/label/pivy_rc
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos7-x86_64                   # [linux and x86_64]
@@ -90,7 +91,6 @@ dependencies:
 - python==3.12.*
 - pyyaml
 - qt6-main
-- six
 - smesh
 - swig
 - vtk==9.2.6

conda/environment.devenv.yml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos6-x86_64                   # [linux and x86_64]
@@ -90,7 +91,6 @@ dependencies:
 - python==3.11.*
 - pyyaml
 - qt-main
-- six
 - smesh
 - swig
 - vtk==9.2.6

data/examples/CMakeLists.txt

@@ -4,7 +4,6 @@ SET(Examples_Files
     draft_test_objects.FCStd
     EngineBlock.FCStd
     PartDesignExample.FCStd
-    RobotExample.FCStd
     BIMExample.FCStd
     FEMExample.FCStd
     AssemblyExample.FCStd

src/3rdParty/libE57Format/src/CheckedFile.cpp

@@ -25,6 +25,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+// convenience for all the BSDs
+#if defined( __FreeBSD__) || defined( __NetBSD__) || defined( __OpenBSD__)
+#define __BSD
+#endif
+
 #if defined( _WIN32 )
 #if defined( _MSC_VER )
 #include <codecvt>
@@ -44,6 +49,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#elif defined(__BSD)
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #elif defined( __APPLE__ )
 #include <sys/types.h>
 #include <unistd.h>
@@ -483,7 +492,7 @@ uint64_t CheckedFile::lseek64( int64_t offset, int whence )
 #endif
 #elif defined( __linux__ )
    int64_t result = ::lseek64( fd_, offset, whence );
-#elif defined( __APPLE__ )
+#elif defined( __APPLE__ ) || defined(__BSD)
    int64_t result = ::lseek( fd_, offset, whence );
 #else
 #error "no supported OS platform defined"

src/App/Application.cpp

@@ -35,6 +35,8 @@
 # endif
 # include <boost/program_options.hpp>
 # include <boost/date_time/posix_time/posix_time.hpp>
+# include <chrono>
+# include <random>
 #endif
 
 #ifdef FC_OS_WIN32
@@ -47,6 +49,7 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
 #include <QProcessEnvironment>
@@ -137,6 +140,8 @@
 #include <App/TestScript.h>
 #include <App/CMakeScript.h>
 
+#include "SafeMode.h"
+
 #ifdef _MSC_VER // New handler for Microsoft Visual C++ compiler
 # pragma warning( disable : 4535 )
 # if !defined(_DEBUG) && defined(HAVE_SEH)
@@ -427,6 +432,10 @@ void Application::setupPythonException(PyObject* module)
     Base::PyExc_FC_PropertyError = PyErr_NewException("Base.PropertyError", PyExc_AttributeError, nullptr);
     Py_INCREF(Base::PyExc_FC_PropertyError);
     PyModule_AddObject(module, "PropertyError", Base::PyExc_FC_PropertyError);
+
+    Base::PyExc_FC_AbortIOException = PyErr_NewException("Base.PyExc_FC_AbortIOException", PyExc_BaseException, nullptr);
+    Py_INCREF(Base::PyExc_FC_AbortIOException);
+    PyModule_AddObject(module, "AbortIOException", Base::PyExc_FC_AbortIOException);
 }
 // clang-format on
 
@@ -1108,6 +1117,21 @@ Application::TransactionSignaller::~TransactionSignaller() {
     }
 }
 
+int64_t Application::applicationPid()
+{
+    static int64_t randomNumber = []() {
+        auto tp = std::chrono::high_resolution_clock::now();
+        auto dur = tp.time_since_epoch();
+        auto seed = dur.count();
+        std::mt19937 generator(static_cast<unsigned>(seed));
+        constexpr int64_t minValue {1};
+        constexpr int64_t maxValue {1000000};
+        std::uniform_int_distribution<int64_t> distribution(minValue, maxValue);
+        return distribution(generator);
+    }();
+    return randomNumber;
+}
+
 std::string Application::getHomePath()
 {
     return mConfig["AppHomePath"];
@@ -1738,6 +1762,7 @@ void Application::destruct()
     Base::InterpreterSingleton::Destruct();
     Base::Type::destruct();
     ParameterManager::Terminate();
+    SafeMode::Destruct();
 }
 
 void Application::destructObserver()
@@ -2226,6 +2251,7 @@ void parseProgramOptions(int ac, char ** av, const string& exe, variables_map& v
     ("module-path,M", value< vector<string> >()->composing(),"Additional module paths")
     ("python-path,P", value< vector<string> >()->composing(),"Additional python paths")
     ("single-instance", "Allow to run a single instance of the application")
+    ("safe-mode", "Force enable safe mode")
     ("pass", value< vector<string> >()->multitoken(), "Ignores the following arguments and pass them through to be used by a script")
     ;
 
@@ -2553,6 +2579,10 @@ void Application::initConfig(int argc, char ** argv)
 
     // extract home paths
     ExtractUserPath();
+    
+    if (vm.count("safe-mode")) {
+        SafeMode::StartSafeMode();
+    }
 
 #   ifdef FC_DEBUG
     mConfig["Debug"] = "1";
@@ -2641,6 +2671,12 @@ void Application::initConfig(int argc, char ** argv)
                               mConfig["BuildVersionPoint"].c_str(),
                               mConfig["BuildVersionSuffix"].c_str(),
                               mConfig["BuildRevision"].c_str());
+
+        if (SafeMode::SafeModeEnabled()) {
+            Base::Console().Message("FreeCAD is running in _SAFE_MODE_.\n"
+                                    "Safe mode temporarily disables your configurations and "
+                                    "addons. Restart the application to exit safe mode.\n\n");
+        }
     }
     LoadParameters();
 
@@ -3323,7 +3359,46 @@ void Application::ExtractUserPath()
     mConfig["UserMacroPath"] = Base::FileInfo::pathToString(macro) + PATHSEP;
 }
 
-#if defined (FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_BSD)
+// TODO: Consider using this for all UNIX-like OSes
+#if defined(__OpenBSD__)
+#include <cstdio>
+#include <cstdlib>
+#include <sys/param.h>
+#include <QCoreApplication>
+
+std::string Application::FindHomePath(const char* sCall)
+{
+    // We have three ways to start this application either use one of the two executables or
+    // import the FreeCAD.so module from a running Python session. In the latter case the
+    // Python interpreter is already initialized.
+    std::string absPath;
+    std::string homePath;
+    if (Py_IsInitialized()) {
+        // Note: realpath is known to cause a buffer overflow because it
+        // expands the given path to an absolute path of unknown length.
+        // Even setting PATH_MAX does not necessarily solve the problem
+        // for sure but the risk of overflow is rather small.
+        char resolved[PATH_MAX];
+        char* path = realpath(sCall, resolved);
+        if (path)
+            absPath = path;
+    }
+    else {
+        int argc = 1;
+        QCoreApplication app(argc, (char**)(&sCall));
+        absPath = QCoreApplication::applicationFilePath().toStdString();
+    }
+
+    // should be an absolute path now
+    std::string::size_type pos = absPath.find_last_of("/");
+    homePath.assign(absPath,0,pos);
+    pos = homePath.find_last_of("/");
+    homePath.assign(homePath,0,pos+1);
+
+    return homePath;
+}
+
+#elif defined (FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_BSD)
 #include <cstdio>
 #include <cstdlib>
 #include <sys/param.h>

src/App/Application.h

@@ -399,6 +399,7 @@ public:
     static std::map<std::string, std::string> &Config(){return mConfig;}
     static int GetARGC(){return _argc;}
     static char** GetARGV(){return _argv;}
+    static int64_t applicationPid();
     //@}
 
     /** @name Application directories */

src/App/ApplicationPy.cpp

@@ -86,7 +86,7 @@ PyMethodDef Application::Methods[] = {
     {"getUserAppDataDir", (PyCFunction) Application::sGetUserAppDataPath, METH_VARARGS,
      "Get the root directory of application data"},
     {"getUserMacroDir", (PyCFunction) Application::sGetUserMacroPath, METH_VARARGS,
-     "getUserMacroDir(bool=False) -> string"
+     "getUserMacroDir(bool=False) -> str\n\n"
      "Get the directory of the user's macro directory\n"
      "If parameter is False (the default) it returns the standard path in the"
      "user's home directory, otherwise it returns the user-defined path."},
@@ -169,11 +169,13 @@ PyMethodDef Application::Methods[] = {
      "active transaction causes any document changes to open a transaction with\n"
      "the given name and ID."},
     {"getActiveTransaction", (PyCFunction) Application::sGetActiveTransaction, METH_VARARGS,
-     "getActiveTransaction() -> (name,id) return the current active transaction name and ID"},
+     "getActiveTransaction() -> (name,id)\n\n"
+     "return the current active transaction name and ID"},
     {"closeActiveTransaction", (PyCFunction) Application::sCloseActiveTransaction, METH_VARARGS,
      "closeActiveTransaction(abort=False) -- commit or abort current active transaction"},
     {"isRestoring", (PyCFunction) Application::sIsRestoring, METH_VARARGS,
-     "isRestoring() -> Bool -- Test if the application is opening some document"},
+     "isRestoring() -> bool\n\n"
+     "Test if the application is opening some document"},
     {"checkAbort", (PyCFunction) Application::sCheckAbort, METH_VARARGS,
      "checkAbort() -- check for user abort in length operation.\n\n"
      "This only works if there is an active sequencer (or ProgressIndicator in Python).\n"

src/App/CMakeLists.txt

@@ -288,6 +288,7 @@ SET(FreeCADApp_CPP_SRCS
     Metadata.cpp
     MetadataPyImp.cpp
     ElementNamingUtils.cpp
+    SafeMode.cpp
     StringHasher.cpp
     StringHasherPyImp.cpp
     StringIDPyImp.cpp

src/App/ComplexGeoData.cpp

@@ -546,10 +546,10 @@ void ComplexGeoData::readElements(Base::XMLReader& reader, size_t count)
                 }
             }
         }
-        _elementMap->setElementName(IndexedName(reader.getAttribute("value"), types),
-                                    MappedName(reader.getAttribute("key")),
-                                    Tag,
-                                    &sids);
+        ensureElementMap()->setElementName(IndexedName(reader.getAttribute("value"), types),
+                                           MappedName(reader.getAttribute("key")),
+                                           Tag,
+                                           &sids);
     }
     if (invalid_count != 0) {
         FC_ERR("Found " << invalid_count << " invalid string id");  // NOLINT

src/App/Document.cpp

@@ -931,18 +931,21 @@ Document::~Document()
 std::string Document::getTransientDirectoryName(const std::string& uuid, const std::string& filename) const
 {
     // Create a directory name of the form: {ExeName}_Doc_{UUID}_{HASH}_{PID}
-    std::stringstream s;
+    std::stringstream out;
     QCryptographicHash hash(QCryptographicHash::Sha1);
 #if QT_VERSION < QT_VERSION_CHECK(6,3,0)
     hash.addData(filename.c_str(), filename.size());
 #else
     hash.addData(QByteArrayView(filename.c_str(), filename.size()));
 #endif
-    s << App::Application::getUserCachePath() << App::Application::getExecutableName()
-      << "_Doc_" << uuid
-      << "_" << hash.result().toHex().left(6).constData()
-      << "_" << QCoreApplication::applicationPid();
-    return s.str();
+    out << App::Application::getUserCachePath() << App::Application::getExecutableName()
+        << "_Doc_"
+        << uuid
+        << "_"
+        << hash.result().toHex().left(6).constData()
+        << "_"
+        << App::Application::applicationPid();
+    return out.str();
 }
 
 //--------------------------------------------------------------------------
@@ -1475,6 +1478,7 @@ Document::readObjects(Base::XMLReader& reader)
 
 void Document::addRecomputeObject(DocumentObject *obj) {
     if(testStatus(Status::Restoring) && obj) {
+        setStatus(Status::RecomputeOnRestore, true);
         d->touchedObjs.insert(obj);
         obj->touch();
     }
@@ -3624,9 +3628,10 @@ void Document::_removeObject(DocumentObject* pcObject)
     else {
         // for a rollback delete the object
         signalTransactionRemove(*pcObject, 0);
-        breakDependency(pcObject, true);
     }
 
+    breakDependency(pcObject, true);
+
     // remove from map
     pcObject->setStatus(ObjectStatus::Remove, false); // Unset the bit to be on the safe side
     d->objectIdMap.erase(pcObject->_Id);

src/App/Document.h

@@ -77,6 +77,7 @@ public:
         RestoreError = 10,
         LinkStampChanged = 11, // Indicates during restore time if any linked document's time stamp has changed
         IgnoreErrorOnRecompute = 12, // Don't report errors if the recompute failed
+        RecomputeOnRestore = 13, // Mark pending recompute on restore for migration purposes
     };
 
     /** @name Properties */

src/App/DocumentObject.h

@@ -442,6 +442,12 @@ public:
     /* Return true to cause PropertyView to show linked object's property */
     virtual bool canLinkProperties() const {return true;}
 
+    /* Return whether this object is a link */
+    virtual bool isLink() const {return false;};
+
+    /* Return whether this object is a link group */
+    virtual bool isLinkGroup() const {return false;};
+
     /* Return true to bypass duplicate label checking */
     virtual bool allowDuplicateLabel() const {return false;}
 

src/App/DocumentObjectPy.xml

@@ -232,6 +232,13 @@ Return tuple(obj,newElementName,oldElementName)
                 </UserDocu>
             </Documentation>
         </Methode>
+        <Methode Name="isAttachedToDocument" Const="true">
+            <Documentation>
+                <UserDocu>
+                    isAttachedToDocument(): return true if the object is part of a document, false otherwise
+                </UserDocu>
+            </Documentation>
+        </Methode>
     <Attribute Name="OutList" ReadOnly="true">
       <Documentation>
         <UserDocu>A list of all objects this object links to.</UserDocu>
@@ -266,7 +273,7 @@ Return tuple(obj,newElementName,oldElementName)
             <Documentation>
                 <UserDocu>Return the internal name of this object</UserDocu>
             </Documentation>
-            <Parameter Name="Name" Type="String"/>
+            <Parameter Name="Name" Type="Object"/>
         </Attribute>
                 <Attribute Name="Document" ReadOnly="true">
                         <Documentation>

src/App/DocumentObjectPyImp.cpp

@@ -49,14 +49,14 @@ std::string DocumentObjectPy::representation() const
     return str.str();
 }
 
-Py::String DocumentObjectPy::getName() const
+Py::Object DocumentObjectPy::getName() const
 {
     DocumentObject* object = this->getDocumentObjectPtr();
     const char* internal = object->getNameInDocument();
     if (!internal) {
-        throw Py::RuntimeError(std::string("This object is currently not part of a document"));
+        return Py::None();
     }
-    return {std::string(internal)};
+    return Py::String(internal);
 }
 
 Py::String DocumentObjectPy::getFullName() const
@@ -76,6 +76,17 @@ Py::Object DocumentObjectPy::getDocument() const
     }
 }
 
+PyObject* DocumentObjectPy::isAttachedToDocument(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, "")) {
+        return nullptr;
+    }
+
+    DocumentObject* object = this->getDocumentObjectPtr();
+    bool ok = object->isAttachedToDocument();
+    return Py::new_reference_to(Py::Boolean(ok));
+}
+
 PyObject*  DocumentObjectPy::addProperty(PyObject *args, PyObject *kwd)
 {
     char *sType,*sName=nullptr,*sGroup=nullptr,*sDoc=nullptr;

src/App/Expression.cpp

@@ -3855,6 +3855,13 @@ bool ExpressionParser::isTokenAnIndentifier(const std::string & str)
     return (status == 0 && (token == IDENTIFIER || token == CELLADDRESS));
 }
 
+bool ExpressionParser::isTokenAConstant(const std::string & str)
+{
+    int token{}, status{};
+    std::tie(token, status) = getTokenAndStatus(str);
+    return (status == 0 && token == CONSTANT);
+}
+
 bool ExpressionParser::isTokenAUnit(const std::string & str)
 {
     int token{}, status{};

src/App/ExpressionParser.h

@@ -500,6 +500,7 @@ AppExport Expression * parse(const App::DocumentObject *owner, const char *buffe
 AppExport UnitExpression * parseUnit(const App::DocumentObject *owner, const char *buffer);
 AppExport ObjectIdentifier parsePath(const App::DocumentObject *owner, const char* buffer);
 AppExport bool isTokenAnIndentifier(const std::string & str);
+AppExport bool isTokenAConstant(const std::string & str);
 AppExport bool isTokenAUnit(const std::string & str);
 AppExport std::vector<std::tuple<int, int, std::string> > tokenize(const std::string & str);
 

src/App/GeoFeature.cpp

@@ -25,6 +25,8 @@
 
 #include <App/GeoFeaturePy.h>
 
+#include <Base/Tools.h>
+
 #include "ComplexGeoData.h"
 #include "Document.h"
 #include "GeoFeature.h"
@@ -157,7 +159,7 @@ DocumentObject *GeoFeature::resolveElement(DocumentObject *obj, const char *subn
     }
     if(geoFeature)
         *geoFeature = geo;
-    if(!obj || (filter && obj!=filter))
+    if(!obj || (filter && geo!=filter))
         return nullptr;
     if(!element || !element[0]) {
         if(append) 
@@ -270,3 +272,63 @@ GeoFeature::getHigherElements(const char *element, bool silent) const
         return {};
     return prop->getComplexData()->getHigherElements(element, silent);
 }
+
+Base::Placement GeoFeature::getPlacementFromProp(App::DocumentObject* obj, const char* propName)
+{
+    Base::Placement plc = Base::Placement();
+    auto* propPlacement = dynamic_cast<App::PropertyPlacement*>(obj->getPropertyByName(propName));
+    if (propPlacement) {
+        plc = propPlacement->getValue();
+    }
+    return plc;
+}
+
+Base::Placement GeoFeature::getGlobalPlacement(App::DocumentObject* targetObj,
+                                                   App::DocumentObject* rootObj,
+                                                   const std::string& sub)
+{
+    if (!targetObj || !rootObj || sub.empty()) {
+        return Base::Placement();
+    }
+    std::vector<std::string> names = Base::Tools::splitSubName(sub);
+
+    App::Document* doc = rootObj->getDocument();
+    Base::Placement plc = getPlacementFromProp(rootObj, "Placement");
+
+    if (targetObj == rootObj) return plc;
+
+    for (auto& name : names) {
+        App::DocumentObject* obj = doc->getObject(name.c_str());
+        if (!obj) {
+            return Base::Placement();
+        }
+
+        plc = plc * getPlacementFromProp(obj, "Placement");
+
+        if (obj == targetObj) {
+            return plc;
+        }
+        if (obj->isLink()) {
+            // Update doc in case its an external link.
+            doc = obj->getLinkedObject()->getDocument();
+        }
+    }
+
+    // If targetObj has not been found there's a problem
+    return Base::Placement();
+}
+
+Base::Placement GeoFeature::getGlobalPlacement(App::DocumentObject* targetObj,
+                                                   App::PropertyXLinkSub* prop)
+{
+    if (!targetObj || !prop) {
+        return Base::Placement();
+    }
+
+    std::vector<std::string> subs = prop->getSubValues();
+    if (subs.empty()) {
+        return Base::Placement();
+    }
+
+    return getGlobalPlacement(targetObj, prop->getValue(), subs[0]);
+}

src/App/GeoFeature.h

@@ -108,8 +108,9 @@ public:
             const DocumentObject *filter=nullptr,const char **element=nullptr, GeoFeature **geo=nullptr);
 
     /**
-     * @brief Calculates the placement in the global reference coordinate system
+     * @brief Deprecated. Calculates the placement in the global reference coordinate system
      * 
+     * Deprecated: This does not handle App::Links correctly. Use getGlobalPlacement() instead.
      * In FreeCAD the GeoFeature placement describes the local placement of the object in its parent
      * coordinate system. This is however not always the same as the global reference system. If the
      * object is in a GeoFeatureGroup, hence in another local coordinate system, the Placement
@@ -179,6 +180,10 @@ public:
     /// Return the higher level element names of the given element
     virtual std::vector<Data::IndexedName> getHigherElements(const char *name, bool silent=false) const;
 
+    static Base::Placement getPlacementFromProp(DocumentObject* obj, const char* propName);
+    static Base::Placement getGlobalPlacement(DocumentObject* targetObj, DocumentObject* rootObj, const std::string& sub);
+    static Base::Placement getGlobalPlacement(DocumentObject* targetObj, PropertyXLinkSub* prop);
+
 protected:
     void onChanged(const Property* prop) override;
 //    void onDocumentRestored() override;

src/App/GeoFeaturePy.xml

@@ -30,6 +30,7 @@ Note: Not implemented.</UserDocu>
     <Methode Name="getGlobalPlacement">
       <Documentation>
         <UserDocu>getGlobalPlacement() -> Base.Placement
+Deprecated: This function does not handle Links correctly. Use getGlobalPlacementOf instead.
 
 Returns the placement of the object in the global coordinate space, respecting all stacked
 relationships.
@@ -37,6 +38,22 @@ Note: This function is not available during recompute, as there the placements o
 can change after the execution of this object, rendering the result wrong.</UserDocu>
       </Documentation>
     </Methode>
+    <Methode Name="getGlobalPlacementOf" Static="true">
+      <Documentation>
+        <UserDocu>getGlobalPlacementOf(targetObj, rootObj, subname) -> Base.Placement
+Selection example: obj = "part1" sub = "linkToPart2.LinkToBody.Pad.face1"
+
+Global placement of Pad in this context :
+getGlobalPlacementOf(pad, part1, "linkToPart2.LinkToBody.Pad.face1")
+
+Global placement of linkToPart2 in this context :
+getGlobalPlacementOf(linkToPart2, part1, "linkToPart2.LinkToBody.Pad.face1")
+
+Returns the placement of the object in the global coordinate space, respecting all stacked
+relationships.
+        </UserDocu>
+      </Documentation>
+    </Methode>
     <Methode Name="getPropertyNameOfGeometry">
       <Documentation>
         <UserDocu>getPropertyNameOfGeometry() -> str or None

src/App/GeoFeaturePyImp.cpp

@@ -57,6 +57,27 @@ PyObject* GeoFeaturePy::getGlobalPlacement(PyObject * args) {
     }
 }
 
+PyObject* GeoFeaturePy::getGlobalPlacementOf(PyObject * args) {
+
+    PyObject* pyTargetObj {nullptr};
+    PyObject* pyRootObj {nullptr};
+    char* pname;
+
+    if (!PyArg_ParseTuple(args, "OOs", &pyTargetObj, &pyRootObj, &pname)) {
+        return nullptr;
+    }
+    auto* targetObj = static_cast<App::DocumentObjectPy*>(pyTargetObj)->getDocumentObjectPtr();
+    auto* rootObj = static_cast<App::DocumentObjectPy*>(pyRootObj)->getDocumentObjectPtr();
+
+    try {
+        Base::Placement p = GeoFeature::getGlobalPlacement(targetObj, rootObj, pname);
+        return new Base::PlacementPy(new Base::Placement(p));
+    }
+    catch (const Base::Exception& e) {
+        throw Py::RuntimeError(e.what());
+    }
+}
+
 PyObject* GeoFeaturePy::getPropertyNameOfGeometry(PyObject * args)
 {
     if (!PyArg_ParseTuple(args, ""))

src/App/Graphviz.cpp

@@ -120,7 +120,14 @@ void Document::exportGraphviz(std::ostream& out) const
          */
 
         std::string getId(const DocumentObject * docObj) {
-            return std::string((docObj)->getDocument()->getName()) + "#" + docObj->getNameInDocument();
+            std::string id;
+            if (docObj->isAttachedToDocument()) {
+                auto doc = docObj->getDocument();
+                id.append(doc->getName());
+                id.append("#");
+                id.append(docObj->getNameInDocument());
+            }
+            return id;
         }
 
         /**
@@ -434,11 +441,14 @@ void Document::exportGraphviz(std::ostream& out) const
                     if (obj) {
                         std::map<std::string,Vertex>::const_iterator item = GlobalVertexList.find(getId(obj));
 
-                        if (item == GlobalVertexList.end())
-                            add(obj,
-                                std::string(obj->getDocument()->getName()) + "#" + obj->getNameInDocument(),
-                                std::string(obj->getDocument()->getName()) + "#" + obj->Label.getValue(),
-                                CSSubgraphs);
+                        if (item == GlobalVertexList.end()) {
+                            if (obj->isAttachedToDocument()) {
+                                add(obj,
+                                    std::string(obj->getDocument()->getName()) + "#" + obj->getNameInDocument(),
+                                    std::string(obj->getDocument()->getName()) + "#" + obj->Label.getValue(),
+                                    CSSubgraphs);
+                            }
+                        }
                     }
                 }
             }
@@ -486,23 +496,20 @@ void Document::exportGraphviz(std::ostream& out) const
             // Add edges between document objects
             for (const auto & It : d->objectMap) {
 
-                if(omitGeoFeatureGroups) {
-                    //coordinate systems are represented by subgraphs
-                    if(It.second->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()))
-                        continue;
-
-                    //as well as origins
-                    if(It.second->isDerivedFrom(Origin::getClassTypeId()))
-                        continue;
+                if(omitGeoFeatureGroups && It.second->isDerivedFrom(Origin::getClassTypeId())) {
+                    continue;
                 }
 
                 std::map<DocumentObject*, int> dups;
                 std::vector<DocumentObject*> OutList = It.second->getOutList();
                 const DocumentObject * docObj = It.second;
+                const bool docObj_is_group = docObj->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId());
 
                 for (auto obj : OutList) {
                     if (obj) {
-
+                        if(omitGeoFeatureGroups && docObj_is_group && GeoFeatureGroupExtension::getGroupOfObject(obj) == docObj) {
+                            continue;
+                        }
                         // Count duplicate edges
                         bool inserted = edge(GlobalVertexList[getId(docObj)], GlobalVertexList[getId(obj)], DepList).second;
                         if (inserted) {

src/App/Link.cpp

@@ -2282,6 +2282,16 @@ bool Link::canLinkProperties() const {
     return true;
 }
 
+bool Link::isLink() const
+{
+    return ElementCount.getValue() == 0;
+}
+
+bool Link::isLinkGroup() const
+{
+    return ElementCount.getValue() > 0;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 
 namespace App {
@@ -2309,6 +2319,11 @@ bool LinkElement::canDelete() const {
     return !owner || !owner->getDocument()->getObjectByID(_LinkOwner.getValue());
 }
 
+bool LinkElement::isLink() const
+{
+    return true;
+}
+
 App::Link* LinkElement::getLinkGroup() const
 {
     std::vector<App::DocumentObject*> inList = getInList();

src/App/Link.h

@@ -556,6 +556,10 @@ public:
     }
 
     bool canLinkProperties() const override;
+
+    bool isLink() const override;
+
+    bool isLinkGroup() const override;
 };
 
 using LinkPython = App::FeaturePythonT<Link>;
@@ -600,6 +604,8 @@ public:
         _handleChangedPropertyName(reader,TypeName,PropName);
     }
 
+    bool isLink() const override;
+
     App::Link* getLinkGroup() const;
 };
 

src/App/Metadata.cpp

@@ -58,7 +58,12 @@ directly. If you did not intend to use a system-defined macro
 
 using namespace App;
 namespace fs = boost::filesystem;
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 
 namespace MetadataInternal
 {

src/App/MetadataPyImp.cpp

@@ -30,7 +30,12 @@
 #include "MetadataPy.cpp"
 
 using namespace Base;
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 
 // Returns a string which represents the object e.g. when printed in Python
 std::string MetadataPy::representation() const

src/App/PreCompiled.h

@@ -69,6 +69,7 @@
 
 // STL
 #include <bitset>
+#include <chrono>
 #include <exception>
 #include <functional>
 #include <iterator>

src/App/ProjectFile.cpp

@@ -56,7 +56,12 @@
 #include <Base/Stream.h>
 #include <Base/XMLTools.h>
 
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 using namespace App;
 
 namespace {

src/App/ProjectFile.h

@@ -32,11 +32,17 @@
 #include <string>
 #include <xercesc/util/XercesDefs.hpp>
 
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+namespace XERCES_CPP_NAMESPACE { class DOMNode; class DOMElement; class DOMDocument; }
+#else
 XERCES_CPP_NAMESPACE_BEGIN
 class DOMDocument;
 class DOMElement;
 class DOMNode;
 XERCES_CPP_NAMESPACE_END
+#endif
 
 namespace App
 {

src/App/PropertyLinks.cpp

@@ -272,7 +272,7 @@ void PropertyLinkBase::_registerElementReference(App::DocumentObject *obj, std::
         return;
     }
     if (shadow.newName.empty()) {
-        _updateElementReference(0, obj, sub, shadow, false);
+        _updateElementReference(nullptr, obj, sub, shadow, false);
         return;
     }
     GeoFeature* geo = nullptr;
@@ -283,7 +283,7 @@ void PropertyLinkBase::_registerElementReference(App::DocumentObject *obj, std::
                                elementName,
                                true,
                                GeoFeature::ElementNameType::Export,
-                               0,
+                               nullptr,
                                &element,
                                &geo);
     if (!geo || !element || !element[0]) {

src/App/PropertyStandard.cpp

@@ -3018,6 +3018,17 @@ void PropertyMaterialList::setTransparency(int index, float val)
     hasSetValue();
 }
 
+void PropertyMaterialList::setTransparencies(const std::vector<float>& transparencies)
+{
+    aboutToSetValue();
+    setSize(transparencies.size(), _lValueList[0]);
+
+    for (std::size_t i = 0; i < transparencies.size(); i++) {
+        _lValueList[i].transparency = transparencies[i];
+    }
+    hasSetValue();
+}
+
 const Color& PropertyMaterialList::getAmbientColor() const
 {
     return _lValueList[0].ambientColor;
@@ -3088,6 +3099,16 @@ float PropertyMaterialList::getTransparency(int index) const
     return _lValueList[index].transparency;
 }
 
+std::vector<float> PropertyMaterialList::getTransparencies() const
+{
+    std::vector<float> list;
+    for (auto& material : _lValueList) {
+        list.push_back(material.transparency);
+    }
+
+    return list;
+}
+
 Material PropertyMaterialList::getPyValue(PyObject* value) const
 {
     if (PyObject_TypeCheck(value, &(MaterialPy::Type))) {

src/App/PropertyStandard.h

@@ -1156,6 +1156,7 @@ public:
 
     void setTransparency(float);
     void setTransparency(int index, float);
+    void setTransparencies(const std::vector<float>& transparencies);
 
     const Color& getAmbientColor() const;
     const Color& getAmbientColor(int index) const;
@@ -1175,6 +1176,7 @@ public:
 
     float getTransparency() const;
     float getTransparency(int index) const;
+    std::vector<float> getTransparencies() const;
 
     PyObject* getPyObject() override;
 

src/App/Resources/translations/App.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../Application.cpp" line="459"/>
+        <location filename="../../Application.cpp" line="463"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>

src/App/Resources/translations/App_be.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Без назвы</translation>
     </message>

src/App/Resources/translations/App_ca.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sense nom</translation>
     </message>

src/App/Resources/translations/App_cs.ts

@@ -14,7 +14,7 @@ které odkazují na stejný konfigurovatelný objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nepojmenovaný</translation>
     </message>

src/App/Resources/translations/App_da.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Unavngivet</translation>
     </message>

src/App/Resources/translations/App_de.ts

@@ -14,7 +14,7 @@ angewendet werden soll, die das gleiche konfigurierbare Objekt referenzieren</tr
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Unbenannt</translation>
     </message>

src/App/Resources/translations/App_el.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Ανώνυμο</translation>
     </message>

src/App/Resources/translations/App_es-AR.ts

@@ -14,7 +14,7 @@ que hacen referencia al mismo objeto configurable</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

src/App/Resources/translations/App_es-ES.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

src/App/Resources/translations/App_eu.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Izenik gabea</translation>
     </message>

src/App/Resources/translations/App_fi.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nimetön</translation>
     </message>

src/App/Resources/translations/App_fr.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nouveau</translation>
     </message>

src/App/Resources/translations/App_hr.ts

@@ -14,7 +14,7 @@ na sve veze koje referenciraju isti konfigurabilni objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Neimenovano</translation>
     </message>

src/App/Resources/translations/App_hu.ts

@@ -14,7 +14,7 @@ amelyek ugyanarra a konfigurálható tárgyra hivatkoznak</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Névtelen</translation>
     </message>

src/App/Resources/translations/App_it.ts

@@ -14,7 +14,7 @@ che fanno riferimento allo stesso oggetto configurabile</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Senza nome</translation>
     </message>

src/App/Resources/translations/App_ja.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>名称未設定</translation>
     </message>

src/App/Resources/translations/App_ka.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>უსახელო</translation>
     </message>

src/App/Resources/translations/App_ko.ts

@@ -7,14 +7,13 @@
       <location filename="../../Link.cpp" line="118"/>
       <source>Stores the last user choice of whether to apply CopyOnChange setup to all links
 that reference the same configurable object</source>
-      <translation type="unfinished">Stores the last user choice of whether to apply CopyOnChange setup to all links
-that reference the same configurable object</translation>
+      <translation>동일한 물체를 참조하는 모든 연결에 CopyOnChange 설정을 적용할지 사용자의 최종 선택값을 저장</translation>
     </message>
   </context>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>이름없음</translation>
     </message>

src/App/Resources/translations/App_lt.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Be pavadinimo</translation>
     </message>

src/App/Resources/translations/App_nl.ts

@@ -14,7 +14,7 @@ die verwijzen naar hetzelfde configureerbare object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Naamloos</translation>
     </message>

src/App/Resources/translations/App_pl.ts

@@ -14,7 +14,7 @@ które odnoszą się do tego samego obiektu konfigurowalnego</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nienazwany</translation>
     </message>

src/App/Resources/translations/App_pt-BR.ts

@@ -14,7 +14,7 @@ que referenciam o mesmo objeto configurável</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sem nome</translation>
     </message>

src/App/Resources/translations/App_pt-PT.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sem nome</translation>
     </message>

src/App/Resources/translations/App_ro.ts

@@ -14,7 +14,7 @@ care fac referire la același obiect configurabil</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nedenumit</translation>
     </message>

src/App/Resources/translations/App_ru.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Безымянный</translation>
     </message>

src/App/Resources/translations/App_sl.ts

@@ -14,7 +14,7 @@ za vse povezave, ki se sklicujejo na isti nastavljivi predmet</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Neimenovan</translation>
     </message>

src/App/Resources/translations/App_sr-CS.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Bez imena</translation>
     </message>

src/App/Resources/translations/App_sr.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Без имена</translation>
     </message>

src/App/Resources/translations/App_sv-SE.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Namnlös</translation>
     </message>

src/App/Resources/translations/App_tr.ts

@@ -14,7 +14,7 @@ uygulanmayacağına ilişkin son kullanıcı seçimini saklar</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>İsimsiz</translation>
     </message>
@@ -24,32 +24,32 @@ uygulanmayacağına ilişkin son kullanıcı seçimini saklar</translation>
     <message>
       <location filename="../../Origin.cpp" line="142"/>
       <source>X-axis</source>
-      <translation type="unfinished">X-axis</translation>
+      <translation>X-ekseni</translation>
     </message>
     <message>
       <location filename="../../Origin.cpp" line="143"/>
       <source>Y-axis</source>
-      <translation type="unfinished">Y-axis</translation>
+      <translation>Y-ekseni</translation>
     </message>
     <message>
       <location filename="../../Origin.cpp" line="144"/>
       <source>Z-axis</source>
-      <translation type="unfinished">Z-axis</translation>
+      <translation>Z-ekseni</translation>
     </message>
     <message>
       <location filename="../../Origin.cpp" line="145"/>
       <source>XY-plane</source>
-      <translation type="unfinished">XY-plane</translation>
+      <translation>XY-düzlemi</translation>
     </message>
     <message>
       <location filename="../../Origin.cpp" line="146"/>
       <source>XZ-plane</source>
-      <translation type="unfinished">XZ-plane</translation>
+      <translation>XZ-düzlemi</translation>
     </message>
     <message>
       <location filename="../../Origin.cpp" line="147"/>
       <source>YZ-plane</source>
-      <translation type="unfinished">YZ-plane</translation>
+      <translation>YZ-düzlemi</translation>
     </message>
   </context>
   <context>

src/App/Resources/translations/App_uk.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Без назви</translation>
     </message>

src/App/Resources/translations/App_val-ES.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sense nom</translation>
     </message>

src/App/Resources/translations/App_zh-CN.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>未命名</translation>
     </message>

src/App/Resources/translations/App_zh-TW.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>未命名</translation>
     </message>

src/App/SafeMode.cpp

@@ -0,0 +1,79 @@
+/***************************************************************************
+ *   Copyright (c) 2024 Benjamin Nauck <benjamin@nauck.se>                 *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Library General Public License (LGPL)   *
+ *   as published by the Free Software Foundation; either version 2 of     *
+ *   the License, or (at your option) any later version.                   *
+ *   for detail see the LICENCE text file.                                 *
+ *                                                                         *
+ *   FreeCAD is distributed in the hope that it will be useful,            *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with FreeCAD; if not, write to the Free Software        *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "PreCompiled.h"
+
+#include <QTemporaryDir>
+
+#include "Application.h"
+#include "FCConfig.h"
+
+#include "SafeMode.h"
+
+static QTemporaryDir * tempDir = nullptr;
+
+static bool _createTemporaryBaseDir() {
+    tempDir = new QTemporaryDir();
+    if (!tempDir->isValid()) {
+        delete tempDir;
+        tempDir = nullptr;
+    }
+    return tempDir;
+}
+
+static void _replaceDirs()
+{
+    auto &config = App::GetApplication().Config();
+
+    auto const temp_base = tempDir->path().toStdString();
+    auto const dirs = {
+        "UserAppData",
+        "UserConfigPath",
+        "UserCachePath",
+        "AppTempPath",
+        "UserMacroPath",
+        "UserHomePath",
+    };
+
+    for (auto const d : dirs) {
+        auto const path = temp_base + PATHSEP + d + PATHSEP;
+        auto const qpath = QString::fromStdString(path);
+        QDir().mkpath(qpath);
+        config[d] = path;
+    }
+}
+
+void SafeMode::StartSafeMode()
+{
+    if (_createTemporaryBaseDir()) {
+        _replaceDirs();
+    }
+}
+
+bool SafeMode::SafeModeEnabled() {
+    return tempDir;
+}
+
+void SafeMode::Destruct() {
+    delete tempDir;
+}

src/App/SafeMode.h

@@ -0,0 +1,30 @@
+/***************************************************************************
+ *   Copyright (c) 2024 Benjamin Nauck <benjamin@nauck.se>                 *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Library General Public License (LGPL)   *
+ *   as published by the Free Software Foundation; either version 2 of     *
+ *   the License, or (at your option) any later version.                   *
+ *   for detail see the LICENCE text file.                                 *
+ *                                                                         *
+ *   FreeCAD is distributed in the hope that it will be useful,            *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with FreeCAD; if not, write to the Free Software        *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#pragma once
+
+namespace SafeMode {
+    AppExport bool SafeModeEnabled();
+    AppExport void StartSafeMode();
+    AppExport void Destruct();
+};

src/Base/InputSource.cpp

@@ -35,8 +35,12 @@
 #include "InputSource.h"
 #include "XMLTools.h"
 
-
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 
 using namespace Base;
 using namespace std;

src/Base/InputSource.h

@@ -32,10 +32,18 @@
 #include <FCGlobal.h>
 #endif
 
-
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+namespace XERCES_CPP_NAMESPACE
+{
+class BinInputStream;
+}
+#else
 XERCES_CPP_NAMESPACE_BEGIN
 class BinInputStream;
 XERCES_CPP_NAMESPACE_END
+#endif
 
 namespace Base
 {

src/Base/Parameter.cpp

@@ -50,7 +50,7 @@
 #endif
 
 #include <boost/algorithm/string.hpp>
-#include "fmt/printf.h"
+#include <fmt/printf.h>
 
 #include "Parameter.h"
 #include "Parameter.inl"
@@ -60,8 +60,12 @@
 
 FC_LOG_LEVEL_INIT("Parameter", true, true)
 
-
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 using namespace Base;
 
 
@@ -77,7 +81,6 @@ using namespace Base;
 // - XStr
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-
 class DOMTreeErrorReporter: public ErrorHandler
 {
 public:

src/Base/Parameter.h

@@ -65,7 +65,18 @@ using PyObject = struct _object;
 #pragma warning(disable : 4275)
 #endif
 
-
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+namespace XERCES_CPP_NAMESPACE
+{
+class DOMNode;
+class DOMElement;
+class DOMDocument;
+class XMLFormatTarget;
+class InputSource;
+}  // namespace XERCES_CPP_NAMESPACE
+#else
 XERCES_CPP_NAMESPACE_BEGIN
 class DOMNode;
 class DOMElement;
@@ -73,6 +84,7 @@ class DOMDocument;
 class XMLFormatTarget;
 class InputSource;
 XERCES_CPP_NAMESPACE_END
+#endif
 
 class ParameterManager;
 

src/Base/PyObjectBase.cpp

@@ -49,6 +49,7 @@ PyObject* Base::PyExc_FC_ExpressionError = nullptr;
 PyObject* Base::PyExc_FC_ParserError = nullptr;
 PyObject* Base::PyExc_FC_CADKernelError = nullptr;
 PyObject* Base::PyExc_FC_PropertyError = nullptr;
+PyObject* Base::PyExc_FC_AbortIOException = nullptr;
 
 typedef struct {            //NOLINT
     PyObject_HEAD

src/Base/PyObjectBase.h

@@ -431,6 +431,7 @@ BaseExport extern PyObject* PyExc_FC_ExpressionError;
 BaseExport extern PyObject* PyExc_FC_ParserError;
 BaseExport extern PyObject* PyExc_FC_CADKernelError;
 BaseExport extern PyObject* PyExc_FC_PropertyError;
+BaseExport extern PyObject* PyExc_FC_AbortIOException;
 
 /** Exception handling for python callback functions
  * Is a convenience macro to manage the exception handling of python callback