Merge branch 'master' into stateful-c-lib

Author: vespakoen

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### System information
 
-- **SolveSpace version:** <!--e.g. 3.0~3dd2fc00; go to Help → About...-->
+- **SolveSpace version:** <!--e.g. 3.1~70bde63c; go to Help → About… / SolveSpace → About SolveSpace (macOS)-->
 - **Operating system:** <!--e.g. Debian testing-->
 
 ### Expected behavior

.github/scripts/install-macos.sh

@@ -1,8 +1,8 @@
 #!/bin/sh -xe
 
 if [ "$1" = "ci" ]; then
-    armloc=$(brew fetch --bottle-tag=arm64_big_sur libomp | grep -i downloaded | grep tar.gz | cut -f2 -d:)
-    x64loc=$(brew fetch --bottle-tag=big_sur libomp | grep -i downloaded | grep tar.gz | cut -f2 -d:)
+    armloc=$(brew fetch --bottle-tag=arm64_ventura libomp | grep -i downloaded | grep tar.gz | cut -f2 -d:)
+    x64loc=$(brew fetch --bottle-tag=ventura libomp | grep -i downloaded | grep tar.gz | cut -f2 -d:)
     cp $armloc /tmp/libomp-arm64.tar.gz
     mkdir /tmp/libomp-arm64 || true
     tar -xzvf /tmp/libomp-arm64.tar.gz -C /tmp/libomp-arm64

.github/scripts/sign-macos.sh

@@ -58,34 +58,29 @@ hdiutil create -srcfolder "${app}" "${dmg}"
 # sign the .dmg
 codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${dmg}"
 
-# notarize and store request uuid in variable
-notarize_uuid=$(xcrun altool --notarize-app --primary-bundle-id "${bundle_id}" --username "${MACOS_APPSTORE_USERNAME}" --password "${MACOS_APPSTORE_APP_PASSWORD}" --file "${dmg}" 2>&1 | grep RequestUUID | awk '{print $3'})
-
-echo $notarize_uuid
-
-# wait a bit so we don't get errors during checking
-sleep 10
-
-success=0
-for (( ; ; ))
-do
-    echo "Checking progress..."
-    progress=$(xcrun altool --notarization-info "${notarize_uuid}" -u "${MACOS_APPSTORE_USERNAME}" -p "${MACOS_APPSTORE_APP_PASSWORD}" 2>&1)
-    # echo "${progress}"
-
-    if [ $? -ne 0 ] || [[  "${progress}" =~ "Invalid" ]] ; then
-        echo "Error with notarization. Exiting"
-        break
-    fi
-
-    if [[  "${progress}" =~ "success" ]]; then
-        success=1
-        break
-    else
-        echo "Not completed yet. Sleeping for 10 seconds"
-    fi
-    sleep 10
-done
+if ! command -v xcrun >/dev/null || ! xcrun --find notarytool >/dev/null; then
+    echo "Notarytool is not present in the system. Notarization has failed."
+    exit 1
+fi
+
+# Submit the package for notarization
+notarization_output=$(
+    xcrun notarytool submit "${dmg}" \
+        --apple-id "hello@koenschmeets.nl" \
+        --password "${MACOS_APPSTORE_APP_PASSWORD}" \
+        --team-id "8X77K9NDG3" \
+        --wait 2>&1)
+
+if [ $? -eq 0 ]; then
+    # Extract the operation ID from the output
+    operation_id=$(echo "$notarization_output" | awk '/RequestUUID/ {print $NF}')
+    echo "Notarization submitted. Operation ID: $operation_id"
+    exit 0
+  else
+    echo "Notarization failed. Error: $notarization_output"
+    exit 1
+  fi
+fi
 
 # staple
 xcrun stapler staple "${dmg}"

.github/workflows/cd.yml

@@ -12,17 +12,19 @@ jobs:
   cancel_previous_runs:
     runs-on: ubuntu-latest
     name: Cancel Previous Runs
+    permissions:
+      actions: write
     steps:
-    - uses: styfle/cancel-workflow-action@0.8.0
+    - uses: styfle/cancel-workflow-action@0.12.1
       with:
         access_token: ${{ github.token }}
 
   test_ubuntu:
     needs: [cancel_previous_runs]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Test Ubuntu
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: .github/scripts/install-ubuntu.sh
     - name: Build & Test
@@ -33,7 +35,7 @@ jobs:
     runs-on: windows-2019
     name: Test Windows
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: .github/scripts/install-windows.sh
       shell: bash
@@ -43,10 +45,10 @@ jobs:
 
   test_macos:
     needs: [cancel_previous_runs]
-    runs-on: macos-10.15
+    runs-on: macos-latest
     name: Test macOS
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: .github/scripts/install-macos.sh ci
     - name: Build & Test
@@ -57,15 +59,15 @@ jobs:
     name: Build Release Windows
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: .github/scripts/install-windows.sh
         shell: bash
       - name: Build & Test
         run: .github/scripts/build-windows.sh release
         shell: bash
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows
           path: build/bin/RelWithDebInfo/solvespace.exe
@@ -75,25 +77,25 @@ jobs:
     name: Build Release Windows (OpenMP)
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: .github/scripts/install-windows.sh
         shell: bash
       - name: Build & Test
         run: .github/scripts/build-windows.sh release openmp
         shell: bash
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-openmp
           path: build/bin/RelWithDebInfo/solvespace-openmp.exe
 
   build_release_macos:
     needs: [test_ubuntu, test_windows, test_macos]
     name: Build Release macOS
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: .github/scripts/install-macos.sh ci
     - name: Build & Test
@@ -107,41 +109,41 @@ jobs:
         MACOS_APPSTORE_USERNAME: ${{ secrets.MACOS_APPSTORE_USERNAME }}
         MACOS_DEVELOPER_ID: ${{ secrets.MACOS_DEVELOPER_ID }}
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: macos
         path: build/bin/SolveSpace.dmg
 
-  deploy_snap_amd64:
-    needs: [test_ubuntu, test_windows, test_macos]
-    name: Deploy AMD64 Snap
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Fetch Tags
-      run: git fetch --force --tags
-    - name: Set Up Source
-      run: rsync --filter=":- .gitignore" -r ./ pkg/snap/solvespace-snap-src
-    - name: Build Snap
-      uses: snapcore/action-build@v1
-      id: build
-      with:
-        path: pkg/snap
-    - name: Upload & Release to Edge
-      if: github.event_name == 'push'
-      uses: snapcore/action-publish@v1
-      env:
-        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPSTORE_LOGIN }}
-      with:
-        snap: ${{ steps.build.outputs.snap }}
-        release: edge
-    - name: Upload & Release to Beta + Edge
-      if: github.event_name == 'release'
-      uses: snapcore/action-publish@v1
-      with:
-        store_login: ${{ secrets.SNAPSTORE_LOGIN }}
-        snap: ${{ steps.build.outputs.snap }}
-        release: edge,beta
+  # deploy_snap_amd64:
+  #   needs: [test_ubuntu, test_windows, test_macos]
+  #   name: Deploy AMD64 Snap
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Fetch Tags
+  #     run: git fetch --force --tags
+  #   - name: Set Up Source
+  #     run: rsync --filter=":- .gitignore" -r ./ pkg/snap/solvespace-snap-src
+  #   - name: Build Snap
+  #     uses: snapcore/action-build@v1
+  #     id: build
+  #     with:
+  #       path: pkg/snap
+  #   - name: Upload & Release to Edge
+  #     if: github.event_name == 'push'
+  #     uses: snapcore/action-publish@v1
+  #     env:
+  #       SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPSTORE_LOGIN }}
+  #     with:
+  #       snap: ${{ steps.build.outputs.snap }}
+  #       release: edge
+  #   - name: Upload & Release to Beta + Edge
+  #     if: github.event_name == 'release'
+  #     uses: snapcore/action-publish@v1
+  #     with:
+  #       store_login: ${{ secrets.SNAPSTORE_LOGIN }}
+  #       snap: ${{ steps.build.outputs.snap }}
+  #       release: edge,beta
 
   upload_release_assets:
     name: Upload Release Assets
@@ -150,7 +152,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download All Workflow Artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
     - name: Get Release Upload URL
       id: get_upload_url
       env:

.github/workflows/source-tarball.yml

@@ -10,7 +10,7 @@ jobs:
     name: Create & Upload Tarball
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
         fetch-depth: 0

.github/workflows/test.yml

@@ -12,10 +12,10 @@ on:
 
 jobs:
   test_ubuntu:
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-latest
       name: Test Ubuntu
       steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: .github/scripts/install-ubuntu.sh
       - name: Build & Test
@@ -25,7 +25,7 @@ jobs:
     runs-on: windows-2019
     name: Test Windows
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: .github/scripts/install-windows.sh
       shell: bash
@@ -34,10 +34,10 @@ jobs:
       shell: bash
 
   test_macos:
-    runs-on: macos-10.15
+    runs-on: macos-latest
     name: Test macOS
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: .github/scripts/install-macos.sh ci
     - name: Build & Test
@@ -50,11 +50,11 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
       options: --privileged
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
-      - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: "solvespace.flatpak"
           manifest-path: "pkg/flatpak/com.solvespace.SolveSpace.json"

CHANGELOG.md

@@ -4,31 +4,69 @@ Changelog
 3.x - development
 ---
 
+Geometric Modelling Kernel (NURBS)
+
+* Improve the difference boolean operations.
+* Extrude groups have a checkbox to allow skewing - 3 DoF for the extrude direction.
+
 Constraints (new and improved):
 
 * Add Parallel and Perpendicular constraints for 2 faces.
 * The equal angle constraint is moved to the `N` shortcut and menu item to allow equal length (`Q`) to be applied to three or four lines.
 
 Allow these constraints to be applied to more entities at once:
+
 * More than two line Segments - equal length.
 * More than two Arcs and/or circles - equal diameter/radius.
 * Any number of Lines - horizontal or vertical.
 * More than two points - horizontal or vertical.
 * Point on face can be applied to a point and 1-3 faces at once.
 * More than two points coincident.
 
+Sketching
+
+* `Image` sketch elements are not copied in 3d groups (extrude, lathe, revolve, helix) by default. `Toggle Construction` for an image to get the old behavior.
+* New option to use radius instead of diameter for circle and arc dimensions.
+* Dimensions on arcs default to radius instead of diameter. Uncheck `use radius` in the Property Browser to get diameters.
+* `Text in True Type Font` elements now support basic kerning. Enable it with `apply kerning` in the Property Browser.
+
 Translations (now in 10 languages!)
+
 * Added Czech  cs_CZ.
 * Added Japanese ja_JP.
-* Update translation for French fr_FR and Russian ru_RU.
+* Update translation for French fr_FR, Russian ru_RU, Chinese zh_CN and Ukrainian uk_UA.
 
-Other:
-* Merged and improved the experimental Emscripten port (web version).
-* Better Flatpack support.
+Other User interface changes:
+
+* `CTRL+Tab` hides/shows the toolbar.
+* Marquee selection of line segments is now precise.
+* Speed up the animation when moving the view, for example when pressing `F2` or `F3`.
+* Pressing ESC while drawing a sketch entity now deletes the entity rather than completing it.
+* `CTRL+Shift+S` shortcut for "Save As..."
+* New option "use camera mouse navigation" for camera (instead of the default model) rotation navigation.
+* Sketches can be displayed with only dimensions visible (the button controlling visibility of constraints in the Property Browser has a new state).
 * More entity types described in the text screens.
+* A new option to `display the full path in the title bar`; or not.
+* Handle smooth scrolling (mouse wheel zoom) on GTK/Linux.
+* The embedded vector font (used for the UI and labels):
+	* now has many new and improved Chinese characters
+	* includes the Greek alphabet
+	* improved "є"
+	* added superscript 5 "⁵"
+	* fiexd crash when typing "£"
+
+Other
+
+* Merged and improved the experimental Web version (Emscripten port).
+* Better Flatpack support.
 * Several bug fixes and usability improvements.
 * Allow 32 bit SolveSpace to access up to 4GB of RAM to allow working on larger projects.
 
+Bug fixes:
+
+* `Paste Transformed` on elements that contain a point-line distance does not flip any more.
+* Fix saving assemblies when opened with a relative path on the command line.
+
 3.1
 ---
 

README.md

@@ -7,7 +7,7 @@
 [![solvespace](https://snapcraft.io/solvespace/trending.svg?name=0)](https://snapcraft.io/solvespace)
 
 This repository contains the source code of [SolveSpace][], a parametric
-2d/3d CAD.
+2d/3d CAD tool.
 
 [solvespace]: https://solvespace.com