Merge remote-tracking branch 'pencil2d/master' into undo-redo-manager-v2

.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

@@ -99,8 +99,11 @@ create_package_macos() {
   echo "Create ZIP"
   local qtsuffix="-qt${INPUT_QT}"
   local arch=`uname -m`
-  bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-${arch}-$3.zip" Pencil2D
-  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-${arch}-$3" > "${GITHUB_OUTPUT}"
+  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() {
@@ -165,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/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,6 +31,8 @@ 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-12
           container:
@@ -73,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
@@ -101,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

README.md

@@ -16,24 +16,22 @@ _User Showcase Reel 2022_
 
 ## Download
 
-### Pencil2D 0.6.6 (17 Feb 2021)
+### Pencil2D 0.7.0 (12 Jul 2024)
 
-You can download Pencil2D from the [Official Website][p2d-download] or [Github releases][gh-release].
+Download Pencil2D from the [Official Website][p2d-download] or [Github releases][gh-release].
 
 [p2d-download]: https://www.pencil2d.org/download/
 [gh-release]: https://github.com/pencil2d/pencil/releases
 
 ### Nightly Builds
 
-Nightly builds are the bleeding edge versions of Pencil2D, which contains the most recent fixes and features. We currently do not offer legacy mac or 32-bit linux nightly builds. If you have one of these systems, you will have to wait for official releases or build the program from source.
+Nightly builds are the bleeding edge versions of Pencil2D, which contains the most recent fixes and features. They are not as stable as the official releases, but they are a great way to test the latest features and help us find bugs.
 
 [Download Nightly Buildls](https://www.pencil2d.org/download/nightly/)
 
 ## Using Pencil2D
 
-Note that the following guides and documentation are outdated.
-
-Pencil2D comes with a Quick Reference that you can use to familiarize yourself with the tools and functions at your disposal. After opening Pencil2D, you can access it through the main menu: Help > Quick Reference Guide.
+Pencil2D comes with a Quick Reference that you can use to familiarize yourself with the tools and functions at your disposal. You can access it through the main menu: Help > Quick Reference Guide.
 
 We encourage you to visit our [User Manual][user-man] for a quick guide for novice users, then play around with the program – it's fun!
 
@@ -50,12 +48,12 @@ If you encounter difficulty or have additional questions, we have a large commun
 
 ## Contributing
 
-Interested in contributing to Pencil? There are many ways to help. Take a look at our issues and see what you can help out with, check out the developer guide, or help out with making Pencil2D available to more people by contributing to translation.
+Interested in contributing to Pencil2D? There are many ways to help. Take a look at our issues and see what you can help out with, check out the developer guide, or help out with making Pencil2D available to more people by contributing to translation.
 
 * [Issue Tracker](https://github.com/pencil2d/pencil/issues) - Report bugs or request features.
 * [Developer Guide](https://dev.pencil2d.org/) - Learn how to compile Pencil2D yourself.
 * [Transifex](https://www.transifex.com/pencil2d/) - You can help translate Pencil2D, too.
-* [Documentation contributions](https://www.pencil2d.org/doc/CONTRIBUTING) - Guidelines for contributing to documentation.
+* [Documentation contributions](https://www.pencil2d.org/doc/CONTRIBUTING) - Contributing to documentation.
 
 ## Source Code
 

app/app.pro

@@ -15,8 +15,10 @@ TARGET = pencil2d
 RESOURCES += data/app.qrc
 
 MUI_TRANSLATIONS += \
+        translations/mui_cs.po \
         translations/mui_de.po
 
+RC_LANGS.cs = --lang LANG_CZECH --sublang SUBLANG_NEUTRAL
 RC_LANGS.de = --lang LANG_GERMAN --sublang SUBLANG_NEUTRAL
 
 EXTRA_TRANSLATIONS += \

app/data/org.pencil2d.Pencil2D.desktop

@@ -11,142 +11,145 @@ Categories=Graphics;2DGraphics;VectorGraphics;RasterGraphics;Qt;
 Keywords=picture;drawing;vector;bitmap;cartoon;animation;
 
 # Translations
-Comment[ar]=إنشاء رسوم متحركة كلاسيكية باستخدام الصور النقطية والمتجهة
-GenericName[ar]=برنامج رسوم متحركة
+
+
+# Translations
 Name[ar]=بنسل2دي
+GenericName[ar]=برنامج رسوم متحركة
+Comment[ar]=إنشاء رسوم متحركة كلاسيكية باستخدام الصور النقطية والمتجهة
 Icon[ar]=org.pencil2d.Pencil2D
-Comment[bg]=Създайте традиционна ръчно нарисувана анимация, използвайки както растерни, така и векторни графики
-GenericName[bg]=Софтуер за анимация
 Name[bg]=Pencil2D
+GenericName[bg]=Софтуер за анимация
+Comment[bg]=Създайте традиционна ръчно нарисувана анимация, използвайки както растерни, така и векторни графики
 Icon[bg]=org.pencil2d.Pencil2D
-Comment[ca]=Crea animacions tradicionals a mà utilitzant gràfics de mapa de bits i  de vectors
-GenericName[ca]=Programari d'animació
 Name[ca]=Pencil2D
+GenericName[ca]=Programari d'animació
+Comment[ca]=Crea animacions tradicionals a mà utilitzant gràfics de mapa de bits i  de vectors
 Icon[ca]=org.pencil2d.Pencil2D
-Comment[cs]=Tvořte tradiční ručně kreslenou animaci pomocí bitmapové i vektorové grafiky
-GenericName[cs]=Animační program
 Name[cs]=Pencil2D
+GenericName[cs]=Animační program
+Comment[cs]=Tvořte tradiční ručně kreslenou animaci pomocí bitmapové i vektorové grafiky
 Icon[cs]=org.pencil2d.Pencil2D
-Comment[da]=Lav traditionel håndtegnet animation, ved brug af både bitmap og vektorgrafik
-GenericName[da]=Animationssoftware
 Name[da]=Pencil2D
+GenericName[da]=Animationssoftware
+Comment[da]=Lav traditionel håndtegnet animation, ved brug af både bitmap og vektorgrafik
 Icon[da]=org.pencil2d.Pencil2D
-Comment[de]=Erstellen Sie traditionelle, handgezeichnete Animationen, sowohl mit Raster-, als auch mit Vektorgrafik.
-GenericName[de]=Animationssoftware
 Name[de]=Pencil2D
+GenericName[de]=Animationssoftware
+Comment[de]=Traditionelle handgezeichnete Animation sowohl mit Raster- als auch mit Vektorgrafik erstellen
 Icon[de]=org.pencil2d.Pencil2D
-Comment[el]=Δημιουργήστε παραδοσιακά, ζωγραφισμένα στο χέρι κινούμενα σχέδια χρησιμοποιώντας το bitmap και διανυσματική γραφιστική.
-GenericName[el]=Λογισμικό κινουμένων σχεδίων
 Name[el]=Pencil2D
+GenericName[el]=Λογισμικό κινουμένων σχεδίων
+Comment[el]=Δημιουργήστε παραδοσιακά, ζωγραφισμένα στο χέρι κινούμενα σχέδια χρησιμοποιώντας το bitmap και διανυσματική γραφιστική.
 Icon[el]=org.pencil2d.Pencil2D
-Comment[es]=Crea animaciones tradicionales hechas a mano usando mapas de bits o vectores gráficos
-GenericName[es]=Programa de Animación
 Name[es]=Pencil2D
+GenericName[es]=Programa de Animación
+Comment[es]=Crea animaciones tradicionales hechas a mano usando mapas de bits o vectores gráficos
 Icon[es]=org.pencil2d.Pencil2D
-Comment[et]=Loo traditsioonilisi käsitsijoonistatud animatsioone kasutades nii raster- kui vektorgraafikat.
-GenericName[et]=Animeerimistarkvara
 Name[et]=Pencil2D
+GenericName[et]=Animeerimistarkvara
+Comment[et]=Loo traditsioonilisi käsitsijoonistatud animatsioone kasutades nii raster- kui vektorgraafikat.
 Icon[et]=org.pencil2d.Pencil2D
-Comment[fa]=با کمک نگاره های برداری و بیتمپ ها ‍پویانمای سنتی و دستی بسازید
-GenericName[fa]=نرم افزار پویانمایی
 Name[fa]=Pencil2D
+GenericName[fa]=نرم افزار پویانمایی
+Comment[fa]=با کمک نگاره های برداری و بیتمپ ها ‍پویانمای سنتی و دستی بسازید
 Icon[fa]=org.pencil2d.Pencil2D
-Comment[fr]=Créez une animation traditionnelle dessinée à la main à l'aide de graphismes bitmap et vectoriels
-GenericName[fr]=Logiciel d'Animation
 Name[fr]=Pencil2D
+GenericName[fr]=Logiciel d'Animation
+Comment[fr]=Créez une animation traditionnelle dessinée à la main à l'aide de graphismes bitmap et vectoriels
 Icon[fr]=org.pencil2d.Pencil2D
-Comment[he]=צרו הנפשה מסורתית מצויירת ביד באמצעות כלי מפת ביטים וכלים וקטוריים
-GenericName[he]=תוכנת הנפשה
 Name[he]=Pencil2D
+GenericName[he]=תוכנת הנפשה
+Comment[he]=צרו הנפשה מסורתית מצויירת ביד באמצעות כלי מפת ביטים וכלים וקטוריים
 Icon[he]=org.pencil2d.Pencil2D
-Comment[id]=Rangkai animasi khas dengan grafik bitmap maupun vektor
-GenericName[id]=Animation Software
 Name[id]=Pencil2d
+GenericName[id]=Animation Software
+Comment[id]=Rangkai animasi khas dengan grafik bitmap maupun vektor
 Icon[id]=org.pencil2d.Pencil2D
-Comment[it]=Crea dell'animazione tradizionale disegnata a mano usando sia la grafica bitmap che quella vettoriale
-GenericName[it]=Software di animazione
 Name[it]=Pencil2D
+GenericName[it]=Software di animazione
+Comment[it]=Crea dell'animazione tradizionale disegnata a mano usando sia la grafica bitmap che quella vettoriale
 Icon[it]=org.pencil2d.Pencil2D
 Icon[ja]=org.pencil2d.Pencil2D
-Comment[ko]=전통적 손그림 애니메이션을 비트맵과 벡터, 모두 사용하여 만드세요.
-GenericName[ko]=애니메이션 소프트웨어
 Name[ko]=Pencil2D
+GenericName[ko]=애니메이션 소프트웨어
+Comment[ko]=전통적 손그림 애니메이션을 비트맵과 벡터, 모두 사용하여 만드세요.
 Icon[ko]=org.pencil2d.Pencil2D
-Comment[yue]=以點陣圖跟向量圖兩種方式創作傳統手繪動畫
-GenericName[yue]=动画软件
 Name[yue]=Pencil2D
+GenericName[yue]=动画软件
+Comment[yue]=以點陣圖跟向量圖兩種方式創作傳統手繪動畫
 Icon[yue]=org.pencil2d.Pencil2D
-Comment[uk_UA]=Створення традиційної мальованої анімації з використанням як растрової, так і векторної графіки
-GenericName[uk_UA]=Програмне забезпечення для анімації
 Name[uk_UA]=Pencil2D
+GenericName[uk_UA]=Програмне забезпечення для анімації
+Comment[uk_UA]=Створення традиційної мальованої анімації з використанням як растрової, так і векторної графіки
 Icon[uk_UA]=org.pencil2d.Pencil2D
-Comment[hu_HU]=A Pencil2D egy animáció készítő/rajzoló szoftver Mac OS X, Windows és Linux rendszerekre. Hagyományos, kézzel rajzolt animációk készítésére alkalmas. Bitkép és vagy vektorgrafika használatával.
-GenericName[hu_HU]=Animációs Szoftver
 Name[hu_HU]=Pencil2D
+GenericName[hu_HU]=Animációs Szoftver
+Comment[hu_HU]=A Pencil2D egy animáció készítő/rajzoló szoftver Mac OS X, Windows és Linux rendszerekre. Hagyományos, kézzel rajzolt animációk készítésére alkalmas. Bitkép és vagy vektorgrafika használatával.
 Icon[hu_HU]=org.pencil2d.Pencil2D
-Comment[nb]=Lag tradisjonell håndtegnet animasjon ved hjelp av både bitmap og vektorgrafikk
-GenericName[nb]=Animasjonsprogramvare
 Name[nb]=Pencil2D
+GenericName[nb]=Animasjonsprogramvare
+Comment[nb]=Lag tradisjonell håndtegnet animasjon ved hjelp av både bitmap og vektorgrafikk
 Icon[nb]=org.pencil2d.Pencil2D
-Comment[kab]=Snulfu-d asemwwiwel amansay yettusunɣen s ufus s wudlifen bitmap akked wudlifen imawayen
-GenericName[kab]=Aseɣẓan n usemwwiwel
 Name[kab]=Pencil2D
+GenericName[kab]=Aseɣẓan n usemwwiwel
+Comment[kab]=Snulfu-d asemwwiwel amansay yettusunɣen s ufus s wudlifen bitmap akked wudlifen imawayen
 Icon[kab]=org.pencil2d.Pencil2D
-Comment[pl]=Twórz tradycyjne ręcznie rysowane animacje używając zarówno bitmap, jak i grafiki wektorowej
-GenericName[pl]=Oprogramowanie do tworzenia animacji
 Name[pl]=Pencil2D
+GenericName[pl]=Oprogramowanie do tworzenia animacji
+Comment[pl]=Twórz tradycyjne ręcznie rysowane animacje używając zarówno bitmap, jak i grafiki wektorowej
 Icon[pl]=org.pencil2d.Pencil2D
-Comment[pt]=Cria animações tradicionais feitas a mão utilizando bitmaps e vectores gráficos 
-GenericName[pt]=Programa de Animação
 Name[pt]=Pencil2D
+GenericName[pt]=Programa de Animação
+Comment[pt]=Cria animações tradicionais feitas a mão utilizando bitmaps e vectores gráficos 
 Icon[pt]=org.pencil2d.Pencil2D
-Comment[pt_BR]=Crie animações tradicionais feitas à mão usando gráficos de bitmap e vetoriais.
-GenericName[pt_BR]=Software de animação
 Name[pt_BR]=Pencil2D
+GenericName[pt_BR]=Software de animação
+Comment[pt_BR]=Crie animações tradicionais feitas à mão usando gráficos de bitmap e vetoriais.
 Icon[pt_BR]=org.pencil2d.Pencil2D
 Icon[ro]=org.pencil2d.Pencil2D
-Comment[ru]=Создавайте традиционную рисованную анимацию, используя растровую и векторную графики.
-GenericName[ru]=Анимационное ПО
 Name[ru]=Pencil2D
+GenericName[ru]=Анимационное ПО
+Comment[ru]=Создавайте традиционную рисованную анимацию, используя растровую и векторную графики.
 Icon[ru]=org.pencil2d.Pencil2D
-Comment[nl_NL]=Maak traditionele handgetekende animaties met Bitmap en Vector afbeeldingen
-GenericName[nl_NL]=Animatie software
 Name[nl_NL]=Pencil2D
+GenericName[nl_NL]=Animatie software
+Comment[nl_NL]=Maak traditionele handgetekende animaties met Bitmap en Vector afbeeldingen
 Icon[nl_NL]=org.pencil2d.Pencil2D
-Comment[si]=බිට්මැප් සහ දෛශික ග්‍රැෆික් යන දෙකෙන්ම සාම්ප්‍රදායික අතින් ඇද ගත් සජීවිකරණයක් සාදන්න
-GenericName[si]=සජීවීකරණ මෘදුකාංගය
 Name[si]=Pencil2D
+GenericName[si]=සජීවීකරණ මෘදුකාංගය
+Comment[si]=බිට්මැප් සහ දෛශික ග්‍රැෆික් යන දෙකෙන්ම සාම්ප්‍රදායික අතින් ඇද ගත් සජීවිකරණයක් සාදන්න
 Icon[si]=org.pencil2d.Pencil2D
-Comment[sl]=Ustvarite tradicionalno ročno risano animacijo s pomočjo bitne in vektorske grafike
-GenericName[sl]=Program za animacijo
 Name[sl]=Svinčnik2D
+GenericName[sl]=Program za animacijo
+Comment[sl]=Ustvarite tradicionalno ročno risano animacijo s pomočjo bitne in vektorske grafike
 Icon[sl]=org.pencil2d.Pencil2D
-Comment[sv]=Skapa traditionellt handritade animationer, med både bitmap- och vektorgrafik
-GenericName[sv]=Animeringsprogram
 Name[sv]=Pencil2D
+GenericName[sv]=Animeringsprogram
+Comment[sv]=Skapa traditionellt handritade animationer, med både bitmap- och vektorgrafik
 Icon[sv]=org.pencil2d.Pencil2D
 Icon[ta]=org.pencil2d.Pencil2D
-Comment[hi_IN]=बिटमैप और वेक्टर दृश्यों दोनों को हाथ के  चित्रवर्णन से चलचित्र बनाइए
-GenericName[hi_IN]=एनीमेशन सॉफ्टवेयर
 Name[hi_IN]=कोयला कलम २ डी
+GenericName[hi_IN]=एनीमेशन सॉफ्टवेयर
+Comment[hi_IN]=बिटमैप और वेक्टर दृश्यों दोनों को हाथ के  चित्रवर्णन से चलचित्र बनाइए
 Icon[hi_IN]=org.pencil2d.Pencil2D
-Comment[tr]=Hem bitmap hem de vektör grafikleri kullanarak geleneksel elle çizilmiş animasyonlar oluşturun
-GenericName[tr]=Animasyon Yazılımı
 Name[tr]=Pencil2D
+GenericName[tr]=Animasyon Yazılımı
+Comment[tr]=Hem bitmap hem de vektör grafikleri kullanarak geleneksel elle çizilmiş animasyonlar oluşturun
 Icon[tr]=org.pencil2d.Pencil2D
-Comment[vi]=Tạo nên hoạt hình vẽ tay truyền thống bằng các đồ họa bitmap và vector
-GenericName[vi]=Phần mềm Hoạt hình
 Name[vi]=Pencil2D
+GenericName[vi]=Phần mềm Hoạt hình
+Comment[vi]=Tạo nên hoạt hình vẽ tay truyền thống bằng các đồ họa bitmap và vector
 Icon[vi]=org.pencil2d.Pencil2D
-Comment[zh_CN]=用位图和矢量两种图像技术创作传统手绘动画
-GenericName[zh_CN]=动画软件
 Name[zh_CN]=Pencil2D
+GenericName[zh_CN]=动画软件
+Comment[zh_CN]=用位图和矢量两种图像技术创作传统手绘动画
 Icon[zh_CN]=org.pencil2d.Pencil2D
-Comment[zh_TW]=以點陣圖跟向量圖兩種方式創作傳統手繪動畫
-GenericName[zh_TW]=動畫軟體
 Name[zh_TW]=Pencil2D
+GenericName[zh_TW]=動畫軟體
+Comment[zh_TW]=以點陣圖跟向量圖兩種方式創作傳統手繪動畫
 Icon[zh_TW]=org.pencil2d.Pencil2D
-Comment[fil]=Gumawa nang tradisyonal na mano-manong animasyon gamit ang parehong bitmap at vector graphics
-GenericName[fil]=Animation Software
 Name[fil]=Lapis2D
+GenericName[fil]=Animation Software
+Comment[fil]=Gumawa nang tradisyonal na mano-manong animasyon gamit ang parehong bitmap at vector graphics
 Icon[fil]=org.pencil2d.Pencil2D