Compare commits
8 Commits
b880406474
...
0.8.2.1
Author | SHA1 | Date | |
---|---|---|---|
fad7a668e3 | |||
c68e82c7c8 | |||
7e04ba84eb | |||
29355c7fc1 | |||
95f85374cf | |||
471a3b15ef | |||
5d2ddc199a | |||
fa0b86a995 |
34
.github/workflows/windows.yml
vendored
34
.github/workflows/windows.yml
vendored
@ -1,15 +1,17 @@
|
|||||||
name: Windows CI
|
name: Windows CI
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request, workflow_dispatch]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
msvc-qmake-build:
|
msvc-qmake-build:
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
vs: ['2022']
|
include:
|
||||||
msvc_arch: ['x64']
|
- qt_ver: '6.8.0'
|
||||||
qt_ver: ['6.7.2']
|
vs: '2022'
|
||||||
|
aqt_arch: 'win64_msvc2022_64'
|
||||||
|
msvc_arch: 'x64'
|
||||||
|
|
||||||
runs-on: windows-2022
|
runs-on: windows-2022
|
||||||
|
|
||||||
@ -18,7 +20,7 @@ jobs:
|
|||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
arch: 'win64_msvc2019_64'
|
arch: ${{ matrix.aqt_arch }}
|
||||||
version: ${{ matrix.qt_ver }}
|
version: ${{ matrix.qt_ver }}
|
||||||
modules: 'qtimageformats'
|
modules: 'qtimageformats'
|
||||||
- name: Build
|
- name: Build
|
||||||
@ -41,9 +43,11 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
vs: ['2022']
|
include:
|
||||||
msvc_arch: ['x64']
|
- qt_ver: '6.8.0'
|
||||||
qt_ver: ['6.7.2']
|
vs: '2022'
|
||||||
|
aqt_arch: 'win64_msvc2022_64'
|
||||||
|
msvc_arch: 'x64'
|
||||||
|
|
||||||
runs-on: windows-2022
|
runs-on: windows-2022
|
||||||
|
|
||||||
@ -52,7 +56,7 @@ jobs:
|
|||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
arch: 'win64_msvc2019_64'
|
arch: ${{ matrix.aqt_arch }}
|
||||||
version: ${{ matrix.qt_ver }}
|
version: ${{ matrix.qt_ver }}
|
||||||
modules: 'qtimageformats'
|
modules: 'qtimageformats'
|
||||||
- name: Build
|
- name: Build
|
||||||
@ -78,6 +82,16 @@ jobs:
|
|||||||
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
|
||||||
|
:: ===== AOM for libavif AVI decoding support =====
|
||||||
|
git clone -q -b v3.10.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 --build build_dependencies/aom --config Release --target=install || goto :error
|
||||||
|
:: ===== libavif =====
|
||||||
|
curl -fsSL -o libavif-v1_1_1.zip https://github.com/AOMediaCodec/libavif/archive/v1.1.1.zip
|
||||||
|
7z x libavif-v1_1_1.zip -y -o"dependencies_src"
|
||||||
|
ren .\dependencies_src\libavif-1.1.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 --build build_dependencies/libavif --config Release --target=install || goto :error
|
||||||
:: ===== expat =====
|
:: ===== 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
|
||||||
@ -103,7 +117,7 @@ jobs:
|
|||||||
windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation build\bin\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 build\bin\ppic.exe
|
||||||
robocopy ./dependencies_bin/bin build/bin *.dll
|
robocopy ./dependencies_bin/bin build/bin *.dll
|
||||||
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@v4
|
||||||
with:
|
with:
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
cmake_minimum_required (VERSION 3.9.5)
|
cmake_minimum_required (VERSION 3.9.5)
|
||||||
|
|
||||||
project(pineapple-pictures VERSION 0.8.1) # don't forget to update NEWS file and AppStream metadata.
|
project(pineapple-pictures VERSION 0.8.2.1) # don't forget to update NEWS file and AppStream metadata.
|
||||||
|
|
||||||
include (GNUInstallDirs)
|
include (GNUInstallDirs)
|
||||||
include (FeatureSummary)
|
include (FeatureSummary)
|
||||||
|
17
NEWS
17
NEWS
@ -1,3 +1,20 @@
|
|||||||
|
Version 0.8.2.1
|
||||||
|
~~~~~~~~~~~~~
|
||||||
|
Released: 2024-10-27
|
||||||
|
|
||||||
|
Bugfixes:
|
||||||
|
* Cannot load translations caused by a change in 0.8.2
|
||||||
|
|
||||||
|
Version 0.8.2
|
||||||
|
~~~~~~~~~~~~~
|
||||||
|
Released: 2024-10-26
|
||||||
|
|
||||||
|
Features:
|
||||||
|
* New option to allow use light-color checkerboard by default
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
albanobattistella, mmahhi, gallegonovato
|
||||||
|
|
||||||
Version 0.8.1
|
Version 0.8.1
|
||||||
~~~~~~~~~~~~~
|
~~~~~~~~~~~~~
|
||||||
Released: 2024-08-25
|
Released: 2024-08-25
|
||||||
|
11
app/main.cpp
11
app/main.cpp
@ -20,6 +20,8 @@
|
|||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
QCoreApplication::setApplicationName("Pineapple Pictures");
|
||||||
|
QCoreApplication::setApplicationVersion(PPIC_VERSION_STRING);
|
||||||
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Settings::instance()->hiDpiScaleFactorBehavior());
|
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Settings::instance()->hiDpiScaleFactorBehavior());
|
||||||
|
|
||||||
QApplication a(argc, argv);
|
QApplication a(argc, argv);
|
||||||
@ -35,11 +37,10 @@ int main(int argc, char *argv[])
|
|||||||
qmDir = QT_STRINGIFY(QM_FILE_INSTALL_DIR);
|
qmDir = QT_STRINGIFY(QM_FILE_INSTALL_DIR);
|
||||||
#endif
|
#endif
|
||||||
if (translator.load(QLocale(), QLatin1String("PineapplePictures"), QLatin1String("_"), qmDir)) {
|
if (translator.load(QLocale(), QLatin1String("PineapplePictures"), QLatin1String("_"), qmDir)) {
|
||||||
a.installTranslator(&translator);
|
QCoreApplication::installTranslator(&translator);
|
||||||
}
|
}
|
||||||
a.setApplicationName("Pineapple Pictures");
|
|
||||||
a.setApplicationDisplayName(QCoreApplication::translate("main", "Pineapple Pictures"));
|
QGuiApplication::setApplicationDisplayName(QCoreApplication::translate("main", "Pineapple Pictures"));
|
||||||
a.setApplicationVersion(PPIC_VERSION_STRING);
|
|
||||||
|
|
||||||
// commandline options
|
// commandline options
|
||||||
QCommandLineOption supportedImageFormats(QStringLiteral("supported-image-formats"), QCoreApplication::translate("main", "List supported image format suffixes, and quit program."));
|
QCommandLineOption supportedImageFormats(QStringLiteral("supported-image-formats"), QCoreApplication::translate("main", "List supported image format suffixes, and quit program."));
|
||||||
@ -67,5 +68,5 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
w.initWindowSize();
|
w.initWindowSize();
|
||||||
|
|
||||||
return a.exec();
|
return QApplication::exec();
|
||||||
}
|
}
|
||||||
|
@ -149,7 +149,7 @@ Settings::Settings()
|
|||||||
#endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
|
#endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
|
||||||
|
|
||||||
if (configPath.isEmpty()) {
|
if (configPath.isEmpty()) {
|
||||||
// %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux.
|
// Should be %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux.
|
||||||
configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
|
configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -782,7 +782,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="71"/>
|
<location filename="../settingsdialog.cpp" line="71"/>
|
||||||
<source>Use light-color checkerboard</source>
|
<source>Use light-color checkerboard</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>Utilice un tablero de ajedrez de color claro</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="72"/>
|
<location filename="../settingsdialog.cpp" line="72"/>
|
||||||
|
@ -778,7 +778,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="71"/>
|
<location filename="../settingsdialog.cpp" line="71"/>
|
||||||
<source>Use light-color checkerboard</source>
|
<source>Use light-color checkerboard</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>Utilizzare scacchiera di colore chiaro</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../settingsdialog.cpp" line="72"/>
|
<location filename="../settingsdialog.cpp" line="72"/>
|
||||||
|
@ -301,7 +301,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="107"/>
|
<location filename="../actionmanager.cpp" line="107"/>
|
||||||
<source>Fit to width</source>
|
<source>Fit to width</source>
|
||||||
<translation>横幅に合わせる</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="110"/>
|
<location filename="../actionmanager.cpp" line="110"/>
|
||||||
@ -336,7 +336,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="100"/>
|
<location filename="../actionmanager.cpp" line="100"/>
|
||||||
<source>Rotate left</source>
|
<source>Rotate left</source>
|
||||||
<translation>左向きに回転する</translation>
|
<translation>左に回転</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../actionmanager.cpp" line="102"/>
|
<location filename="../actionmanager.cpp" line="102"/>
|
||||||
|
@ -74,6 +74,24 @@
|
|||||||
</screenshot>
|
</screenshot>
|
||||||
</screenshots>
|
</screenshots>
|
||||||
<releases>
|
<releases>
|
||||||
|
<release type="stable" version="0.8.2.1" date="2024-10-27T00:00:00Z">
|
||||||
|
<description>
|
||||||
|
<p>This release fixes the following bug:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Cannot load translations caused by a change in 0.8.2</li>
|
||||||
|
</ul>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
|
<release type="stable" version="0.8.2" date="2024-10-26T00:00:00Z">
|
||||||
|
<description>
|
||||||
|
<p>This release adds the following feature:</p>
|
||||||
|
<ul>
|
||||||
|
<li>New option to allow use light-color checkerboard by default</li>
|
||||||
|
</ul>
|
||||||
|
<p>With contributions from:</p>
|
||||||
|
<p>albanobattistella, mmahhi, gallegonovato</p>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
<release type="stable" version="0.8.1" date="2024-08-25T00:00:00Z">
|
<release type="stable" version="0.8.1" date="2024-08-25T00:00:00Z">
|
||||||
<description>
|
<description>
|
||||||
<p>This release adds the following feature:</p>
|
<p>This release adds the following feature:</p>
|
||||||
|
Reference in New Issue
Block a user