Merge branch 'FreeCAD:main' into fontweight

obelisk79 · Feb 12, 2024 · 5b214d7 · 5b214d7
2 parents b612e5f + a1fcb66
commit 5b214d7
Show file tree

Hide file tree

Showing 806 changed files with 150,322 additions and 151,184 deletions.
diff --git a/.github/workflows/sub_buildMacOSCondaApple.yml b/.github/workflows/sub_buildMacOSCondaApple.yml
@@ -68,11 +68,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml

diff --git a/.github/workflows/sub_buildMacOSCondaIntel.yml b/.github/workflows/sub_buildMacOSCondaIntel.yml
@@ -68,11 +68,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml

diff --git a/.github/workflows/sub_buildUbuntu2004.yml b/.github/workflows/sub_buildUbuntu2004.yml
@@ -72,7 +72,7 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install FreeCAD dependencies

diff --git a/.github/workflows/sub_buildUbuntu2204Conda.yml b/.github/workflows/sub_buildUbuntu2204Conda.yml
@@ -66,11 +66,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml

diff --git a/.github/workflows/sub_buildWindowsConda.yml b/.github/workflows/sub_buildWindowsConda.yml
@@ -61,11 +61,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml

diff --git a/.github/workflows/sub_lint.yml b/.github/workflows/sub_lint.yml
@@ -198,7 +198,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Make needed directories, files and initializations

diff --git a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake
@@ -89,9 +89,7 @@ macro(CompilerChecksAndSetups)
             endif()
             add_definitions(-DGL_SILENCE_DEPRECATION)
         elseif (UNIX)
-            if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.9)
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undefined-var-template")
-            endif()
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undefined-var-template")
         endif()
 
         # older boost.preprocessor turn off variadics for clang

diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake
@@ -6,26 +6,29 @@ if (FREECAD_QT_MAJOR_VERSION EQUAL 5)
 elseif (FREECAD_QT_MAJOR_VERSION EQUAL 6)
     set (Qt6Core_MOC_EXECUTABLE Qt6::moc)
 endif()
+
 if(BUILD_GUI)
-    if (FREECAD_QT_MAJOR_VERSION EQUAL 6)
-        list (APPEND FREECAD_QT_COMPONENTS GuiTools)
-        list (APPEND FREECAD_QT_COMPONENTS SvgWidgets)
-    elseif (FREECAD_QT_MAJOR_VERSION EQUAL 5)
+    if (FREECAD_QT_MAJOR_VERSION EQUAL 5)
         if (WIN32)
             list (APPEND FREECAD_QT_COMPONENTS WinExtras)
         endif()
-    endif()
-    list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools)
-    if (FREECAD_QT_MAJOR_VERSION EQUAL 6)
+    elseif (FREECAD_QT_MAJOR_VERSION EQUAL 6)
+        list (APPEND FREECAD_QT_COMPONENTS GuiTools)
+        list (APPEND FREECAD_QT_COMPONENTS SvgWidgets)
         list (APPEND FREECAD_QT_COMPONENTS Core5Compat)
     endif()
+
+    list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools)
+
     if (BUILD_WEB)
         list (APPEND FREECAD_QT_COMPONENTS WebEngineWidgets)
     endif()
+
     if(BUILD_DESIGNER_PLUGIN)
         list (APPEND FREECAD_QT_COMPONENTS Designer)
     endif()
 endif()
+
 if (ENABLE_DEVELOPER_TESTS)
     list (APPEND FREECAD_QT_COMPONENTS Test)
 endif ()
@@ -37,6 +40,7 @@ foreach(COMPONENT IN LISTS FREECAD_QT_COMPONENTS)
     set(Qt${COMPONENT}_FOUND ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_FOUND})
     set(Qt${COMPONENT}_VERSION ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_VERSION})
 endforeach()
+
 set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_AUTOUIC TRUE)
 set(QtCore_MOC_EXECUTABLE ${Qt${FREECAD_QT_MAJOR_VERSION}Core_MOC_EXECUTABLE})
@@ -75,13 +79,13 @@ if (Qt${FREECAD_QT_MAJOR_VERSION}Core_VERSION VERSION_LESS 5.15.0)
 
     # Since Qt 5.15 Q_DISABLE_COPY_MOVE is defined
     set (HAVE_Q_DISABLE_COPY_MOVE 0)
-    configure_file(${CMAKE_SOURCE_DIR}/src/QtCore.h.cmake ${CMAKE_BINARY_DIR}/src/QtCore.h)
 else()
     # Since Qt 5.15 Q_DISABLE_COPY_MOVE is defined
     set (HAVE_Q_DISABLE_COPY_MOVE 1)
-    configure_file(${CMAKE_SOURCE_DIR}/src/QtCore.h.cmake ${CMAKE_BINARY_DIR}/src/QtCore.h)
 endif()
 
+configure_file(${CMAKE_SOURCE_DIR}/src/QtCore.h.cmake ${CMAKE_BINARY_DIR}/src/QtCore.h)
+
 function(qt_find_and_add_translation _qm_files _tr_dir _qm_dir)
     file(GLOB _ts_files ${_tr_dir})
     set_source_files_properties(${_ts_files} PROPERTIES OUTPUT_LOCATION ${_qm_dir})

diff --git a/src/App/FeaturePythonPyImp.h b/src/App/FeaturePythonPyImp.h
@@ -45,7 +45,9 @@
         virtual ~_class_(); \
     };
 
-#if PY_VERSION_HEX >= 0x03090000
+#if PY_VERSION_HEX >= 0x030c0000
+#define PYTHON_TYPE_SLOTS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+#elif PY_VERSION_HEX >= 0x03090000
 #define PYTHON_TYPE_SLOTS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 #elif PY_VERSION_HEX >= 0x03080000
 #define PYTHON_TYPE_SLOTS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

diff --git a/src/App/FeaturePythonPyImp.inl b/src/App/FeaturePythonPyImp.inl
@@ -84,6 +84,9 @@ PyTypeObject FeaturePythonPyT<FeaturePyT>::Type = {
     nullptr                                           /*tp_finalize */
 #if PY_VERSION_HEX >= 0x03080000
     ,0                                                /*tp_vectorcall */
+#if PY_VERSION_HEX >= 0x030c0000
+    ,0                                                /*tp_watched */
+#endif
 #endif
 };
 

diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp
@@ -170,6 +170,9 @@ static PyTypeObject PyBaseProxyType = {
     nullptr                                                 /*tp_finalize */
 #if PY_VERSION_HEX >= 0x03090000
     ,0                                            //NOLINT  /*tp_vectorcall */
+#if PY_VERSION_HEX >= 0x030c0000
+    ,0                                                      /*tp_watched */
+#endif
 #elif PY_VERSION_HEX >= 0x03080000
     ,0                                                      /*tp_vectorcall */
     /* bpo-37250: kept for backwards compatibility in CPython 3.8 only */
@@ -235,6 +238,9 @@ PyTypeObject PyObjectBase::Type = {
     nullptr                                                 /*tp_finalize */
 #if PY_VERSION_HEX >= 0x03090000
     ,0                                            //NOLINT  /*tp_vectorcall */
+#if PY_VERSION_HEX >= 0x030c0000
+    ,0                                                      /*tp_watched */
+#endif
 #elif PY_VERSION_HEX >= 0x03080000
     ,0                                                      /*tp_vectorcall */
     /* bpo-37250: kept for backwards compatibility in CPython 3.8 only */

diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp
@@ -28,6 +28,7 @@
 #include <array>
 #endif
 
+#include <Base/Tools.h>
 #include "Quantity.h"
 #include "Exception.h"
 #include "UnitsApi.h"
@@ -255,6 +256,8 @@ QString Quantity::getSafeUserString() const
             retString = QStringLiteral("%1 %2").arg(this->myValue).arg(this->getUnit().getString());
         }
     }
+    retString =
+        QString::fromStdString(Base::Tools::escapeQuotesFromString(retString.toStdString()));
     return retString;
 }
 

diff --git a/src/Base/Resources/translations/Base.ts b/src/Base/Resources/translations/Base.ts
@@ -5,12 +5,12 @@
     <name>UnitsApi</name>
     <message>
         <location filename="../../UnitsApi.cpp" line="69"/>
-        <source>Standard (mm, kg, s, degree)</source>
+        <source>Standard (mm, kg, s, °)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../UnitsApi.cpp" line="71"/>
-        <source>MKS (m, kg, s, degree)</source>
+        <source>MKS (m, kg, s, °)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -40,7 +40,7 @@
     </message>
     <message>
         <location filename="../../UnitsApi.cpp" line="83"/>
-        <source>Imperial for Civil Eng (ft, ft/sec)</source>
+        <source>Imperial for Civil Eng (ft, ft/s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/src/Base/Resources/translations/Base_be.ts b/src/Base/Resources/translations/Base_be.ts
@@ -5,13 +5,13 @@
     <name>UnitsApi</name>
     <message>
       <location filename="../../UnitsApi.cpp" line="69"/>
-      <source>Standard (mm, kg, s, degree)</source>
-      <translation>Стандартная (мм, кг, с, градус)</translation>
+      <source>Standard (mm, kg, s, °)</source>
+      <translation type="unfinished">Standard (mm, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="71"/>
-      <source>MKS (m, kg, s, degree)</source>
-      <translation>Сістэма МКС (м, кг, с, градус)</translation>
+      <source>MKS (m, kg, s, °)</source>
+      <translation type="unfinished">MKS (m, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="73"/>
@@ -40,8 +40,8 @@
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="83"/>
-      <source>Imperial for Civil Eng (ft, ft/sec)</source>
-      <translation>Брытанская для грамадскіх інжынераў (футы, футы/с)</translation>
+      <source>Imperial for Civil Eng (ft, ft/s)</source>
+      <translation type="unfinished">Imperial for Civil Eng (ft, ft/s)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="85"/>

diff --git a/src/Base/Resources/translations/Base_ca.ts b/src/Base/Resources/translations/Base_ca.ts
@@ -5,13 +5,13 @@
     <name>UnitsApi</name>
     <message>
       <location filename="../../UnitsApi.cpp" line="69"/>
-      <source>Standard (mm, kg, s, degree)</source>
-      <translation type="unfinished">Standard (mm, kg, s, degree)</translation>
+      <source>Standard (mm, kg, s, °)</source>
+      <translation type="unfinished">Standard (mm, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="71"/>
-      <source>MKS (m, kg, s, degree)</source>
-      <translation type="unfinished">MKS (m, kg, s, degree)</translation>
+      <source>MKS (m, kg, s, °)</source>
+      <translation type="unfinished">MKS (m, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="73"/>
@@ -40,8 +40,8 @@
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="83"/>
-      <source>Imperial for Civil Eng (ft, ft/sec)</source>
-      <translation type="unfinished">Imperial for Civil Eng (ft, ft/sec)</translation>
+      <source>Imperial for Civil Eng (ft, ft/s)</source>
+      <translation type="unfinished">Imperial for Civil Eng (ft, ft/s)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="85"/>

diff --git a/src/Base/Resources/translations/Base_cs.ts b/src/Base/Resources/translations/Base_cs.ts
@@ -5,13 +5,13 @@
     <name>UnitsApi</name>
     <message>
       <location filename="../../UnitsApi.cpp" line="69"/>
-      <source>Standard (mm, kg, s, degree)</source>
-      <translation>Standardní (mm, kg, s, stupeň)</translation>
+      <source>Standard (mm, kg, s, °)</source>
+      <translation type="unfinished">Standard (mm, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="71"/>
-      <source>MKS (m, kg, s, degree)</source>
-      <translation>MKS (m, kg, s, stupeň)</translation>
+      <source>MKS (m, kg, s, °)</source>
+      <translation type="unfinished">MKS (m, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="73"/>
@@ -40,8 +40,8 @@
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="83"/>
-      <source>Imperial for Civil Eng (ft, ft/sec)</source>
-      <translation>Imperiální pro stavebnictví (ft, ft/sec)</translation>
+      <source>Imperial for Civil Eng (ft, ft/s)</source>
+      <translation type="unfinished">Imperial for Civil Eng (ft, ft/s)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="85"/>

diff --git a/src/Base/Resources/translations/Base_de.ts b/src/Base/Resources/translations/Base_de.ts
@@ -5,13 +5,13 @@
     <name>UnitsApi</name>
     <message>
       <location filename="../../UnitsApi.cpp" line="69"/>
-      <source>Standard (mm, kg, s, degree)</source>
-      <translation>Standard (mm, kg, s, Grad)</translation>
+      <source>Standard (mm, kg, s, °)</source>
+      <translation type="unfinished">Standard (mm, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="71"/>
-      <source>MKS (m, kg, s, degree)</source>
-      <translation>MKS (m, kg, s, Grad)</translation>
+      <source>MKS (m, kg, s, °)</source>
+      <translation type="unfinished">MKS (m, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="73"/>
@@ -40,8 +40,8 @@
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="83"/>
-      <source>Imperial for Civil Eng (ft, ft/sec)</source>
-      <translation>Angloamerikanisch für Bauwesen (ft, ft/sec)</translation>
+      <source>Imperial for Civil Eng (ft, ft/s)</source>
+      <translation type="unfinished">Imperial for Civil Eng (ft, ft/s)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="85"/>

diff --git a/src/Base/Resources/translations/Base_el.ts b/src/Base/Resources/translations/Base_el.ts
@@ -5,13 +5,13 @@
     <name>UnitsApi</name>
     <message>
       <location filename="../../UnitsApi.cpp" line="69"/>
-      <source>Standard (mm, kg, s, degree)</source>
-      <translation>Στάνταρ (mm, kg, s, μοίρες)</translation>
+      <source>Standard (mm, kg, s, °)</source>
+      <translation type="unfinished">Standard (mm, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="71"/>
-      <source>MKS (m, kg, s, degree)</source>
-      <translation>MKS (m, kg, s, μοίρες)</translation>
+      <source>MKS (m, kg, s, °)</source>
+      <translation type="unfinished">MKS (m, kg, s, °)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="73"/>
@@ -40,8 +40,8 @@
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="83"/>
-      <source>Imperial for Civil Eng (ft, ft/sec)</source>
-      <translation>Αγγλοσαξονικό σύστημά (Πόδια ft, ft/sec)</translation>
+      <source>Imperial for Civil Eng (ft, ft/s)</source>
+      <translation type="unfinished">Imperial for Civil Eng (ft, ft/s)</translation>
     </message>
     <message>
       <location filename="../../UnitsApi.cpp" line="85"/>