cmake: remove rc4 suffix from version info

Assembly: fixed defect in the migrationScript4 function
The old CAD model created by the development version of FreeCAD (in which the Assembly workbench was used) contained joints that, for some reason, had an empty Joint Connector 1 reference (Reference1). This was causing an exception and a crash of the Python function called migrationScript4. The FreeCAD Report view contained: 23:28:29 pyException: Traceback (most recent call last): File "/FreeCAD/Mod/Assembly/JointObject.py", line 175, in onDocumentRestored self.createProperties(joint) File "/FreeCAD/Mod/Assembly/JointObject.py", line 181, in createProperties self.migrationScript4(joint) File "/FreeCAD/Mod/Assembly/JointObject.py", line 514, in migrationScript4 if hasattr(joint, "Reference1") and joint.Reference1[0] is not None: ~~~~~~~~~~~~~~~~^^^ <class 'TypeError'>: 'NoneType' object is not subscriptable This patch attempts to avoid such exceptions by validating the type of the property variable before accessing it.
2024-11-18 13:48:00 -03:00 · 2024-11-18 10:46:53 -06:00 · 2024-11-18 10:44:03 -06:00 · 2024-11-18 10:39:24 -06:00 · 2024-11-18 10:39:11 -06:00 · 2024-11-13 22:01:49 -03:00
1251 changed files with 102615 additions and 86773 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -30,7 +30,7 @@ project(FreeCAD)
 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 "RC2") # either "dev" for development snapshot or "" (empty string)
+set(PACKAGE_VERSION_SUFFIX "") # 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}")
@@ -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
 --------
@@ -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)
@@ -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.*
@@ -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.*
@@ -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
@@ -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
@@ -4,7 +4,6 @@ SET(Examples_Files
    draft_test_objects.FCStd
    EngineBlock.FCStd
    PartDesignExample.FCStd
-    RobotExample.FCStd
    BIMExample.FCStd
    FEMExample.FCStd
    AssemblyExample.FCStd
@@ -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)
@@ -1112,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"];
@@ -1742,6 +1762,7 @@ void Application::destruct()
    Base::InterpreterSingleton::Destruct();
    Base::Type::destruct();
    ParameterManager::Terminate();
+    SafeMode::Destruct();
 }

 void Application::destructObserver()
@@ -2230,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")
    ;

@@ -2557,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";
@@ -2645,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();

@@ -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 */
@@ -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"
@@ -288,6 +288,7 @@ SET(FreeCADApp_CPP_SRCS
    Metadata.cpp
    MetadataPyImp.cpp
    ElementNamingUtils.cpp
+    SafeMode.cpp
    StringHasher.cpp
    StringHasherPyImp.cpp
    StringIDPyImp.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();
 }

 //--------------------------------------------------------------------------
@@ -3625,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);
@@ -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>
@@ -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;
@@ -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{};
@@ -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);

@@ -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
@@ -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
@@ -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, ""))
@@ -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) {
@@ -69,6 +69,7 @@

 // STL
 #include <bitset>
+#include <chrono>
 #include <exception>
 #include <functional>
 #include <iterator>
@@ -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]) {
@@ -3099,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))) {
@@ -1176,6 +1176,7 @@ public:

    float getTransparency() const;
    float getTransparency(int index) const;
+    std::vector<float> getTransparencies() const;

    PyObject* getPyObject() override;

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Без назвы</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Sense nom</translation>
    </message>
@@ -14,7 +14,7 @@ které odkazují na stejný konfigurovatelný objekt</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Nepojmenovaný</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Unavngivet</translation>
    </message>
@@ -14,7 +14,7 @@ angewendet werden soll, die das gleiche konfigurierbare Objekt referenzieren</tr
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Unbenannt</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Ανώνυμο</translation>
    </message>
@@ -14,7 +14,7 @@ que hacen referencia al mismo objeto configurable</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Sin nombre</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Sin nombre</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Izenik gabea</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Nimetön</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Nouveau</translation>
    </message>
@@ -14,7 +14,7 @@ na sve veze koje referenciraju isti konfigurabilni objekt</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Neimenovano</translation>
    </message>
@@ -14,7 +14,7 @@ amelyek ugyanarra a konfigurálható tárgyra hivatkoznak</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Névtelen</translation>
    </message>
@@ -14,7 +14,7 @@ che fanno riferimento allo stesso oggetto configurabile</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Senza nome</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>名称未設定</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>უსახელო</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>이름없음</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Be pavadinimo</translation>
    </message>
@@ -14,7 +14,7 @@ die verwijzen naar hetzelfde configureerbare object</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Naamloos</translation>
    </message>
@@ -14,7 +14,7 @@ które odnoszą się do tego samego obiektu konfigurowalnego</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Nienazwany</translation>
    </message>
@@ -14,7 +14,7 @@ que referenciam o mesmo objeto configurável</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Sem nome</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Sem nome</translation>
    </message>
@@ -14,7 +14,7 @@ care fac referire la același obiect configurabil</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Nedenumit</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Безымянный</translation>
    </message>
@@ -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="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Neimenovan</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Bez imena</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Без имена</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Namnlös</translation>
    </message>
@@ -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="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>İsimsiz</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Без назви</translation>
    </message>
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>Sense nom</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>未命名</translation>
    </message>
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
  <context>
    <name>QObject</name>
    <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
      <source>Unnamed</source>
      <translation>未命名</translation>
    </message>
@@ -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;
+}
@@ -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();
+};
@@ -36,7 +36,7 @@
    <message>
      <location filename="../../UnitsApi.cpp" line="81"/>
      <source>Metric small parts &amp; CNC (mm, mm/min)</source>
-      <translation type="unfinished">Metric small parts &amp; CNC (mm, mm/min)</translation>
+      <translation>Metrički mali dijelovi &amp; CNC (mm, mm/min)</translation>
    </message>
    <message>
      <location filename="../../UnitsApi.cpp" line="83"/>
@@ -26,27 +26,27 @@
    <message>
      <location filename="../../UnitsApi.cpp" line="77"/>
      <source>Building Euro (cm, m², m³)</source>
-      <translation type="unfinished">Building Euro (cm, m², m³)</translation>
+      <translation>欧规(㎝, ㎡, ㎥)</translation>
    </message>
    <message>
      <location filename="../../UnitsApi.cpp" line="79"/>
      <source>Building US (ft-in, sqft, cft)</source>
-      <translation type="unfinished">Building US (ft-in, sqft, cft)</translation>
+      <translation>美制 (ft-in/sqft/cuft)</translation>
    </message>
    <message>
      <location filename="../../UnitsApi.cpp" line="81"/>
      <source>Metric small parts &amp; CNC (mm, mm/min)</source>
-      <translation type="unfinished">Metric small parts &amp; CNC (mm, mm/min)</translation>
+      <translation>公制 (㎜, ㎧)</translation>
    </message>
    <message>
      <location filename="../../UnitsApi.cpp" line="83"/>
      <source>Imperial for Civil Eng (ft, ft/s)</source>
-      <translation type="unfinished">Imperial for Civil Eng (ft, ft/s)</translation>
+      <translation>英制 (ft, ft/s)</translation>
    </message>
    <message>
      <location filename="../../UnitsApi.cpp" line="85"/>
      <source>FEM (mm, N, s)</source>
-      <translation type="unfinished">FEM (mm, N, s)</translation>
+      <translation>有限元(mm, N, s)</translation>
    </message>
    <message>
      <location filename="../../UnitsApi.cpp" line="87"/>
@@ -10,19 +10,17 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Version.h)
                ${CMAKE_CURRENT_BINARY_DIR}/Version.h.in)

    add_custom_command(
-        OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/Version.h
+        OUTPUT version_file
+        BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py
+            --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR}
        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/Version.h.out
            ${CMAKE_CURRENT_BINARY_DIR}/Version.h
        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS version_check)
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Version.h.in)
+    set_source_files_properties(version_file PROPERTIES SYMBOLIC true)

-    add_custom_command(
-        OUTPUT  version_check
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py
-        --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
-    ADD_CUSTOM_TARGET(fc_version DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Version.h)
+    ADD_CUSTOM_TARGET(fc_version DEPENDS version_file)

 else (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Version.h)

@@ -1,13 +1,12 @@
-
-configure_file(ThirdPartyLibraries.html
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/ThirdPartyLibraries.html COPYONLY)
+configure_file(ThirdPartyLibraries.html.cmake
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/ThirdPartyLibraries.html)
 configure_file(LICENSE.html
    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/LICENSE.html COPYONLY)

 # The CONTRIBUTORS file is now compiled into the FreeCAD GUI Qt resource file

 INSTALL(FILES
-    ThirdPartyLibraries.html
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/ThirdPartyLibraries.html
    LICENSE.html
    DESTINATION ${CMAKE_INSTALL_DOCDIR}
 )
@@ -24,6 +24,7 @@ List of Open Source components<br />


 <h3><a name="_TocBoost"></a>Boost</h3>
+<p>Version: ${Boost_VERSION}</p>
 <p>Web site: <a href="https://www.boost.org/">https://www.boost.org/</a></p>
 <p>License: Boost Software License: <a href="https://www.boost.org/users/license.html">https://www.boost.org/users/license.html</a></p>

@@ -31,6 +32,7 @@ List of Open Source components<br />
 <hr>

 <h3><a name="_TocCoin3D"></a>Coin3D</h3>
+<p>Version: ${COIN3D_VERSION}</p>
 <p>Web site: <a href="https://coin3d.github.io">https://coin3d.github.io</a></p>
 <p>License: BSD 3-Clause: <a href="https://github.com/coin3d/coin/blob/master/COPYING">https://github.com/coin3d/coin/blob/master/COPYING</a></p>

@@ -38,6 +40,7 @@ List of Open Source components<br />
 <hr>

 <h3><a name="_TocEigen"></a>Eigen</h3>
+<p>Version: ${EIGEN3_VERSION}</p>
 <p>Web site: <a href="https://eigen.tuxfamily.org">https://eigen.tuxfamily.org</a></p>
 <p>License:  MPL version 2.0: <a href="https://www.mozilla.org/en-US/MPL/2.0/">https://www.mozilla.org/en-US/MPL/2.0/</a></p>

@@ -45,6 +48,7 @@ List of Open Source components<br />
 <hr>

 <h3><a name="_TocFreeType"></a>FreeType</h3>
+<p>Version: ${FREETYPE_VERSION_STRING}</p>
 <p>Web site: <a href="https://www.freetype.org/">https://www.freetype.org/</a></p>
 <p>License: FreeType License: <a href="https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT">https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT</a></p>

@@ -66,6 +70,7 @@ List of Open Source components<br />
 <hr>

 <h3><a name="_Ondsel"></a>Ondsel Solver</h3>
+<p>Version: 1.0.1</p>
 <p>Web site: <a href="https://github.com/Ondsel-Development/OndselSolver">https://github.com/Ondsel-Development/OndselSolver</a></p>
 <p>License: LGPL version 2.1: <a href="#_LGPLv21">LGPL v2.1</a></p>

@@ -73,12 +78,14 @@ List of Open Source components<br />
 <hr>

 <h3><a name="_TocOCCT"></a>Open CASCADE Technology</h3>
+<p>Version: ${OCC_VERSION_STRING}</p>
 <p>Web site: <a href="https://www.opencascade.com/open-cascade-technology/">https://www.opencascade.com/open-cascade-technology/</a></p>
 <p>License: LGPL version 2.1 with additional exception:<a href="https://dev.opencascade.org/resources/licensing">https://dev.opencascade.org/resources/licensing</a></p>

 <hr>

 <h3><a name="_TocPcl"></a>Point Cloud Library</h3>
+<p>Version: ${PCL_VERSION}</p>
 <p>Web site: <a href="https://www.pointclouds.org">https://www.pointclouds.org</a></p>
 <p>License: BSD-3-clause<a href="https://github.com/PointCloudLibrary/pcl/blob/master/LICENSE.txt">https://github.com/PointCloudLibrary/pcl/blob/master/LICENSE.txt</a></p>

@@ -86,6 +93,7 @@ List of Open Source components<br />
 <hr>

 <h3><a name="_TocPyCXX"></a>PyCXX</h3>
+<p>Version: ${PYCXX_VERSION}</p>
 <p>Web site: <a href="http://cxx.sourceforge.net">http://cxx.sourceforge.net</a></p>
 <p>License: BSD-3-clause</p>
 <pre>
@@ -149,6 +157,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocPython"></a>Python</h3>
+<p>Version: ${PYTHON_VERSION_STRING}</p>
 <p>Web site: <a href="https://www.python.org/">https://www.python.org/</a></p>
 <p>License: <a href="https://docs.python.org/3.6/license.html">https://docs.python.org/3.6/license.html</a></p>

@@ -156,6 +165,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocPySide"></a>Qt for Python (Shiboken / PySide)</h3>
+<p>Version: ${PySide2_VERSION}</p>
 <p>Web site: <a href="https://wiki.qt.io/Qt_for_Python">https://wiki.qt.io/Qt_for_Python</a></p>
 <p>License: LGPL version 3 / GPL version 2: <a href="https://tldrlegal.com/license/gnu-lesser-general-public-license-v3-(lgpl-3)">LGPLv3</a> / <a href="https://tldrlegal.com/license/gnu-general-public-license-v2">GPLv2</a>

@@ -163,6 +173,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocQt"></a>Qt</h3>
+<p>Version: ${QtCore_VERSION}</p>
 <p>Web site: <a href="https://www.qt.io/">https://www.qt.io/</a></p>
 <p>License: LGPL version 3.0: <a href="https://www.gnu.org/licenses/lgpl-3.0.en.html">https://www.gnu.org/licenses/lgpl-3.0.en.html</a></p>

@@ -170,6 +181,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocSalomeSMESH"></a>Salome SMESH</h3>
+<p>Version: ${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}</p>
 <p>Web site: <a href="https://www.salome-platform.org/">https://www.salome-platform.org/</a></p>
 <p>License: LGPL version 2.1: <a href="#_LGPLv21">LGPL v2.1</a></p>
 </pre>
@@ -177,6 +189,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocVtk"></a>Visualization Toolkit</h3>
+<p>Version: ${VTK_VERSION}</p>
 <p>Web site: <a href="https://www.vtk.org">https://www.vtk.org</a></p>
 <p>License: BSD-3-clause: <a href="https://vtk.org/Wiki/VTK/License">https://vtk.org/Wiki/VTK/License</a></p>

@@ -184,6 +197,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocXercesC"></a>Xerces-C</h3>
+<p>Version: ${XercesC_VERSION}</p>
 <p>Web site: <a href="https://xerces.apache.org/xerces-c">https://xerces.apache.org/xerces-c</a></p>
 <p>License: Apache License Version 2.0: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></p>

@@ -198,6 +212,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocZlib"></a>zlib</h3>
+<p>Version: ${ZLIB_VERSION_STRING}</p>
 <p>Web site: <a href="https://zlib.net/">https://zlib.net/</a></p>
 <p>License: zlib: <a href="https://zlib.net/zlib_license.html">https://zlib.net/zlib_license.html</p>

@@ -1,13 +1,18 @@
-def OpenInsertObject(importerModule, objectPath, importMethod, docName = ""):
+from FreeCAD import Base
+import importlib
+
+def OpenInsertObject(importerName, objectPath, importMethod, docName = ""):
    try:
        importArgs = []
        importKwargs = {}

+        importerModule = importlib.import_module(importerName)
+
        if docName:
            importArgs.append(docName)
        if hasattr(importerModule, "importOptions"):
            importKwargs["options"] = importerModule.importOptions(objectPath)

        getattr(importerModule, importMethod)(objectPath, *importArgs, **importKwargs)
-    except PyExc_FC_AbortIOException:
+    except Base.AbortIOException:
        pass
@@ -45,7 +45,7 @@
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-         <property name="sizeHint" stdset="0">
+         <property name="sizeHint">
          <size>
           <width>430</width>
           <height>17</height>
@@ -74,7 +74,7 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-             <property name="sizeHint" stdset="0">
+             <property name="sizeHint">
              <size>
               <width>31</width>
               <height>20</height>
@@ -97,7 +97,7 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-             <property name="sizeHint" stdset="0">
+             <property name="sizeHint">
              <size>
               <width>31</width>
               <height>20</height>
@@ -172,14 +172,14 @@
            </widget>
           </item>
           <item row="4" column="0">
-            <widget class="QLabel" name="labelPlatform">
+            <widget class="QLabel" name="labelArchitecture">
             <property name="text">
-              <string>Word size</string>
+              <string>Architecture</string>
             </property>
            </widget>
           </item>
           <item row="4" column="1">
-            <widget class="QLabel" name="labelBuildPlatform">
+            <widget class="QLabel" name="labelBuildRunArchitecture">
             <property name="text">
              <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style="font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
@@ -231,7 +231,7 @@
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-           <property name="sizeHint" stdset="0">
+           <property name="sizeHint">
            <size>
             <width>40</width>
             <height>20</height>
@@ -246,7 +246,7 @@
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-         <property name="sizeHint" stdset="0">
+         <property name="sizeHint">
          <size>
           <width>430</width>
           <height>17</height>
@@ -371,7 +371,7 @@ p, li { white-space: pre-wrap; }
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint">
        <size>
         <width>160</width>
         <height>31</height>
@@ -28,8 +28,8 @@
 # include <QActionGroup>
 # include <QApplication>
 # include <QEvent>
+# include <QFileInfo>
 # include <QMenu>
-# include <QMessageBox>
 # include <QRegularExpression>
 # include <QScreen>
 # include <QTimer>
@@ -50,8 +50,8 @@
 #include "PreferencePages/DlgSettingsWorkbenchesImp.h"
 #include "Document.h"
 #include "EditorView.h"
-#include "FileDialog.h"
 #include "Macro.h"
+#include "ModuleIO.h"
 #include "MainWindow.h"
 #include "PythonEditor.h"
 #include "WhatsThis.h"
@@ -902,20 +902,13 @@ void RecentFilesAction::activateFile(int id)
    }

    QString filename = files[id];
-    QFileInfo fi(filename);
-    if (!fi.exists() || !fi.isFile()) {
-        QMessageBox::critical(getMainWindow(), tr("File not found"), tr("The file '%1' cannot be opened.").arg(filename));
+    if (!ModuleIO::verifyFile(filename)) {
        files.removeAll(filename);
        setFiles(files);
        save();
    }
    else {
-        // invokes appendFile()
-        SelectModule::Dict dict = SelectModule::importHandler(filename);
-        for (SelectModule::Dict::iterator it = dict.begin(); it != dict.end(); ++it) {
-            Application::Instance->open(it.key().toUtf8(), it.value().toLatin1());
-            break;
-        }
+        ModuleIO::openFile(filename);
    }
 }

@@ -1102,8 +1095,7 @@ void RecentMacrosAction::activateFile(int id)

    QString filename = files[id];
    QFileInfo fi(filename);
-    if (!fi.exists() || !fi.isFile()) {
-        QMessageBox::critical(getMainWindow(), tr("File not found"), tr("The file '%1' cannot be opened.").arg(filename));
+    if (!ModuleIO::verifyFile(filename)) {
        files.removeAll(filename);
        setFiles(files);
    }
@@ -42,6 +42,7 @@
 #endif

 #include <QLoggingCategory>
+#include <fmt/format.h>

 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
@@ -448,6 +449,13 @@ Application::Application(bool GUIenabled)
            PyModule_AddFunctions(module, Application::Methods);
        }
        Py::Module(module).setAttr(std::string("ActiveDocument"), Py::None());
+        Py::Module(module).setAttr(std::string("HasQtBug_129596"),
+#ifdef HAS_QTBUG_129596
+            Py::True()
+#else
+            Py::False()
+#endif
+        );

        UiLoaderPy::init_type();
        Base::Interpreter().addType(UiLoaderPy::type_object(), module, "UiLoader");
@@ -637,21 +645,10 @@ void Application::open(const char* FileName, const char* Module)
                }
            }
            else {
-                // Load using provided python module
-                {
-                    Base::PyGILStateLocker locker;
-                    Py::Module moduleIo(PyImport_ImportModule("freecad.module_io"));
-                    const auto dictS = moduleIo.getDict().keys().as_string();
-                    if (!moduleIo.isNull() && moduleIo.hasAttr("OpenInsertObject"))
-                    {
-                        const Py::TupleN args(
-                            Py::Module(PyImport_ImportModule(Module)),
-                            Py::String(unicodepath),
-                            Py::String("open")
-                        );
-                        moduleIo.callMemberFunction("OpenInsertObject", args);
-                    }
-                }
+                std::string code = fmt::format("from freecad import module_io\n"
+                                               "module_io.OpenInsertObject(\"{}\", \"{}\", \"{}\")\n",
+                                               Module, unicodepath, "open");
+                Gui::Command::runCommand(Gui::Command::App, code.c_str());

                // ViewFit
                if (sendHasMsgToActiveView("ViewFit")) {
@@ -690,7 +687,7 @@ void Application::importFrom(const char* FileName, const char* DocName, const ch
    wc.setIgnoreEvents(WaitCursor::NoEvents);
    Base::FileInfo File(FileName);
    std::string te = File.extension();
-    string unicodepath = Base::Tools::escapedUnicodeFromUtf8(File.filePath().c_str());
+    string unicodepath = File.filePath().c_str();
    unicodepath = Base::Tools::escapeEncodeFilename(unicodepath);

    if (Module) {
@@ -716,22 +713,10 @@ void Application::importFrom(const char* FileName, const char* DocName, const ch
                    }
                }

-                // Load using provided python module
-                {
-                    Base::PyGILStateLocker locker;
-                    Py::Module moduleIo(PyImport_ImportModule("freecad.module_io"));
-                    const auto dictS = moduleIo.getDict().keys().as_string();
-                    if (!moduleIo.isNull() && moduleIo.hasAttr("OpenInsertObject"))
-                    {
-                        const Py::TupleN args(
-                            Py::Module(PyImport_ImportModule(Module)),
-                            Py::String(unicodepath),
-                            Py::String("insert"),
-                            Py::String(DocName)
-                        );
-                        moduleIo.callMemberFunction("OpenInsertObject", args);
-                    }
-                }
+                std::string code = fmt::format("from freecad import module_io\n"
+                                               "module_io.OpenInsertObject(\"{}\", \"{}\", \"{}\", \"{}\")\n",
+                                               Module, unicodepath, "insert", DocName);
+                Gui::Command::runCommand(Gui::Command::App, code.c_str());

                // Commit the transaction
                if (doc && !pendingCommand) {
@@ -1042,7 +1027,7 @@ void Application::slotActiveDocument(const App::Document& Doc)
        // Update the application to show the unit change
        ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
            "User parameter:BaseApp/Preferences/Units");
-        if (Doc.FileName.getValue()[0] != '\0' && !hGrp->GetBool("IgnoreProjectSchema")) {
+        if (!hGrp->GetBool("IgnoreProjectSchema")) {
            int userSchema = Doc.UnitSystem.getValue();
            Base::UnitsApi::setSchema(static_cast<Base::UnitSystem>(userSchema));
            getMainWindow()->setUserSchema(userSchema);
@@ -1426,6 +1411,11 @@ void Application::viewActivated(MDIView* pcView)
    }
 }

+/// Gets called if a view gets closed
+void Application::viewClosed(MDIView* pcView)
+{
+    signalCloseView(pcView);
+}

 void Application::updateActive()
 {
@@ -1923,8 +1913,11 @@ void setCategoryFilterRules()
    QTextStream stream(&filter);
    stream << "qt.qpa.xcb.warning=false\n";
    stream << "qt.qpa.mime.warning=false\n";
+    stream << "qt.qpa.wayland.warning=false\n";
+    stream << "qt.qpa.wayland.*.warning=false\n";
    stream << "qt.svg.warning=false\n";
    stream << "qt.xkb.compose.warning=false\n";
+    stream << "kf.*.warning=false\n";
    stream.flush();
    QLoggingCategory::setFilterRules(filter);
 }
@@ -2179,46 +2172,51 @@ void setAppNameAndIcon()

 void tryRunEventLoop(GUISingleApplication& mainApp)
 {
-    std::stringstream s;
-    s << App::Application::getUserCachePath() << App::Application::getExecutableName() << "_"
-      << QCoreApplication::applicationPid() << ".lock";
+    std::stringstream out;
+    out << App::Application::getUserCachePath()
+        << App::Application::getExecutableName()
+        << "_"
+        << App::Application::applicationPid()
+        << ".lock";
+
    // open a lock file with the PID
-    Base::FileInfo fi(s.str());
+    Base::FileInfo fi(out.str());
    Base::ofstream lock(fi);

    // In case the file_lock cannot be created start FreeCAD without IPC support.
 #if !defined(FC_OS_WIN32) || (BOOST_VERSION < 107600)
-    std::string filename = s.str();
+    std::string filename = out.str();
 #else
    std::wstring filename = fi.toStdWString();
 #endif
-    std::unique_ptr<boost::interprocess::file_lock> flock;
    try {
-        flock = std::make_unique<boost::interprocess::file_lock>(filename.c_str());
-        flock->lock();
+        boost::interprocess::file_lock flock(filename.c_str());
+        if (flock.try_lock()) {
+            Base::Console().Log("Init: Executing event loop...\n");
+            QApplication::exec();
+
+            // Qt can't handle exceptions thrown from event handlers, so we need
+            // to manually rethrow SystemExitExceptions.
+            if (mainApp.caughtException) {
+                throw Base::SystemExitException(*mainApp.caughtException.get());
+            }
+
+            // close the lock file, in case of a crash we can see the existing lock file
+            // on the next restart and try to repair the documents, if needed.
+            flock.unlock();
+            lock.close();
+            fi.deleteFile();
+        }
+        else {
+            Base::Console().Warning("Failed to create a file lock for the IPC.\n"
+                                    "The application will be terminated\n");
+        }
    }
    catch (const boost::interprocess::interprocess_exception& e) {
        QString msg = QString::fromLocal8Bit(e.what());
        Base::Console().Warning("Failed to create a file lock for the IPC: %s\n",
                                msg.toUtf8().constData());
    }
-
-    Base::Console().Log("Init: Executing event loop...\n");
-    QApplication::exec();
-
-    // Qt can't handle exceptions thrown from event handlers, so we need
-    // to manually rethrow SystemExitExceptions.
-    if (mainApp.caughtException) {
-        throw Base::SystemExitException(*mainApp.caughtException.get());
-    }
-
-    // close the lock file, in case of a crash we can see the existing lock file
-    // on the next restart and try to repair the documents, if needed.
-    if (flock) {
-        flock->unlock();
-    }
-    lock.close();
-    fi.deleteFile();
 }

 void runEventLoop(GUISingleApplication& mainApp)
@@ -32,6 +32,10 @@

 #include <App/Application.h>

+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) && QT_VERSION < QT_VERSION_CHECK(6,8,1)
+# define HAS_QTBUG_129596
+#endif
+
 class QCloseEvent;
 class SoNode;
 class NavlibInterface;
@@ -95,6 +99,8 @@ public:
    void detachView(Gui::BaseView* pcView);
    /// get called if a view gets activated, this manage the whole activation scheme
    void viewActivated(Gui::MDIView* pcView);
+    /// get called if a view gets closed
+    void viewClosed(Gui::MDIView* pcView);
    /// call update to all documents and all views (costly!)
    void onUpdate();
    /// call update to all views of the active document
@@ -135,6 +141,8 @@ public:
    boost::signals2::signal<void (const Gui::Document&)> signalShowHidden;
    /// signal on activating view
    boost::signals2::signal<void (const Gui::MDIView*)> signalActivateView;
+    /// signal on closing view
+    boost::signals2::signal<void (const Gui::MDIView*)> signalCloseView;
    /// signal on entering in edit mode
    boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
    /// signal on leaving edit mode
@@ -1577,6 +1577,11 @@ PyObject* Application::sCoinRemoveAllChildren(PyObject * /*self*/, PyObject *arg
    PY_TRY {
        void* ptr = nullptr;
        Base::Interpreter().convertSWIGPointerObj("pivy.coin","_p_SoGroup", pynode, &ptr, 0);
+        if (!ptr) {
+            PyErr_SetString(PyExc_RuntimeError, "Conversion of coin.SoGroup failed");
+            return nullptr;
+        }
+
        coinRemoveAllChildren(static_cast<SoGroup*>(ptr));
        Py_Return;
    }
@@ -3,6 +3,14 @@ add_subdirectory(Stylesheets)
 add_subdirectory(PreferencePacks)
 add_subdirectory(PreferencePackTemplates)

+if(BUILD_WITH_CONDA)
+    add_definitions(-DFC_CONDA)
+endif(BUILD_WITH_CONDA)
+
+if(FC_FLATPAK)
+    add_definitions(-DFC_FLATPAK)
+endif(FC_FLATPAK)
+
 if(WIN32)
 add_definitions(-DFCGui -DQSINT_MAKEDLL -DOVR_OS_WIN32 -DQUARTER_INTERNAL -DQUARTER_MAKE_DLL -DCOIN_DLL)
 endif(WIN32)
@@ -1231,6 +1239,7 @@ SET(FreeCADGui_CPP_SRCS
    GuiConsole.cpp
    Macro.cpp
    MergeDocuments.cpp
+    ModuleIO.cpp
    Namespace.h
    resource.cpp
    Control.cpp
@@ -1266,6 +1275,7 @@ SET(FreeCADGui_SRCS
    Macro.h
    MergeDocuments.h
    MetaTypes.h
+    ModuleIO.h
    Notifications.h
    PreCompiled.cpp
    PreCompiled.h
@@ -204,7 +204,11 @@ QMap<QString, CallTip> CallTipsList::extractTips(const QString& context) const
        return tips;

    try {
+        PyErr_Clear();
        Py::Module module("__main__");
+        if (module.ptr() == nullptr) {
+            return tips;
+        }
        Py::Dict dict = module.getDict();

        // this is used to filter out input of the form "1."
@@ -408,6 +408,7 @@ void StdCmdExport::activated(int iMsg)
    static QString lastExportFullPath = QString();
    static bool lastExportUsedGeneratedFilename = true;
    static QString lastExportFilterUsed = QString();
+    static Document* lastActiveDocument;

    auto selection = Gui::Selection().getObjectsOfType(App::DocumentObject::getClassTypeId());
    if (selection.empty()) {
@@ -434,15 +435,16 @@ void StdCmdExport::activated(int iMsg)

    // Create a default filename for the export
    // * If this is the first export this session default, generate a new default.
-    // * If this is a repeated export during the same session:
+    // * If this is a repeated export during the same session and file:
    //     * If the user accepted the default filename last time, regenerate a new
    //       default, potentially updating the object label.
    //     * If not, default to their previously-set export filename.
    QString defaultFilename = lastExportFullPath;

    bool filenameWasGenerated = false;
-    // We want to generate a new default name in two cases:
-    if (defaultFilename.isEmpty() || lastExportUsedGeneratedFilename) {
+    bool didActiveDocumentChange = lastActiveDocument != getActiveGuiDocument();
+    // We want to generate a new default name in three cases:
+    if (defaultFilename.isEmpty() || lastExportUsedGeneratedFilename || didActiveDocumentChange) {
        // First, get the name and path of the current .FCStd file, if there is one:
        QString docFilename = QString::fromUtf8(
            App::GetApplication().getActiveDocument()->getFileName());
@@ -461,7 +463,7 @@ void StdCmdExport::activated(int iMsg)
            defaultExportPath = Gui::FileDialog::getWorkingDirectory();
        }

-        if (lastExportUsedGeneratedFilename /*<- static, true on first call*/ ) {
+        if (lastExportUsedGeneratedFilename   || didActiveDocumentChange) {  /*<- static, true on first call*/
            defaultFilename = defaultExportPath + QLatin1Char('/') + createDefaultExportBasename();

            // Append the last extension used, if there is one.
@@ -499,6 +501,7 @@ void StdCmdExport::activated(int iMsg)
        else
            lastExportUsedGeneratedFilename = false;
        lastExportFullPath = fileName;
+        lastActiveDocument = getActiveGuiDocument();
    }
 }

@@ -29,6 +29,9 @@
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
 # include <QWhatsThis>
+# include <QAbstractButton>
+# include <QTimer>
+# include <QProcess>
 #endif

 #include <App/Document.h>
@@ -319,6 +322,53 @@ void StdCmdWhatsThis::activated(int iMsg)
    QWhatsThis::enterWhatsThisMode();
 }

+//===========================================================================
+// Std_RestartInSafeMode
+//===========================================================================
+DEF_STD_CMD(StdCmdRestartInSafeMode)
+
+StdCmdRestartInSafeMode::StdCmdRestartInSafeMode()
+  :Command("Std_RestartInSafeMode")
+{
+    sGroup        = "Help";
+    sMenuText     = QT_TR_NOOP("Restart in safe mode");
+    sToolTipText  = QT_TR_NOOP("Restart in safe mode");
+    sWhatsThis    = "Std_RestartInSafeMode";
+    sStatusTip    = QT_TR_NOOP("Restart in safe mode");
+    sPixmap       = "safe-mode-restart";
+    eType         = 0;
+}
+
+void StdCmdRestartInSafeMode::activated(int iMsg)
+{
+    Q_UNUSED(iMsg);
+
+    QMessageBox restartBox;
+    restartBox.setIcon(QMessageBox::Warning);
+    restartBox.setWindowTitle(QObject::tr("Restart in safe mode"));
+    restartBox.setText(QObject::tr("Are you sure you want to restart FreeCAD and enter safe mode?"));
+    restartBox.setInformativeText(QObject::tr("Safe mode temporarily disables your configuration and addons."));
+    restartBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    restartBox.setDefaultButton(QMessageBox::No);
+
+    if (restartBox.exec() == QMessageBox::Yes) {
+        //restart FreeCAD after a delay to give time to this dialog to close
+        const int ms = 1000;
+        QTimer::singleShot(ms, []()
+        {
+            QStringList args = QApplication::arguments();
+            args.pop_front();
+            auto const safeModeArgument = QString::fromLatin1("--safe-mode");
+            if (!args.contains(safeModeArgument)) {
+                args.append(safeModeArgument);
+            }
+            if (getMainWindow()->close()) {
+                QProcess::startDetached(QApplication::applicationFilePath(), args);
+            }
+        });
+    }
+}
+
 //===========================================================================
 // Std_DlgParameter
 //===========================================================================
@@ -938,6 +988,7 @@ void CreateStdCommands()
    rcCmdMgr.addCommand(new StdCmdRecentFiles());
    rcCmdMgr.addCommand(new StdCmdRecentMacros());
    rcCmdMgr.addCommand(new StdCmdWhatsThis());
+    rcCmdMgr.addCommand(new StdCmdRestartInSafeMode());
    rcCmdMgr.addCommand(new StdCmdPythonHelp());
    rcCmdMgr.addCommand(new StdCmdOnlineHelp());
    rcCmdMgr.addCommand(new StdCmdOnlineHelpWebsite());
@@ -166,6 +166,7 @@ void StdCmdVarSet::activated(int iMsg)
            group->addObject(doc->getObject(VarSetName.c_str()));
        }
    }
+    commitCommand();

    doCommand(Doc, "App.ActiveDocument.getObject('%s').ViewObject.doubleClicked()", VarSetName.c_str());
 }
@@ -308,15 +308,21 @@ void Model::slotChangeObject(const ViewProviderDocumentObject &VPDObjectIn, cons
  //renaming of objects.
  if (std::string("Label") == name)
  {
-    const GraphLinkRecord &record = findRecord(&VPDObjectIn, *graphLink);
-    auto text = (*theGraph)[record.vertex].text.get();
-    text->setPlainText(QString::fromUtf8(record.DObject->Label.getValue()));
+    if (hasRecord(&VPDObjectIn, *graphLink))
+    {
+      const GraphLinkRecord &record = findRecord(&VPDObjectIn, *graphLink);
+      auto text = (*theGraph)[record.vertex].text.get();
+      text->setPlainText(QString::fromUtf8(record.DObject->Label.getValue()));
+    }
  }
  else if (propertyIn.isDerivedFrom(App::PropertyLinkBase::getClassTypeId()))
  {
-    const GraphLinkRecord &record = findRecord(&VPDObjectIn, *graphLink);
-    boost::clear_vertex(record.vertex, *theGraph);
-    graphDirty = true;
+    if (hasRecord(&VPDObjectIn, *graphLink))
+    {
+      const GraphLinkRecord &record = findRecord(&VPDObjectIn, *graphLink);
+      boost::clear_vertex(record.vertex, *theGraph);
+      graphDirty = true;
+    }
  }
 }

@@ -55,6 +55,14 @@ bool Gui::DAG::hasRecord(const App::DocumentObject* dObjectIn, const GraphLinkCo
  return it != list.end();
 }

+bool Gui::DAG::hasRecord(const ViewProviderDocumentObject* VPDObjectIn, const GraphLinkContainer &containerIn)
+{
+  using List = GraphLinkContainer::index<GraphLinkRecord::ByVPDObject>::type;
+  const List &list = containerIn.get<GraphLinkRecord::ByVPDObject>();
+  List::const_iterator it = list.find(VPDObjectIn);
+  return it != list.end();
+}
+
 const GraphLinkRecord& Gui::DAG::findRecord(Vertex vertexIn, const GraphLinkContainer &containerIn)
 {
  using List = GraphLinkContainer::index<GraphLinkRecord::ByVertex>::type;
@@ -284,6 +284,7 @@ namespace Gui
    >;

    bool hasRecord(const App::DocumentObject* dObjectIn, const GraphLinkContainer &containerIn);
+    bool hasRecord(const ViewProviderDocumentObject* VPDObjectIn, const GraphLinkContainer &containerIn);
    const GraphLinkRecord& findRecord(Vertex vertexIn, const GraphLinkContainer &containerIn);
    const GraphLinkRecord& findRecord(const App::DocumentObject* dObjectIn, const GraphLinkContainer &containerIn);
    const GraphLinkRecord& findRecord(const Gui::ViewProviderDocumentObject* VPDObjectIn, const GraphLinkContainer &containerIn);
@@ -28,6 +28,7 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <App/ExpressionParser.h>
 #include <Base/Tools.h>

 #include "DlgAddProperty.h"
@@ -111,6 +112,13 @@ void DlgAddProperty::accept()
    if(ui->chkAppend->isChecked())
        name = group + "_" + name;

+    if (App::ExpressionParser::isTokenAUnit(name) || App::ExpressionParser::isTokenAConstant(name)) {
+        QMessageBox::critical(getMainWindow(),
+            QObject::tr("Invalid name"),
+            QObject::tr("The property name is a reserved word."));
+        return;
+    }
+
    for(auto c : containers) {
        auto prop = c->getPropertyByName(name.c_str());
        if(prop && prop->getContainer() == c) {
@@ -30,13 +30,13 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <App/ExpressionParser.h>
 #include <App/PropertyUnits.h>
 #include <Base/Tools.h>

 #include "DlgAddPropertyVarSet.h"
 #include "ui_DlgAddPropertyVarSet.h"
 #include "MainWindow.h"
-#include "ViewProviderDocumentObject.h"
 #include "ViewProviderVarSet.h"

 FC_LOG_LEVEL_INIT("DlgAddPropertyVarSet", true, true)
@@ -47,6 +47,8 @@ using namespace Gui::Dialog;
 const std::string DlgAddPropertyVarSet::GROUP_BASE = "Base";

 const bool CLEAR_NAME = true;
+const bool ABORT = true;
+const bool COMMIT = false;

 DlgAddPropertyVarSet::DlgAddPropertyVarSet(QWidget* parent,
                                           ViewProviderVarSet* viewProvider)
@@ -55,7 +57,8 @@ DlgAddPropertyVarSet::DlgAddPropertyVarSet(QWidget* parent,
      ui(new Ui_DlgAddPropertyVarSet),
      comboBoxGroup(this),
      completerType(this),
-      editor(nullptr)
+      editor(nullptr),
+      transactionID(0)
 {
    ui->setupUi(this);

@@ -66,12 +69,9 @@ DlgAddPropertyVarSet::~DlgAddPropertyVarSet() = default;

 void DlgAddPropertyVarSet::initializeGroup()
 {
-    connect(&comboBoxGroup, &EditFinishedComboBox::editFinished,
-            this, &DlgAddPropertyVarSet::onEditFinished);
    comboBoxGroup.setObjectName(QString::fromUtf8("comboBoxGroup"));
    comboBoxGroup.setInsertPolicy(QComboBox::InsertAtTop);
    comboBoxGroup.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-    comboBoxGroup.setEditable(true);
    auto formLayout = qobject_cast<QFormLayout*>(layout());
    formLayout->setWidget(1, QFormLayout::FieldRole, &comboBoxGroup);

@@ -101,6 +101,8 @@ void DlgAddPropertyVarSet::initializeGroup()
    }

    comboBoxGroup.setEditText(QString::fromStdString(groupNamesSorted[0]));
+    connComboBoxGroup = connect(&comboBoxGroup, &EditFinishedComboBox::editFinished,
+                                this, &DlgAddPropertyVarSet::onEditFinished);
 }

 void DlgAddPropertyVarSet::getSupportedTypes(std::vector<Base::Type>& types)
@@ -140,8 +142,8 @@ void DlgAddPropertyVarSet::initializeTypes()
    ui->comboBoxType->setCompleter(&completerType);
    ui->comboBoxType->setInsertPolicy(QComboBox::NoInsert);

-    connect(ui->comboBoxType, &QComboBox::currentTextChanged,
-            this, &DlgAddPropertyVarSet::onEditFinished);
+    connComboBoxType = connect(ui->comboBoxType, &QComboBox::currentTextChanged,
+                               this, &DlgAddPropertyVarSet::onEditFinished);
 }

 /*
@@ -167,9 +169,9 @@ void DlgAddPropertyVarSet::initializeWidgets(ViewProviderVarSet* viewProvider)

    connect(this, &QDialog::finished,
            this, [viewProvider](int result) { viewProvider->onFinished(result); });
-    connect(ui->lineEditName, &QLineEdit::editingFinished,
-            this, &DlgAddPropertyVarSet::onEditFinished);
-    connect(ui->lineEditName, &QLineEdit::textChanged,
+    connLineEditNameEditFinished = connect(ui->lineEditName, &QLineEdit::editingFinished,
+                                           this, &DlgAddPropertyVarSet::onEditFinished);
+    connLineEditNameTextChanged = connect(ui->lineEditName, &QLineEdit::textChanged,
            this, &DlgAddPropertyVarSet::onNamePropertyChanged);

    std::string title = "Add a property to " + varSet->getFullName();
@@ -200,6 +202,7 @@ void DlgAddPropertyVarSet::clearEditors(bool clearName)
        ui->lineEditName->blockSignals(beforeBlocked);
    }
    removeEditor();
+    ui->lineEditToolTip->clear();
    setOkEnabled(false);
    namePropertyToAdd.clear();
 }
@@ -260,19 +263,19 @@ void DlgAddPropertyVarSet::createProperty()
    std::string name = ui->lineEditName->text().toStdString();
    std::string group = comboBoxGroup.currentText().toStdString();
    std::string type = ui->comboBoxType->currentText().toStdString();
+    std::string doc = ui->lineEditToolTip->text().toStdString();

    App::Property* prop;
    try {
        prop = varSet->addDynamicProperty(type.c_str(), name.c_str(),
-                                          group.c_str());
+                                          group.c_str(), doc.c_str());
    }
    catch (Base::Exception& e) {
        e.ReportException();
-        QMessageBox::critical(this,
-                              QObject::tr("Add property"),
-                              QObject::tr("Failed to add property to '%1': %2").arg(
-                                      QString::fromLatin1(varSet->getFullName().c_str()),
-                                      QString::fromUtf8(e.what())));
+        critical(QObject::tr("Add property"),
+                 QObject::tr("Failed to add property to '%1': %2").arg(
+                         QString::fromLatin1(varSet->getFullName().c_str()),
+                         QString::fromUtf8(e.what())));
        clearEditors();
        return;
    }
@@ -293,6 +296,17 @@ void DlgAddPropertyVarSet::createProperty()
    setOkEnabled(true);
 }

+App::Property* DlgAddPropertyVarSet::getPropertyToAdd() {
+    // This function should be called only if it is certain the property exists.
+    // It will throw a runtime error if not.
+    App::Property* prop = varSet->getPropertyByName(namePropertyToAdd.c_str());
+    if (prop == nullptr) {
+        FC_THROWM(Base::RuntimeError, "A property with name '" << namePropertyToAdd << "' does not exist.");
+    }
+
+    return prop;
+}
+
 void DlgAddPropertyVarSet::changePropertyToAdd() {
    // we were already adding a new property, the only option to get here
    // is a change of type or group.
@@ -300,11 +314,13 @@ void DlgAddPropertyVarSet::changePropertyToAdd() {
    std::string name = ui->lineEditName->text().toStdString();
    assert(name == namePropertyToAdd);

-    App::Property* prop = varSet->getPropertyByName(namePropertyToAdd.c_str());
+    // performs a check for nullptr
+    App::Property* prop = getPropertyToAdd();

    std::string group = comboBoxGroup.currentText().toStdString();
+    std::string doc = ui->lineEditToolTip->text().toStdString();
    if (prop->getGroup() != group) {
-        varSet->changeDynamicProperty(prop, group.c_str(), nullptr);
+        varSet->changeDynamicProperty(prop, group.c_str(), doc.c_str());
    }

    std::string type = ui->comboBoxType->currentText().toStdString();
@@ -316,13 +332,40 @@ void DlgAddPropertyVarSet::changePropertyToAdd() {
 }


+/* We use these functions rather than the functions provided by App::Document
+ * because this dialog may be opened when another transaction is in progress.
+ * An example is opening a sketch.  If this dialog uses the functions provided
+ * by App::Document, a reject of the dialog would close that transaction.  By
+ * checking whether the transaction ID is "our" transaction ID, we prevent this
+ * behavior.
+ */
+void DlgAddPropertyVarSet::openTransaction()
+{
+    transactionID = App::GetApplication().setActiveTransaction("Add property VarSet");
+}
+
+
+bool DlgAddPropertyVarSet::hasPendingTransaction()
+{
+    return transactionID != 0;
+}
+
+
+void DlgAddPropertyVarSet::closeTransaction(bool abort)
+{
+    if (transactionID != 0) {
+        App::GetApplication().closeActiveTransaction(abort, transactionID);
+        transactionID = 0;
+    }
+}
+
+
 void DlgAddPropertyVarSet::clearCurrentProperty()
 {
    removeEditor();
    varSet->removeDynamicProperty(namePropertyToAdd.c_str());
-    App::Document* doc = varSet->getDocument();
-    if (doc->hasPendingTransaction()) {
-        doc->abortTransaction();
+    if (hasPendingTransaction()) {
+        closeTransaction(ABORT);
    }
    setOkEnabled(false);
    namePropertyToAdd.clear();
@@ -343,10 +386,16 @@ private:
 void DlgAddPropertyVarSet::checkName() {
    std::string name = ui->lineEditName->text().toStdString();
    if(name.empty() || name != Base::Tools::getIdentifier(name)) {
-        QMessageBox::critical(getMainWindow(),
-                              QObject::tr("Invalid name"),
-                              QObject::tr("The property name must only contain alpha numericals,\n"
-                                          "underscore, and must not start with a digit."));
+        critical(QObject::tr("Invalid name"),
+                 QObject::tr("The property name must only contain alpha numericals,\n"
+                             "underscore, and must not start with a digit."));
+        clearEditors(!CLEAR_NAME);
+        throw CreatePropertyException("Invalid name");
+    }
+
+    if(App::ExpressionParser::isTokenAUnit(name) || App::ExpressionParser::isTokenAConstant(name)) {
+        critical(QObject::tr("Invalid name"),
+                 QObject::tr("The property name is a reserved word."));
        clearEditors(!CLEAR_NAME);
        throw CreatePropertyException("Invalid name");
    }
@@ -355,11 +404,10 @@ void DlgAddPropertyVarSet::checkName() {
        // we are adding a new property, check whether it doesn't already exist
        auto prop = varSet->getPropertyByName(name.c_str());
        if(prop && prop->getContainer() == varSet) {
-            QMessageBox::critical(this,
-                                  QObject::tr("Invalid name"),
-                                  QObject::tr("The property '%1' already exists in '%2'").arg(
-                                          QString::fromLatin1(name.c_str()),
-                                          QString::fromLatin1(varSet->getFullName().c_str())));
+            critical(QObject::tr("Invalid name"),
+                     QObject::tr("The property '%1' already exists in '%2'").arg(
+                             QString::fromLatin1(name.c_str()),
+                             QString::fromLatin1(varSet->getFullName().c_str())));
            clearEditors(!CLEAR_NAME);
            throw CreatePropertyException("Invalid name");
        }
@@ -370,10 +418,9 @@ void DlgAddPropertyVarSet::checkGroup() {
    std::string group = comboBoxGroup.currentText().toStdString();

    if (group.empty() || group != Base::Tools::getIdentifier(group)) {
-        QMessageBox::critical(this,
-            QObject::tr("Invalid name"),
-            QObject::tr("The group name must only contain alpha numericals,\n"
-                        "underscore, and must not start with a digit."));
+        critical(QObject::tr("Invalid name"),
+                 QObject::tr("The group name must only contain alpha numericals,\n"
+                             "underscore, and must not start with a digit."));
        comboBoxGroup.setEditText(QString::fromUtf8("Base"));
        throw CreatePropertyException("Invalid name");
    }
@@ -401,6 +448,7 @@ void DlgAddPropertyVarSet::onEditFinished() {
        checkName();
        checkGroup();
        checkType();
+        // no check for tooltip, we accept any string
    }
    catch (const CreatePropertyException&) {
        if (!namePropertyToAdd.empty()) {
@@ -411,8 +459,7 @@ void DlgAddPropertyVarSet::onEditFinished() {

    if (namePropertyToAdd.empty()) {
        // we are adding a new property
-        App::Document* doc = varSet->getDocument();
-        doc->openTransaction("Add property VarSet");
+        openTransaction();
        createProperty();
    }
    else {
@@ -430,6 +477,15 @@ void DlgAddPropertyVarSet::onNamePropertyChanged(const QString& text)
    }
 }

+void DlgAddPropertyVarSet::critical(const QString& title, const QString& text) {
+    static bool criticalDialogShown = false;
+    if (!criticalDialogShown) {
+        criticalDialogShown = true;
+        QMessageBox::critical(this, title, text);
+        criticalDialogShown = false;
+    }
+}
+
 void DlgAddPropertyVarSet::valueChanged()
 {
    QVariant data;
@@ -437,14 +493,34 @@ void DlgAddPropertyVarSet::valueChanged()
    propertyItem->setData(data);
 }

+void DlgAddPropertyVarSet::addDocumentation() {
+    /* Add the documentation to an existing property.
+     * Note that this method assumes the property exists.
+     *
+     * Since there is no check on documentation (we accept any string), there
+     * is no signal handler for the documentation field.  This method updates
+     * the property that is being added with the text inserted as
+     * documentation/tooltip.
+     *
+     * This function should be called at a late stage, before doing the accept.
+     */
+
+    std::string group = comboBoxGroup.currentText().toStdString();
+    std::string doc = ui->lineEditToolTip->text().toStdString();
+
+    // performs a check for nullptr
+    App::Property* prop = getPropertyToAdd();
+    varSet->changeDynamicProperty(prop, group.c_str(), doc.c_str());
+}
+
 void DlgAddPropertyVarSet::accept()
 {
-    App::Document* doc = varSet->getDocument();
-    doc->commitTransaction();
+    addDocumentation();
+    closeTransaction(COMMIT);

    if (ui->checkBoxAdd->isChecked()) {
        clearEditors();
-        doc->openTransaction();
+        openTransaction();
        ui->lineEditName->setFocus();
        return;
    }
@@ -460,10 +536,19 @@ void DlgAddPropertyVarSet::accept()

 void DlgAddPropertyVarSet::reject()
 {
-    App::Document* doc = varSet->getDocument();
+    // On reject we can disconnect the signal handlers because nothing useful
+    // is to be done.  Otherwise, signals may activate the handlers that assume
+    // that a new property has been created, an assumption that will be
+    // violated by aborting the transaction because it will remove the newly
+    // created property.
+    disconnect(connComboBoxGroup);
+    disconnect(connComboBoxType);
+    disconnect(connLineEditNameEditFinished);
+    disconnect(connLineEditNameTextChanged);
+
    // a transaction is not pending if a name has not been determined.
-    if (doc->hasPendingTransaction()) {
-        doc->abortTransaction();
+    if (hasPendingTransaction()) {
+        closeTransaction(ABORT);
    }
    QDialog::reject();
 }
@@ -42,14 +42,21 @@ namespace Dialog {
 class EditFinishedComboBox : public QComboBox {
    Q_OBJECT
 public:
-    explicit EditFinishedComboBox(QWidget *parent = nullptr) : QComboBox(parent) {}
+    explicit EditFinishedComboBox(QWidget *parent = nullptr) : QComboBox(parent) {
+        setEditable(true);
+        connect(this, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditFinishedComboBox::onIndexChanged);
+        connect(this->lineEdit(), &QLineEdit::editingFinished, this, &EditFinishedComboBox::onEditingFinished);
+    }

 Q_SIGNALS:
    void editFinished();

-protected:
-    void focusOutEvent(QFocusEvent *event) override {
-        QComboBox::focusOutEvent(event);
+private:
+    void onEditingFinished() {
+        Q_EMIT editFinished();
+    }
+
+    void onIndexChanged() {
        Q_EMIT editFinished();
    }
 };
@@ -89,13 +96,21 @@ private:
    void createProperty();
    void changePropertyToAdd();

+    void openTransaction();
+    bool hasPendingTransaction();
+    void abortTransaction();
+    void closeTransaction(bool abort);
+
    void checkName();
    void checkGroup();
    void checkType();
    void onEditFinished();
    void onNamePropertyChanged(const QString& text);
+    void critical(const QString& title, const QString& text);

    void getSupportedTypes(std::vector<Base::Type>& types);
+    App::Property* getPropertyToAdd();
+    void addDocumentation();

 private:
    std::unordered_set<std::string> typesWithoutEditor = {
@@ -117,6 +132,15 @@ private:
    std::string namePropertyToAdd;
    std::unique_ptr<PropertyEditor::PropertyItem> propertyItem;
    std::unique_ptr<App::ObjectIdentifier> objectIdentifier;
+
+    // a transactionID of 0 means that there is no active transaction.
+    int transactionID;
+
+    // connections
+    QMetaObject::Connection connComboBoxGroup;
+    QMetaObject::Connection connComboBoxType;
+    QMetaObject::Connection connLineEditNameEditFinished;
+    QMetaObject::Connection connLineEditNameTextChanged;
 };

 } // namespace Dialog
@@ -118,6 +118,15 @@ DlgExpressionInput::DlgExpressionInput(const App::ObjectIdentifier & _path,

 DlgExpressionInput::~DlgExpressionInput()
 {
+    disconnect(ui->checkBoxVarSets, &QCheckBox::stateChanged,
+               this, &DlgExpressionInput::onCheckVarSets);
+    disconnect(ui->comboBoxVarSet, qOverload<int>(&QComboBox::currentIndexChanged),
+               this, &DlgExpressionInput::onVarSetSelected);
+    disconnect(ui->lineEditGroup, &QLineEdit::textChanged,
+               this, &DlgExpressionInput::onTextChangedGroup);
+    disconnect(ui->lineEditPropNew, &QLineEdit::textChanged,
+               this, &DlgExpressionInput::namePropChanged);
+
    delete ui;
 }

@@ -428,6 +437,11 @@ static bool isNamePropOk(const QString& nameProp, App::DocumentObject* obj,
        return false;
    }

+    if (ExpressionParser::isTokenAUnit(name) || ExpressionParser::isTokenAConstant(name)) {
+        message << name << " is a reserved word";
+        return false;
+    }
+
    auto prop = obj->getPropertyByName(name.c_str());
    if (prop && prop->getContainer() == obj) {
        message << name << " already exists";
@@ -28,6 +28,7 @@
 #include <QComboBox>
 #include <QSignalBlocker>
 #include <QTextStream>
+#include <QTimer>
 #endif

 #include <App/Document.h>
@@ -45,6 +46,8 @@
 #include "Macro.h"
 #include "MainWindow.h"
 #include "PythonEditor.h"
+#include "Workbench.h"
+#include "WorkbenchManager.h"


 using namespace Gui;
@@ -757,7 +760,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
     **/

    QString instructions2 =
-        tr("Walkthrough instructions: Click right arrow button (->), then Close.");
+        tr("Walkthrough instructions: Select macro from list, then click right arrow button (->), then Close.");
    auto workbenchBox =
        setupToolbarPage->findChild<QComboBox*>(QString::fromLatin1("workbenchBox"));
    if (!workbenchBox) {
@@ -769,10 +772,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
        int globalIdx = workbenchBox->findData(QString::fromLatin1("Global"));
        if (globalIdx != -1) {
            workbenchBox->setCurrentIndex(globalIdx);
-            QMetaObject::invokeMethod(setupToolbarPage,
-                                      "on_workbenchBox_activated",
-                                      Qt::DirectConnection,
-                                      Q_ARG(int, globalIdx));
+            setupToolbarPage->activateWorkbenchBox(globalIdx);
        }
        else {
            Base::Console().Warning("Toolbar walkthrough: Unable to find Global workbench\n");
@@ -786,7 +786,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
            }
            else {
                newButton->setStyleSheet(QString::fromLatin1("color:red"));
-                instructions2 = tr("Walkthrough instructions: Click New, then right arrow (->) "
+                instructions2 = tr("Walkthrough instructions: Click New, select macro, then right arrow (->) "
                                   "button, then Close.");
            }
        }
@@ -812,10 +812,6 @@ Note: your changes will be applied when you next switch workbenches\n"));
        int macrosIdx = categoryBox->findText(tr("Macros"));
        if (macrosIdx != -1) {
            categoryBox->setCurrentIndex(macrosIdx);
-            QMetaObject::invokeMethod(setupToolbarPage,
-                                      "on_categoryBox_activated",
-                                      Qt::DirectConnection,
-                                      Q_ARG(int, macrosIdx));
        }
        else {
            Base::Console().Warning("Toolbar walkthrough: Unable to find Macros in categoryBox\n");
@@ -832,31 +828,39 @@ Note: your changes will be applied when you next switch workbenches\n"));
        toolbarTreeWidget->expandAll();
    }

-    /** preselect macro command for user **/
-
-    auto commandTreeWidget =
-        setupToolbarPage->findChild<QTreeWidget*>(QString::fromLatin1("commandTreeWidget"));
-    if (!commandTreeWidget) {
-        Base::Console().Warning("Toolbar walkthrough: Unable to find commandTreeWidget\n");
-    }
-    else {
-        if (!hasMacroCommand) {  // will be the last in the list, the one just created
-            commandTreeWidget->setCurrentItem(
-                commandTreeWidget->topLevelItem(commandTreeWidget->topLevelItemCount() - 1));
-            commandTreeWidget->scrollToItem(commandTreeWidget->currentItem());
+    /** preselect macro command for user after a short delay to allow time for the
+     tree widget to populate all the actions
+     **/
+    QTimer::singleShot(500, [=]() {
+        auto commandTreeWidget =
+            setupToolbarPage->findChild<QTreeWidget*>(QString::fromLatin1("commandTreeWidget"));
+        if (!commandTreeWidget) {
+            Base::Console().Warning("Toolbar walkthrough: Unable to find commandTreeWidget\n");
        }
-        else {  // pre-select it for the user (will be the macro menu text)
-            QList<QTreeWidgetItem*> items =
-                commandTreeWidget->findItems(macroMenuText,
-                                             Qt::MatchFixedString | Qt::MatchWrap,
-                                             1);
-            if (!items.empty()) {
-                commandTreeWidget->setCurrentItem(items[0]);
+        else {
+            if (!hasMacroCommand) {  // will be the last in the list, the one just created
+                commandTreeWidget->setCurrentItem(
+                    commandTreeWidget->topLevelItem(commandTreeWidget->topLevelItemCount() - 1));
                commandTreeWidget->scrollToItem(commandTreeWidget->currentItem());
            }
+            else {  // pre-select it for the user (will be the macro menu text)
+                QList<QTreeWidgetItem*> items =
+                    commandTreeWidget->findItems(macroMenuText,
+                                                 Qt::MatchFixedString | Qt::MatchWrap,
+                                                 1);
+                if (!items.empty()) {
+                    commandTreeWidget->setCurrentItem(items[0]);
+                    commandTreeWidget->scrollToItem(commandTreeWidget->currentItem());
+                }
+            }
        }
-    }
+    });
    dlg.exec();
+    // refresh toolbar so new icon shows up immediately
+    Workbench* active = Gui::WorkbenchManager::instance()->active();
+    if (active) {
+        active->activate();
+    }
 }


@@ -172,6 +172,11 @@ void DlgCustomToolbars::hideEvent(QHideEvent* event)
 void DlgCustomToolbars::onActivateCategoryBox()
 {}

+// called from DlgMacroExecuteImp toolbar walkthrough function
+void DlgCustomToolbars::activateWorkbenchBox(int index) {
+    onWorkbenchBoxActivated(index);
+}
+
 void DlgCustomToolbars::onWorkbenchBoxActivated(int index)
 {
    QVariant data = ui->workbenchBox->itemData(index, Qt::UserRole);
@@ -52,6 +52,9 @@ protected:
    explicit DlgCustomToolbars(Type, QWidget* parent = nullptr);
    ~DlgCustomToolbars() override;

+public:
+    void activateWorkbenchBox(int index);  // Public accessor for DlgMacroExecuteImp
+
 protected:
    void setupConnections();
    void onWorkbenchBoxActivated(int index);
--- a/Show More
+++ b/Show More