Compare commits
No commits in common. "fc417b30e5bc1f70520c6d479a1ee26681550181" and "da9d7d69898d5d60c4126294bb44095453b0838b" have entirely different histories.
fc417b30e5
...
da9d7d6989
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
|||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
version: '6.9.0'
|
version: '6.8.3'
|
||||||
modules: 'qtimageformats'
|
modules: 'qtimageformats'
|
||||||
- name: Install Conan and Dependencies
|
- name: Install Conan and Dependencies
|
||||||
id: conan
|
id: conan
|
||||||
|
38
.github/workflows/windows.yml
vendored
38
.github/workflows/windows.yml
vendored
@ -8,7 +8,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- qt_ver: '6.9.0'
|
- qt_ver: '6.8.3'
|
||||||
vs: '2022'
|
vs: '2022'
|
||||||
aqt_arch: 'win64_msvc2022_64'
|
aqt_arch: 'win64_msvc2022_64'
|
||||||
msvc_arch: 'x64'
|
msvc_arch: 'x64'
|
||||||
@ -44,7 +44,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- qt_ver: '6.9.0'
|
- qt_ver: '6.8.3'
|
||||||
vs: '2022'
|
vs: '2022'
|
||||||
aqt_arch: 'win64_msvc2022_64'
|
aqt_arch: 'win64_msvc2022_64'
|
||||||
msvc_arch: 'x64'
|
msvc_arch: 'x64'
|
||||||
@ -71,52 +71,44 @@ jobs:
|
|||||||
:: ------ dep ------
|
:: ------ dep ------
|
||||||
set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin
|
set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin
|
||||||
mkdir dependencies_src
|
mkdir dependencies_src
|
||||||
echo ::group::===== exiv2 =====
|
:: ===== exiv2 =====
|
||||||
curl -fsSL -o exiv2_bin.zip https://github.com/Exiv2/exiv2/releases/download/v0.28.3/exiv2-0.28.3-2019msvc64.zip
|
curl -fsSL -o exiv2_bin.zip https://github.com/Exiv2/exiv2/releases/download/v0.28.3/exiv2-0.28.3-2019msvc64.zip
|
||||||
7z x exiv2_bin.zip -y
|
7z x exiv2_bin.zip -y
|
||||||
ren .\exiv2-0.28.3-2019msvc64 dependencies_bin
|
ren .\exiv2-0.28.3-2019msvc64 dependencies_bin
|
||||||
echo ::endgroup::
|
:: ===== zlib =====
|
||||||
echo ::group::===== zlib =====
|
|
||||||
curl -fsSL -o zlib_src.zip https://zlib.net/zlib131.zip
|
curl -fsSL -o zlib_src.zip https://zlib.net/zlib131.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.1 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
|
||||||
curl -fsSL -o expat_src.zip https://github.com/libexpat/libexpat/archive/R_2_6_2.zip
|
curl -fsSL -o expat_src.zip https://github.com/libexpat/libexpat/archive/R_2_6_2.zip
|
||||||
echo ::endgroup::
|
:: ===== AOM for libavif AVI decoding support =====
|
||||||
echo ::group::===== AOM for libavif AVI decoding support =====
|
git clone -q -b v3.10.0 --depth 1 https://aomedia.googlesource.com/aom dependencies_src/aom
|
||||||
git clone -q -b v3.12.0 --depth 1 https://aomedia.googlesource.com/aom dependencies_src/aom
|
|
||||||
cmake ./dependencies_src/aom -Bbuild_dependencies/aom -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DAOM_TARGET_CPU=generic -DENABLE_TESTS=OFF -DENABLE_TESTDATA=OFF -DENABLE_TOOLS=OFF -DENABLE_EXAMPLES=0 || goto :error
|
cmake ./dependencies_src/aom -Bbuild_dependencies/aom -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DAOM_TARGET_CPU=generic -DENABLE_TESTS=OFF -DENABLE_TESTDATA=OFF -DENABLE_TOOLS=OFF -DENABLE_EXAMPLES=0 || goto :error
|
||||||
cmake --build build_dependencies/aom --config Release --target=install || goto :error
|
cmake --build build_dependencies/aom --config Release --target=install || goto :error
|
||||||
echo ::endgroup::
|
:: ===== libavif =====
|
||||||
echo ::group::===== libavif =====
|
curl -fsSL -o libavif-v1_1_1.zip https://github.com/AOMediaCodec/libavif/archive/v1.1.1.zip
|
||||||
curl -fsSL -o libavif-v1_2_1.zip https://github.com/AOMediaCodec/libavif/archive/v1.2.1.zip
|
7z x libavif-v1_1_1.zip -y -o"dependencies_src"
|
||||||
7z x libavif-v1_2_1.zip -y -o"dependencies_src"
|
ren .\dependencies_src\libavif-1.1.1 libavif || goto :error
|
||||||
ren .\dependencies_src\libavif-1.2.1 libavif || goto :error
|
cmake ./dependencies_src/libavif -Bbuild_dependencies/libavif -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DAVIF_CODEC_AOM=ON -DAVIF_LOCAL_LIBYUV=ON
|
||||||
cmake ./dependencies_src/libavif -Bbuild_dependencies/libavif -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DAVIF_CODEC_AOM=ON -DAVIF_LIBYUV=LOCAL
|
|
||||||
cmake --build build_dependencies/libavif --config Release --target=install || goto :error
|
cmake --build build_dependencies/libavif --config Release --target=install || goto :error
|
||||||
echo ::endgroup::
|
:: ===== expat =====
|
||||||
echo ::group::===== expat =====
|
|
||||||
7z x expat_src.zip -y -o"dependencies_src"
|
7z x expat_src.zip -y -o"dependencies_src"
|
||||||
ren .\dependencies_src\libexpat-R_2_6_2 expat || goto :error
|
ren .\dependencies_src\libexpat-R_2_6_2 expat || goto :error
|
||||||
cmake ./dependencies_src/expat/expat -Bbuild_dependencies/expat -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
|
cmake ./dependencies_src/expat/expat -Bbuild_dependencies/expat -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
|
||||||
cmake --build build_dependencies/expat --config Release --target=install || goto :error
|
cmake --build build_dependencies/expat --config Release --target=install || goto :error
|
||||||
echo ::endgroup::
|
:: ===== ECM =====
|
||||||
echo ::group::===== ECM =====
|
|
||||||
git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git dependencies_src/extra-cmake-modules
|
git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git dependencies_src/extra-cmake-modules
|
||||||
cmake .\dependencies_src\extra-cmake-modules -Bbuild_dependencies/extra-cmake-modules -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error
|
cmake .\dependencies_src\extra-cmake-modules -Bbuild_dependencies/extra-cmake-modules -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error
|
||||||
cmake --build build_dependencies/extra-cmake-modules --config Release --target=install || goto :error
|
cmake --build build_dependencies/extra-cmake-modules --config Release --target=install || goto :error
|
||||||
echo ::endgroup::
|
:: ===== KArchive =====
|
||||||
echo ::group::===== KArchive =====
|
|
||||||
git clone -q https://invent.kde.org/frameworks/karchive.git dependencies_src/karchive
|
git clone -q https://invent.kde.org/frameworks/karchive.git dependencies_src/karchive
|
||||||
cmake .\dependencies_src\karchive -Bbuild_dependencies/karchive -DWITH_LIBZSTD=OFF -DWITH_BZIP2=OFF -DWITH_LIBLZMA=OFF -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
|
cmake .\dependencies_src\karchive -Bbuild_dependencies/karchive -DWITH_LIBZSTD=OFF -DWITH_BZIP2=OFF -DWITH_LIBLZMA=OFF -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
|
||||||
cmake --build build_dependencies/karchive --config Release --target=install || goto :error
|
cmake --build build_dependencies/karchive --config Release --target=install || goto :error
|
||||||
echo ::endgroup::
|
:: ===== KImageFormats =====
|
||||||
echo ::group::===== KImageFormats =====
|
|
||||||
git clone -q https://invent.kde.org/frameworks/kimageformats.git dependencies_src/kimageformats
|
git clone -q https://invent.kde.org/frameworks/kimageformats.git dependencies_src/kimageformats
|
||||||
cmake .\dependencies_src\kimageformats -Bbuild_dependencies/kimageformats -DKDE_INSTALL_QTPLUGINDIR=%QT_ROOT_DIR%\plugins || goto :error
|
cmake .\dependencies_src\kimageformats -Bbuild_dependencies/kimageformats -DKDE_INSTALL_QTPLUGINDIR=%QT_ROOT_DIR%\plugins || goto :error
|
||||||
cmake --build build_dependencies/kimageformats --config Release --target=install || goto :error
|
cmake --build build_dependencies/kimageformats --config Release --target=install || goto :error
|
||||||
echo ::endgroup::
|
|
||||||
:: ------ app ------
|
:: ------ app ------
|
||||||
cmake -Bbuild . -DCMAKE_INSTALL_PREFIX="%PWD%\build\"
|
cmake -Bbuild . -DCMAKE_INSTALL_PREFIX="%PWD%\build\"
|
||||||
cmake --build build --config Release
|
cmake --build build --config Release
|
||||||
|
@ -789,7 +789,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="90"/>
|
<location filename="../settingsdialog.cpp" line="90"/>
|
||||||
<source>Windowed</source>
|
<source>Windowed</source>
|
||||||
<translation>Finestrato</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="94"/>
|
<location filename="../settingsdialog.cpp" line="94"/>
|
||||||
|
@ -236,17 +236,17 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../mainwindow.cpp" line="754"/>
|
<location filename="../mainwindow.cpp" line="754"/>
|
||||||
<source>Image From Clipboard</source>
|
<source>Image From Clipboard</source>
|
||||||
<translation>Afbeelding van klembord</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../mainwindow.cpp" line="772"/>
|
<location filename="../mainwindow.cpp" line="772"/>
|
||||||
<source>Are you sure you want to move "%1" to recycle bin?</source>
|
<source>Are you sure you want to move "%1" to recycle bin?</source>
|
||||||
<translation>Weet u zeker dat u “%1” naar de prullenbak wilt verplaatsen?</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../mainwindow.cpp" line="777"/>
|
<location filename="../mainwindow.cpp" line="777"/>
|
||||||
<source>Move to trash failed, it might caused by file permission issue, file system limitation, or platform limitation.</source>
|
<source>Move to trash failed, it might caused by file permission issue, file system limitation, or platform limitation.</source>
|
||||||
<translation>Het bestand kan niet naar de prullenbak worden verplaatst, mogelijk door een rechtenprobleem of systeembeperking.</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="114"/>
|
<location filename="../actionmanager.cpp" line="114"/>
|
||||||
@ -295,12 +295,12 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="108"/>
|
<location filename="../actionmanager.cpp" line="108"/>
|
||||||
<source>Pause/Resume Animation</source>
|
<source>Pause/Resume Animation</source>
|
||||||
<translation>Animatie pauzeren/hervatten</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="109"/>
|
<location filename="../actionmanager.cpp" line="109"/>
|
||||||
<source>Animation Go to Next Frame</source>
|
<source>Animation Go to Next Frame</source>
|
||||||
<translation>Ga naar volgend animatieframe</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="111"/>
|
<location filename="../actionmanager.cpp" line="111"/>
|
||||||
@ -310,12 +310,12 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="112"/>
|
<location filename="../actionmanager.cpp" line="112"/>
|
||||||
<source>Fit to view</source>
|
<source>Fit to view</source>
|
||||||
<translation>Inpassen</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="113"/>
|
<location filename="../actionmanager.cpp" line="113"/>
|
||||||
<source>Fit to width</source>
|
<source>Fit to width</source>
|
||||||
<translation>Aanpassen aan breedte</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="116"/>
|
<location filename="../actionmanager.cpp" line="116"/>
|
||||||
@ -350,7 +350,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="103"/>
|
<location filename="../actionmanager.cpp" line="103"/>
|
||||||
<source>Rotate left</source>
|
<source>Rotate left</source>
|
||||||
<translation>Naar links draaien</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="105"/>
|
<location filename="../actionmanager.cpp" line="105"/>
|
||||||
@ -366,7 +366,7 @@
|
|||||||
<location filename="../mainwindow.cpp" line="771"/>
|
<location filename="../mainwindow.cpp" line="771"/>
|
||||||
<location filename="../actionmanager.cpp" line="117"/>
|
<location filename="../actionmanager.cpp" line="117"/>
|
||||||
<source>Move to Trash</source>
|
<source>Move to Trash</source>
|
||||||
<translation>Verplaatsen naar prullenbak</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="121"/>
|
<location filename="../actionmanager.cpp" line="121"/>
|
||||||
@ -728,27 +728,27 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="37"/>
|
<location filename="../settingsdialog.cpp" line="37"/>
|
||||||
<source>Options</source>
|
<source>Options</source>
|
||||||
<translation>Opties</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="49"/>
|
<location filename="../settingsdialog.cpp" line="49"/>
|
||||||
<source>Shortcuts</source>
|
<source>Shortcuts</source>
|
||||||
<translation>Sneltoetsen</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="59"/>
|
<location filename="../settingsdialog.cpp" line="59"/>
|
||||||
<source>Editing shortcuts for action "%1":</source>
|
<source>Editing shortcuts for action "%1":</source>
|
||||||
<translation>Bewerken van sneltoetsen voor actie ‘%1’:</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="68"/>
|
<location filename="../settingsdialog.cpp" line="68"/>
|
||||||
<source>Failed to set shortcuts</source>
|
<source>Failed to set shortcuts</source>
|
||||||
<translation>Instellen mislukt</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="69"/>
|
<location filename="../settingsdialog.cpp" line="69"/>
|
||||||
<source>Please check if shortcuts are duplicated with existing shortcuts.</source>
|
<source>Please check if shortcuts are duplicated with existing shortcuts.</source>
|
||||||
<translation>Controleer of de gekozen sneltoetsen niet al in gebruik zijn.</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="76"/>
|
<location filename="../settingsdialog.cpp" line="76"/>
|
||||||
@ -768,7 +768,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="79"/>
|
<location filename="../settingsdialog.cpp" line="79"/>
|
||||||
<source>Toggle fullscreen</source>
|
<source>Toggle fullscreen</source>
|
||||||
<translation>Schermvullende weergave aan/uit</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="83"/>
|
<location filename="../settingsdialog.cpp" line="83"/>
|
||||||
@ -793,7 +793,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="90"/>
|
<location filename="../settingsdialog.cpp" line="90"/>
|
||||||
<source>Windowed</source>
|
<source>Windowed</source>
|
||||||
<translation>Venster</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="94"/>
|
<location filename="../settingsdialog.cpp" line="94"/>
|
||||||
@ -827,7 +827,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="121"/>
|
<location filename="../settingsdialog.cpp" line="121"/>
|
||||||
<source>Use light-color checkerboard</source>
|
<source>Use light-color checkerboard</source>
|
||||||
<translation>Licht schaakbordpatroon gebruiken</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="122"/>
|
<location filename="../settingsdialog.cpp" line="122"/>
|
||||||
@ -855,7 +855,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../shortcutedit.cpp" line="111"/>
|
<location filename="../shortcutedit.cpp" line="111"/>
|
||||||
<source>No shortcuts</source>
|
<source>No shortcuts</source>
|
||||||
<translation>Geen sneltoetsen</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -863,7 +863,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../shortcutedit.cpp" line="77"/>
|
<location filename="../shortcutedit.cpp" line="77"/>
|
||||||
<source>Shortcut #%1</source>
|
<source>Shortcut #%1</source>
|
||||||
<translation>Sneltoets #%1</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -876,7 +876,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../main.cpp" line="46"/>
|
<location filename="../main.cpp" line="46"/>
|
||||||
<source>List supported image format suffixes, and quit program.</source>
|
<source>List supported image format suffixes, and quit program.</source>
|
||||||
<translation>Toon een lijst met ondersteunde afbeeldingsformaten en sluit af.</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../main.cpp" line="50"/>
|
<location filename="../main.cpp" line="50"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user