Compare commits

...
6 Commits
Author SHA1 Message Date
blumia 9c8ffb6c1b chore(CI): bump Qt and action version 2026-04-04 16:52:18 +08:00
blumia 4c5c5e6fc6 fix(CI): zlib dll renamed 2026-03-27 17:55:23 +08:00
blumia b8cb10bb33 fix(CI): fixed kf6 version for appveyor build 2026-03-27 15:52:00 +08:00
blumia 6e2f40633e fix: correct version in CMakeLists, update CI for zlib 2026-03-27 15:06:11 +08:00
a0ba7c1d17 i18n: Translations update from Hosted Weblate
Co-authored-by: Heimen Stoffels <vistausss@fastmail.com>
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/nl/
Translation: pineapple-pictures/Application
2026-03-27 15:02:18 +08:00
b6d759d7c6 i18n: Translations update from Hosted Weblate
Co-authored-by: Loc Huynh <huynhloc.contact@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/vi/
Translation: pineapple-pictures/Application
2026-03-11 20:32:50 +08:00
8 changed files with 35 additions and 35 deletions
+2 -2
View File
@@ -14,7 +14,7 @@ jobs:
run: | run: |
apt update apt update
apt install -y git ca-certificates curl file apt install -y git ca-certificates curl file
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Get build dept. - name: Get build dept.
run: | run: |
apt install -y cmake qt6-base-dev qt6-svg-dev qt6-tools-dev libexiv2-dev apt install -y cmake qt6-base-dev qt6-svg-dev qt6-tools-dev libexiv2-dev
@@ -29,7 +29,7 @@ jobs:
run: | run: |
cd build cd build
apt install -y ./*.deb apt install -y ./*.deb
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: deepin-25-deb-package name: deepin-25-deb-package
path: build/*.deb path: build/*.deb
+3 -3
View File
@@ -8,11 +8,11 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: '6.10.2' version: '6.10.3'
modules: 'qtimageformats' modules: 'qtimageformats'
cache: true cache: true
- name: Install Conan and Dependencies - name: Install Conan and Dependencies
@@ -33,7 +33,7 @@ jobs:
run: | run: |
macdeployqt ./ppic.app -dmg macdeployqt ./ppic.app -dmg
ls ls
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: "macos-bundle" name: "macos-bundle"
path: "*.dmg" path: "*.dmg"
+2 -2
View File
@@ -6,7 +6,7 @@ jobs:
ubuntu-24-04-build: ubuntu-24-04-build:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Get build dept. - name: Get build dept.
run: | run: |
sudo apt update sudo apt update
@@ -22,7 +22,7 @@ jobs:
run: | run: |
cd build cd build
sudo apt install ./*.deb sudo apt install ./*.deb
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: ubuntu-24.04-deb-package name: ubuntu-24.04-deb-package
path: build/*.deb path: build/*.deb
+8 -8
View File
@@ -8,7 +8,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_ver: '6.10.2' - qt_ver: '6.10.3'
vs: '2022' vs: '2022'
aqt_arch: 'win64_msvc2022_64' aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64' msvc_arch: 'x64'
@@ -16,7 +16,7 @@ jobs:
runs-on: windows-2022 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
@@ -35,7 +35,7 @@ jobs:
nmake nmake
nmake clean nmake clean
windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation release\ppic.exe windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation release\ppic.exe
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-qmake-package" name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-qmake-package"
path: release/* path: release/*
@@ -45,7 +45,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_ver: '6.10.2' - qt_ver: '6.10.3'
vs: '2022' vs: '2022'
aqt_arch: 'win64_msvc2022_64' aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64' msvc_arch: 'x64'
@@ -53,7 +53,7 @@ jobs:
runs-on: windows-2022 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
@@ -79,9 +79,9 @@ jobs:
ren .\exiv2-0.28.7-2022msvc-AMD64 dependencies_bin ren .\exiv2-0.28.7-2022msvc-AMD64 dependencies_bin
echo ::endgroup:: echo ::endgroup::
echo ::group::===== zlib ===== echo ::group::===== zlib =====
curl -fsSL -o zlib_src.zip https://zlib.net/zlib131.zip curl -fsSL -o zlib_src.zip https://zlib.net/zlib132.zip
7z x zlib_src.zip -y -o"dependencies_src" 7z x zlib_src.zip -y -o"dependencies_src"
ren .\dependencies_src\zlib-1.3.1 zlib || goto :error ren .\dependencies_src\zlib-1.3.2 zlib || goto :error
cmake ./dependencies_src/zlib -Bbuild_dependencies/zlib -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error cmake ./dependencies_src/zlib -Bbuild_dependencies/zlib -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
cmake --build build_dependencies/zlib --config Release --target=install || goto :error cmake --build build_dependencies/zlib --config Release --target=install || goto :error
echo ::endgroup:: echo ::endgroup::
@@ -135,7 +135,7 @@ jobs:
if ErrorLevel 8 (exit /B 1) if ErrorLevel 8 (exit /B 1)
copy LICENSE build\bin copy LICENSE build\bin
exit /B 0 exit /B 0
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v6
with: with:
name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-cmake-package" name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-cmake-package"
path: build/bin/* path: build/bin/*
+1 -1
View File
@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(pineapple-pictures VERSION 1.3.0) # don't forget to update NEWS file and AppStream metadata. project(pineapple-pictures VERSION 1.4.0) # don't forget to update NEWS file and AppStream metadata.
include(GNUInstallDirs) include(GNUInstallDirs)
include(FeatureSummary) include(FeatureSummary)
+8 -8
View File
@@ -240,27 +240,27 @@
<location filename="../mainwindow.cpp" line="734"/> <location filename="../mainwindow.cpp" line="734"/>
<location filename="../mainwindow.cpp" line="764"/> <location filename="../mainwindow.cpp" line="764"/>
<source>Save As</source> <source>Save As</source>
<translation type="unfinished"></translation> <translation>Opslaan als</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="710"/> <location filename="../mainwindow.cpp" line="710"/>
<source>No image is currently open.</source> <source>No image is currently open.</source>
<translation type="unfinished"></translation> <translation>Er is geen afbeelding geopend.</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="722"/> <location filename="../mainwindow.cpp" line="722"/>
<source>%1 Image (*.%2)</source> <source>%1 Image (*.%2)</source>
<translation type="unfinished"></translation> <translation>%1-afbeelding (*.%2)</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="728"/> <location filename="../mainwindow.cpp" line="728"/>
<source>No supported image formats are available.</source> <source>No supported image formats are available.</source>
<translation type="unfinished"></translation> <translation>Er zijn geen ondersteunde formaten beschikbaar.</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="765"/> <location filename="../mainwindow.cpp" line="765"/>
<source>Failed to save image: %1</source> <source>Failed to save image: %1</source>
<translation type="unfinished"></translation> <translation>De afbeelding kan niet worden opgeslagen: %1</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="854"/> <location filename="../mainwindow.cpp" line="854"/>
@@ -324,7 +324,7 @@
<message> <message>
<location filename="../actionmanager.cpp" line="88"/> <location filename="../actionmanager.cpp" line="88"/>
<source>Save &amp;As...</source> <source>Save &amp;As...</source>
<translation type="unfinished"></translation> <translation>Opslaan &amp;als</translation>
</message> </message>
<message> <message>
<location filename="../actionmanager.cpp" line="93"/> <location filename="../actionmanager.cpp" line="93"/>
@@ -359,7 +359,7 @@
<message> <message>
<location filename="../actionmanager.cpp" line="107"/> <location filename="../actionmanager.cpp" line="107"/>
<source>Fit long image</source> <source>Fit long image</source>
<translation type="unfinished"></translation> <translation>Lange afbeelding inpassen</translation>
</message> </message>
<message> <message>
<location filename="../actionmanager.cpp" line="110"/> <location filename="../actionmanager.cpp" line="110"/>
@@ -891,7 +891,7 @@
<message> <message>
<location filename="../settingsdialog.cpp" line="129"/> <location filename="../settingsdialog.cpp" line="129"/>
<source>Limit SVG support to SVG Tiny 1.2</source> <source>Limit SVG support to SVG Tiny 1.2</source>
<translation type="unfinished"></translation> <translation>Svg-ondersteuning beperken tot SVG Tiny 1.2</translation>
</message> </message>
<message> <message>
<location filename="../settingsdialog.cpp" line="130"/> <location filename="../settingsdialog.cpp" line="130"/>
+6 -6
View File
@@ -225,27 +225,27 @@ Loc Huynh &lt;https://github.com/hthienloc&gt;</translation>
<location filename="../mainwindow.cpp" line="734"/> <location filename="../mainwindow.cpp" line="734"/>
<location filename="../mainwindow.cpp" line="764"/> <location filename="../mainwindow.cpp" line="764"/>
<source>Save As</source> <source>Save As</source>
<translation type="unfinished"></translation> <translation>Lưu dưới dạng</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="710"/> <location filename="../mainwindow.cpp" line="710"/>
<source>No image is currently open.</source> <source>No image is currently open.</source>
<translation type="unfinished"></translation> <translation>Hiện tại không hình nh nào đưc mở.</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="722"/> <location filename="../mainwindow.cpp" line="722"/>
<source>%1 Image (*.%2)</source> <source>%1 Image (*.%2)</source>
<translation type="unfinished"></translation> <translation>Hình nh %1 (*.%2)</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="728"/> <location filename="../mainwindow.cpp" line="728"/>
<source>No supported image formats are available.</source> <source>No supported image formats are available.</source>
<translation type="unfinished"></translation> <translation>Không đnh dạng hình nh đưc hỗ trợ.</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="765"/> <location filename="../mainwindow.cpp" line="765"/>
<source>Failed to save image: %1</source> <source>Failed to save image: %1</source>
<translation type="unfinished"></translation> <translation>Không lưu đưc hình nh: %1</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="854"/> <location filename="../mainwindow.cpp" line="854"/>
@@ -309,7 +309,7 @@ Loc Huynh &lt;https://github.com/hthienloc&gt;</translation>
<message> <message>
<location filename="../actionmanager.cpp" line="88"/> <location filename="../actionmanager.cpp" line="88"/>
<source>Save &amp;As...</source> <source>Save &amp;As...</source>
<translation type="unfinished"></translation> <translation>Lưu &amp;dưới dạng...</translation>
</message> </message>
<message> <message>
<location filename="../actionmanager.cpp" line="93"/> <location filename="../actionmanager.cpp" line="93"/>
+5 -5
View File
@@ -11,7 +11,7 @@ environment:
- job_name: mingw_64_qt6_8 - job_name: mingw_64_qt6_8
QTDIR: C:\Qt\6.8\mingw_64 QTDIR: C:\Qt\6.8\mingw_64
MINGW64: C:\Qt\mingw_64\Tools\mingw1310_64 MINGW64: C:\Qt\mingw_64\Tools\mingw1310_64
KF_BRANCH: master KF_BRANCH: v6.24.0
EXIV2_VERSION: "0.28.7" EXIV2_VERSION: "0.28.7"
EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF" EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF"
PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF" PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF"
@@ -39,9 +39,9 @@ build_script:
- cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%
# download and install zlib for KArchive # download and install zlib for KArchive
- cd %LIBZ% - cd %LIBZ%
- curl -fsSL -o zlib131.zip https://zlib.net/zlib131.zip - curl -fsSL -o zlib132.zip https://zlib.net/zlib132.zip
- 7z x zlib131.zip -y - 7z x zlib132.zip -y
- cd zlib-1.3.1 - cd zlib-1.3.2
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX%
@@ -134,7 +134,7 @@ build_script:
- copy %CMAKE_INSTALL_PREFIX%\bin\libexpat-1.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libexpat-1.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libexiv2.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libexiv2.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libavif.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libavif.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libzlib.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libz.dll
- copy %CMAKE_INSTALL_PREFIX%\bin\libKF?Archive.dll - copy %CMAKE_INSTALL_PREFIX%\bin\libKF?Archive.dll
- windeployqt %WINDEPLOYQT_ARGS% .\ppic.exe - windeployqt %WINDEPLOYQT_ARGS% .\ppic.exe
# copy 3rdparty licenses for the libs we vendored for windows... # copy 3rdparty licenses for the libs we vendored for windows...