Merge branch 'master' into parallaxe_movement

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,66 @@
+name: "🐛 Bug Report"
+description: Create a new ticket for a bug.
+title: "🐛 [BUG] - <title>"
+labels: [
+  "Bug"
+]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: "Description"
+      description: A brief overview of your issue
+      placeholder: When I use the paint bucket in a vector layer everything goes red
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+        label: "Expected result"
+        description: Explain how the function should behave in the context you're using it.
+        placeholder: I expected that the paint bucket filled everything red on the vector layer
+    validations:
+        required: true
+  - type: textarea
+    id: actual
+    attributes:
+        label: "Actual result"
+        description: Explain what you actually got and how different it is from your expectations.
+        placeholder: The paint bucket only changed the color of the stroke
+    validations:
+        required: true
+  - type: textarea
+    id: reprod
+    attributes:
+      label: "Steps to reproduce"
+      description: Describe the exact steps to reproduce the problem as best as you can
+      value: |
+        1. Click on the vector layer
+        2. Move the scrubber to an vector keyframe
+        3. Draw a stroke
+        3. Select the bucket tool
+        4. Click to fill the layer.
+        5. ....
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    id: attachments
+    attributes:
+      label: "Video or Image Reference"
+      description: A screenshot or short video to show your problem.
+      placeholder: Drag and drop an image or video here
+    validations:
+      required: false
+  - type: textarea
+    id: specs
+    attributes:
+      label: "System Information"
+      description: You can find some of the needed information in "About" dialog in the top menu of Pencil2D.
+      value: |
+        - Pencil2D version: <0.7.0, 0.6.6 etc...>
+        - Operation system: <Windows|MacOS|Linux>
+        - Drawing tablet: <Insert tablet name if applicable>
+      render: bash
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Pencil2D forums
+    url: https://discuss.pencil2d.org/
+    about: A place to discuss issues, share knowledge, showcase animations or request features.
+  - name: Discord
+    url: https://discord.com/invite/8FxdV2g
+    about: Our primary communication and support channel. Most of the contributors hang around here.

.github/actions/create-package/action.yml

@@ -21,4 +21,4 @@ runs:
       RUNNER_OS: ${{runner.os}}
       INPUT_ARCH: ${{inputs.arch}}
       INPUT_QT: ${{inputs.qt}}
-      IS_RELEASE: ${{ github.ref == 'refs/heads/release' }}
+      IS_RELEASE: ${{ startsWith(github.ref, 'refs/heads/release/') }}

.github/actions/create-package/create-package.sh

@@ -98,8 +98,12 @@ create_package_macos() {
   popd >/dev/null
   echo "Create ZIP"
   local qtsuffix="-qt${INPUT_QT}"
-  bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-$3.zip" Pencil2D
-  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-$3" > "${GITHUB_OUTPUT}"
+  local arch=`uname -m`
+  local fileinfo="${qtsuffix/-qt5/}-mac-${arch}-$3"
+  mv Pencil2D "pencil2d${fileinfo}"
+  ditto -c -k --sequesterRsrc --keepParent "pencil2d${fileinfo}" "pencil2d${fileinfo}.zip"
+  rm -r "pencil2d${fileinfo}"
+  echo "output-basename=pencil2d${fileinfo}" > "${GITHUB_OUTPUT}"
 }
 
 create_package_windows() {
@@ -150,7 +154,7 @@ create_package_windows() {
     -out "pencil2d-${platform}-$3.msi" \
     ../util/installer/pencil2d.wxs windeployqt.wxs resources.wxs
   wix build -pdbtype none -arch "x${wordsize/32/86}" -dcl high -sw1133 -b ../util/installer -b Pencil2D \
-    -ext WixToolset.Util.wixext -ext WixToolset.Bal.wixext \
+    -ext WixToolset.Util.wixext -ext WixToolset.BootstrapperApplications.wixext \
     $versiondefines \
     -out "pencil2d-${platform}-$3.exe" \
     ../util/installer/pencil2d.bundle.wxs
@@ -164,10 +168,11 @@ create_package_windows() {
   echo "output-basename=pencil2d${qtsuffix/-qt5/}-${platform}-$3" > "${GITHUB_OUTPUT}"
 }
 
-eval "$(grep '^VERSION =' ../util/common.pri | tr -d '[:blank:]')"
-buildversion="${GITHUB_RUN_NUMBER}-$(date +%F)"
+echo "Version: ${VERSION_NUMBER}"
+
+filename_suffix="b${GITHUB_RUN_NUMBER}-$(date +%F)"
 if [ "$IS_RELEASE" = "true" ]; then
-  buildversion="${VERSION}"
+  filename_suffix="${VERSION_NUMBER}"
 fi
 
-"create_package_$(echo $RUNNER_OS | tr '[A-Z]' '[a-z]')" "${GITHUB_RUN_NUMBER}" "${VERSION}" "${buildversion}"
+"create_package_$(echo $RUNNER_OS | tr '[A-Z]' '[a-z]')" "${GITHUB_RUN_NUMBER}" "${VERSION_NUMBER}" "${filename_suffix}"

.github/actions/install-dependencies/install-dependencies.sh

@@ -55,11 +55,11 @@ setup_windows() {
   curl -fsSLO https://okapiframework.org/binaries/main/1.45.0/okapi-apps_win32-x86_64_1.45.0.zip
   mkdir okapi
   "${WINDIR}\\System32\\tar" xfC okapi-apps_win32-x86_64_1.45.0.zip okapi
-  dotnet tool install -g wix --version 4.0.4
-  wix extension add -g WixToolset.Util.wixext/4.0.4 WixToolset.Bal.wixext/4.0.4
-  nuget install -x -OutputDirectory util/installer WixToolset.BootstrapperCore.Native -Version 4.0.4
-  nuget install -x -OutputDirectory util/installer WixToolset.DUtil -Version 4.0.4
-  nuget install -x -OutputDirectory util/installer WixToolset.BalUtil -Version 4.0.4
+  dotnet tool install -g wix --version 5.0.0
+  wix extension add -g WixToolset.Util.wixext/5.0.0 WixToolset.BootstrapperApplications.wixext/5.0.0
+  nuget install -x -OutputDirectory util/installer WixToolset.DUtil -Version 5.0.0
+  nuget install -x -OutputDirectory util/installer WixToolset.BootstrapperApplicationApi -Version 5.0.0
+  nuget install -x -OutputDirectory util/installer WixToolset.WixStandardBootstrapperApplicationFunctionApi -Version 5.0.0
 }
 
 "setup_$(echo "${RUNNER_OS}" | tr '[A-Z]' '[a-z]')"

.github/actions/setup-environment/action.yml

@@ -11,3 +11,5 @@ runs:
     env:
       RUNNER_OS: ${{runner.os}}
       INPUT_ARCH: ${{inputs.arch}}
+  - run: ${GITHUB_ACTION_PATH}/setup-versions.sh
+    shell: bash

.github/actions/setup-environment/setup-versions.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# set env.VERSION_NUMBER from release branch names e.g., release/0.7.0
+if [[ "${GITHUB_REF_NAME}" == "release/"* ]]; then
+  branchVerion=$(echo "${GITHUB_REF_NAME}" | sed 's/release\///')
+  VERSION_NUMBER="$branchVerion.${GITHUB_RUN_NUMBER}"
+  echo "VERSION_NUMBER=$VERSION_NUMBER" >> $GITHUB_ENV
+  echo "VERSION_NUMBER is $VERSION_NUMBER"
+fi
+
+# set env.VERSION_NUMBER to 99.0.0.buildNumber if the branch is master
+if [ "${GITHUB_REF_NAME}" = "master" ]; then
+  VERSION_NUMBER=99.0.0.${GITHUB_RUN_NUMBER}
+  echo "VERSION_NUMBER=${VERSION_NUMBER}" >> "${GITHUB_ENV}"
+  echo "VERSION_NUMBER is $VERSION_NUMBER"
+fi

.github/workflows/ci.yml

@@ -31,7 +31,13 @@ jobs:
           #      figure out precisely *which* privileges are needed.
           container: { image: "ubuntu:16.04", options: --privileged }
           qt: 5
+          env:
+            ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
         - name: Qt 5 / macOS x86_64
+          os: macos-13
+          container:
+          qt: 5
+        - name: Qt 5 / macOS arm64
           os: macos-latest
           container:
           qt: 5
@@ -53,6 +59,10 @@ jobs:
           container: { image: "ubuntu:22.04", options: --privileged }
           qt: 6
         - name: Qt 6 / macOS x86_64
+          os: macos-13
+          container:
+          qt: 6
+        - name: Qt 6 / macOS arm64
           os: macos-latest
           container:
           qt: 6
@@ -65,7 +75,7 @@ jobs:
     name: ${{matrix.name}}
     runs-on: ${{matrix.os}}
     container: ${{matrix.container}}
-
+    env: {ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true}
     steps:
     - name: Install git (Linux)
       # GitHub runners come with git pre-installed, but our "custom" Linux
@@ -93,7 +103,8 @@ jobs:
     - name: Configure build
       run: mkdir build; ${{runner.os == 'Linux' && matrix.qt == 6 && 'qmake6' || 'qmake'}}
         -o build PREFIX=/usr CONFIG-=debug_and_release CONFIG+=release CONFIG+=GIT
-        CONFIG+=PENCIL2D_${{github.ref == 'refs/heads/release' && 'RELEASE' || 'NIGHTLY'}}
+        CONFIG+=PENCIL2D_${{ startsWith(github.ref, 'refs/heads/release/') && 'RELEASE' || 'NIGHTLY' }}
+        VERSION=${{ env.VERSION_NUMBER }}
 
     - name: Build Pencil2D
       working-directory: build

.github/workflows/docs.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update -yq
-        sudo apt-get install -yq --no-install-suggests --no-install-recommends graphviz xsltproc
+        sudo apt-get install -yq --no-install-suggests --no-install-recommends graphviz fonts-open-sans xsltproc
         curl -fsSLO https://www.doxygen.nl/files/doxygen-1.9.6.linux.bin.tar.gz
         tar xf doxygen-1.9.6.linux.bin.tar.gz
         realpath doxygen-1.9.6/bin >> "${GITHUB_PATH}"
@@ -37,15 +37,21 @@ jobs:
     - name: Generate documentation
       run: |
         echo PROJECT_NUMBER=${{github.sha}} >> Doxyfile
+        echo LAYOUT_FILE=util/docs/layout.xml >> Doxyfile
         echo HTML_HEADER=util/docs/header.html >> Doxyfile
         echo HTML_FOOTER=util/docs/footer.html >> Doxyfile
         echo HTML_EXTRA_STYLESHEET=util/docs/extra.css >> Doxyfile
+        echo HAVE_DOT=YES >> Doxyfile
+        echo DOT_COMMON_ATTR=\"fontname=\\\"Open Sans\\\",fontsize=13.2\" >> Doxyfile
+        echo DOT_EDGE_ATTR=\"labelfontname=\\\"Open Sans\\\",labelfontsize=13.2\" >> Doxyfile
         doxygen 2>&1 | tee doxygen.log
         if [ ! -f "docs/html/index.html" ]; then
           echo "::error::Documentation output was not found"
           exit 1
         fi
         xsltproc --novalid -o docs/html/404.html util/docs/404.xsl docs/html/index.html
+        # Doxygen's search results positioning code is buggy and doesn't consider scrollbars
+        sed -i 's/left -= domPopupSearchResults.offsetWidth;/left -= domPopupSearchResults.offsetWidth - domPopupSearchResultsWindow.clientWidth - parseFloat(getComputedStyle(domPopupSearchResultsWindow).borderLeftWidth) - parseFloat(getComputedStyle(domPopupSearchResultsWindow).borderRightWidth) + domPopupSearchResultsWindow.offsetWidth;/' docs/html/search/search.js
 
     - name: Remove old documentation
       run: |

.gitignore

@@ -82,3 +82,4 @@ ipch
 # Build directory
 build
 .qtc_clangd
+app/resources.pri