35 Commits

Author SHA1 Message Date
e52a6d8eed feat: new action for fit long image 2025-08-25 12:48:35 +08:00
8b0c8ec194 i18n: update ts files 2025-08-25 12:47:42 +08:00
1da7fff518 i18n: Translations update from Hosted Weblate (#159)
* Translated using Weblate (Italian)

Currently translated at 100.0% (167 of 167 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/it/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (167 of 167 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/nl/

---------

Co-authored-by: albanobattistella <albano_battistella@hotmail.com>
Co-authored-by: Heimen Stoffels <vistausss@fastmail.com>
2025-08-25 12:44:28 +08:00
e216592205 fix(CI): reuse lint 2025-08-24 14:08:00 +08:00
8fc9d06937 chore: add product version to windows build rc file 2025-08-24 13:53:14 +08:00
73b15da182 chore: remove gitee release page link from README.zh_CN.md 2025-08-23 15:24:00 +08:00
f4f7d93e38 chore: simplified long image mode code 2025-08-05 00:06:05 +08:00
591b01a83a i18n: update ts files 2025-08-04 21:56:58 +08:00
f8d3dcc899 feat: auto long image mode 2025-08-04 20:41:49 +08:00
f0ed9d0ca1 chore: update release info to 1.1.1 2025-08-02 13:30:14 +08:00
13227cfac9 i18n: Translations update from Hosted Weblate (#157)
* Translated using Weblate (Korean)

Currently translated at 100.0% (166 of 166 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/ko/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (166 of 166 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/nl/

---------

Co-authored-by: VenusGirl <VenusGirl@outlook.com>
Co-authored-by: Heimen Stoffels <vistausss@fastmail.com>
2025-08-01 23:44:43 +08:00
b73df5ea1a refactor: make fitByOrientation() more sane 2025-07-27 15:53:23 +08:00
4375fe1c2d chore: avoid use screenAt(QCursor::pos()) 2025-07-26 16:03:13 +08:00
4654cb21a0 fix: REUSE compliance 2025-07-23 21:29:18 +08:00
ba23208a7a chore: add config file for CRLF to LF change 2025-07-23 21:22:41 +08:00
ed5a602332 chore: let's use LF all the time 2025-07-23 21:20:34 +08:00
347681e604 feat(macOS): click dock icon to show window when it's hidden 2025-07-22 00:08:06 +08:00
505ab9e2a6 chore: update README 2025-07-11 19:41:09 +08:00
c787e14a69 chore(CI): bump exiv2 version for msvc build 2025-07-11 00:31:10 +08:00
29c5783a66 chore: update release info to 1.1.0 2025-07-06 00:05:52 +08:00
ddc75f7cd0 i18n: Translated using Weblate (Tamil) (#155)
Currently translated at 100.0% (166 of 166 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/ta/

Co-authored-by: தமிழ்நேரம் <anishprabu.t@gmail.com>
2025-07-05 23:19:32 +08:00
f976fea418 fix: shouldn't loop when navigate gallery via shortcuts
Related: https://github.com/BLumia/pineapple-pictures/issues/153
2025-06-29 16:24:26 +08:00
2846e4907b feat: support load m3u8 playlist
This change is sponsored by @superuser7777

Related: https://github.com/BLumia/pineapple-pictures/issues/153
2025-06-28 09:27:30 +08:00
c828f86b74 fix: FTBFS, and tidy code 2025-06-25 21:55:08 +08:00
040e2a7b5f i18n: update ts files 2025-06-25 21:47:31 +08:00
b566096b1f feat: option to disable gallery looping
This change is sponsored by @superuser7777

Related: https://github.com/BLumia/pineapple-pictures/issues/153
2025-06-25 20:55:42 +08:00
2bee79c064 i18n: update ts files 2025-06-22 15:14:08 +08:00
91696963ae i18n: Translations update from Hosted Weblate (#152)
* Translated using Weblate (Dutch)

Currently translated at 100.0% (164 of 164 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/nl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (164 of 164 strings)

Translation: pineapple-pictures/Application
Translate-URL: https://hosted.weblate.org/projects/pineapple-pictures/application/it/

---------

Co-authored-by: Heimen Stoffels <vistausss@fastmail.com>
Co-authored-by: albanobattistella <albano_battistella@hotmail.com>
2025-06-22 15:11:56 +08:00
1623ca315a feat: able to disable built-in close window animation 2025-06-22 15:04:15 +08:00
3cfb25db9a chore(CI): use Qt 6.9.1 2025-06-04 20:37:08 +08:00
36854d19f4 i18n: update ts files 2025-06-01 13:26:49 +08:00
3f7ebd2f6c chore: make use of Qt::Literals::StringLiterals u""_s
Migrate string literal handling to Qt’s built‐in `u""_s` literals for consistency and readability.
2025-05-31 13:10:21 +08:00
291a98ea97 fix(CI): macOS and Ubuntu CI FTBFS
macOS's CI uses conan to build exiv2, which seems still rely on
the exiv2lib target...
2025-05-24 23:19:26 +08:00
24a0b581f3 chore: drop Qt 5 support
The required exiv2 version is now 0.28.x as well since it was
keeped for Qt 5 build.

Due to exiv2ConfigVersion.cmake doesn't allow us write something
like find_package(exiv2 "0.28") to require version >= 0.28.0,
we simply don't put the required version number here for now.
2025-05-24 20:34:36 +08:00
369aa13be3 chore: correct feature list in release note 2025-05-11 13:56:38 +08:00
68 changed files with 7429 additions and 6699 deletions

3
.git-blame-ignore-revs Normal file
View File

@ -0,0 +1,3 @@
# .git-blame-ignore-revs
# CR LF to LF
ed5a6023326fd2ab420ded76976501be33e0b389

5
.gitattributes vendored Normal file
View File

@ -0,0 +1,5 @@
*.txt text eol=lf
*.cpp text eol=lf
*.h text eol=lf
*.ui text eol=lf
*.qml text eol=lf

View File

@ -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.9.1'
modules: 'qtimageformats' modules: 'qtimageformats'
- name: Install Conan and Dependencies - name: Install Conan and Dependencies
id: conan id: conan

View File

@ -3,30 +3,6 @@ name: Ubuntu CI
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
ubuntu-22-04-build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Get build dept.
run: |
sudo apt update
sudo apt install cmake qtbase5-dev libqt5svg5-dev qttools5-dev libexiv2-dev
- name: Build it
run: |
mkdir build
cd build
cmake ../ -DPREFER_QT_5=ON
make
cpack -G DEB
- name: Try install it
run: |
cd build
sudo apt install ./*.deb
- uses: actions/upload-artifact@v4
with:
name: ubuntu-22.04-deb-package
path: build/*.deb
ubuntu-24-04-build: ubuntu-24-04-build:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
@ -39,7 +15,7 @@ jobs:
run: | run: |
mkdir build mkdir build
cd build cd build
cmake ../ -DPREFER_QT_5=OFF cmake ../
make make
cpack -G DEB cpack -G DEB
- name: Try install it - name: Try install it

View File

@ -8,7 +8,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_ver: '6.9.0' - qt_ver: '6.9.1'
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.9.1'
vs: '2022' vs: '2022'
aqt_arch: 'win64_msvc2022_64' aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64' msvc_arch: 'x64'
@ -72,9 +72,9 @@ jobs:
set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin
mkdir dependencies_src mkdir dependencies_src
echo ::group::===== exiv2 ===== echo ::group::===== 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.5/exiv2-0.28.5-2022msvc-AMD64.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.5-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/zlib131.zip
@ -109,7 +109,7 @@ jobs:
echo ::endgroup:: echo ::endgroup::
echo ::group::===== 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 -DBUILD_TESTING=OFF -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:: echo ::endgroup::
echo ::group::===== KImageFormats ===== echo ::group::===== KImageFormats =====

2
.gitignore vendored
View File

@ -11,6 +11,8 @@
# Generic Build Dir # Generic Build Dir
[Bb]uild/ [Bb]uild/
cmake-build-*/
# IDE/Editor config folders # IDE/Editor config folders
.vscode/ .vscode/
.idea/

View File

@ -4,13 +4,12 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(pineapple-pictures VERSION 1.0.0) # don't forget to update NEWS file and AppStream metadata. project(pineapple-pictures VERSION 1.1.1) # don't forget to update NEWS file and AppStream metadata.
include(GNUInstallDirs) include(GNUInstallDirs)
include(FeatureSummary) include(FeatureSummary)
option (EXIV2_METADATA_SUPPORT "Better image metadata support via libexiv2" ON) option (EXIV2_METADATA_SUPPORT "Better image metadata support via libexiv2" ON)
option (PREFER_QT_5 "Prefer to use Qt 5" OFF)
option (TRANSLATION_RESOURCE_EMBEDDING "Embedding .qm translation files inside resource" OFF) option (TRANSLATION_RESOURCE_EMBEDDING "Embedding .qm translation files inside resource" OFF)
set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD 17)
@ -18,27 +17,15 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
set (CMAKE_AUTOMOC ON) set (CMAKE_AUTOMOC ON)
set (CMAKE_AUTORCC ON) set (CMAKE_AUTORCC ON)
if (PREFER_QT_5) find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
else ()
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
endif ()
if (${QT_VERSION_MAJOR} EQUAL "5") set (QT_MINIMUM_VERSION "6.4")
set (QT_MINIMUM_VERSION "5.15.2")
else ()
set (QT_MINIMUM_VERSION "6.4")
endif ()
find_package(Qt${QT_VERSION_MAJOR} ${QT_MINIMUM_VERSION} REQUIRED find_package(Qt${QT_VERSION_MAJOR} ${QT_MINIMUM_VERSION} REQUIRED
COMPONENTS Widgets Svg LinguistTools COMPONENTS Widgets Svg SvgWidgets LinguistTools
OPTIONAL_COMPONENTS DBus OPTIONAL_COMPONENTS DBus
) )
if (${QT_VERSION_MAJOR} EQUAL "6")
find_package(Qt${QT_DEFAULT_MAJOR_VERSION} ${QT_MINIMUM_VERSION} CONFIG REQUIRED SvgWidgets)
endif ()
if (EXIV2_METADATA_SUPPORT) if (EXIV2_METADATA_SUPPORT)
find_package(exiv2) find_package(exiv2)
set_package_properties(exiv2 PROPERTIES set_package_properties(exiv2 PROPERTIES
@ -107,7 +94,8 @@ file (GLOB PPIC_TS_FILES app/translations/*.ts)
set (PPIC_CPP_FILES_FOR_I18N ${PPIC_CPP_FILES}) set (PPIC_CPP_FILES_FOR_I18N ${PPIC_CPP_FILES})
if (WIN32) if (WIN32)
list(APPEND PPIC_RC_FILES assets/pineapple-pictures.rc) configure_file(assets/pineapple-pictures.rc.in pineapple-pictures.rc @ONLY)
list(APPEND PPIC_RC_FILES ${CMAKE_CURRENT_BINARY_DIR}/pineapple-pictures.rc)
endif () endif ()
add_executable (${EXE_NAME} add_executable (${EXE_NAME}
@ -117,32 +105,25 @@ add_executable (${EXE_NAME}
${PPIC_RC_FILES} ${PPIC_RC_FILES}
) )
if (${QT_VERSION_MAJOR} EQUAL "6") set(ADD_TRANSLATIONS_ADDITIONAL_ARGS)
set(ADD_TRANSLATIONS_ADDITIONAL_ARGS)
if (Qt6_VERSION VERSION_GREATER_EQUAL "6.9.0") if (Qt6_VERSION VERSION_GREATER_EQUAL "6.9.0")
set(ADD_TRANSLATIONS_ADDITIONAL_ARGS MERGE_QT_TRANSLATIONS) set(ADD_TRANSLATIONS_ADDITIONAL_ARGS MERGE_QT_TRANSLATIONS)
endif() endif()
if (TRANSLATION_RESOURCE_EMBEDDING) if (TRANSLATION_RESOURCE_EMBEDDING)
qt_add_translations(${EXE_NAME} ${ADD_TRANSLATIONS_ADDITIONAL_ARGS} TS_FILES ${PPIC_TS_FILES}) qt_add_translations(${EXE_NAME} ${ADD_TRANSLATIONS_ADDITIONAL_ARGS} TS_FILES ${PPIC_TS_FILES})
else()
qt_add_translations(${EXE_NAME} ${ADD_TRANSLATIONS_ADDITIONAL_ARGS} TS_FILES ${PPIC_TS_FILES} QM_FILES_OUTPUT_VARIABLE PPIC_QM_FILES)
endif()
else() else()
qt_create_translation(PPIC_QM_FILES ${PPIC_CPP_FILES_FOR_I18N} ${PPIC_TS_FILES}) qt_add_translations(${EXE_NAME} ${ADD_TRANSLATIONS_ADDITIONAL_ARGS} TS_FILES ${PPIC_TS_FILES} QM_FILES_OUTPUT_VARIABLE PPIC_QM_FILES)
endif() endif()
target_sources(${EXE_NAME} PRIVATE ${PPIC_QM_FILES}) target_sources(${EXE_NAME} PRIVATE ${PPIC_QM_FILES})
target_link_libraries (${EXE_NAME} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg) target_link_libraries (${EXE_NAME} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::SvgWidgets)
if (${QT_VERSION_MAJOR} EQUAL "6")
target_link_libraries (${EXE_NAME} Qt::SvgWidgets)
endif ()
if (exiv2_FOUND) if (exiv2_FOUND)
if(NOT TARGET Exiv2::exiv2lib AND TARGET exiv2lib) if(NOT TARGET Exiv2::exiv2lib AND TARGET exiv2lib)
# for exiv2 0.27.x # for exiv2 0.27.x and (macOS?) conan build
add_library(Exiv2::exiv2lib ALIAS exiv2lib) add_library(Exiv2::exiv2lib ALIAS exiv2lib)
endif() endif()
target_link_libraries (${EXE_NAME} target_link_libraries (${EXE_NAME}
@ -153,7 +134,7 @@ if (exiv2_FOUND)
) )
endif () endif ()
if (TARGET Qt5::DBus OR TARGET Qt6::DBus) if (TARGET Qt6::DBus)
target_link_libraries (${EXE_NAME} target_link_libraries (${EXE_NAME}
Qt${QT_VERSION_MAJOR}::DBus Qt${QT_VERSION_MAJOR}::DBus
) )

42
LICENSE
View File

@ -1,21 +1,21 @@
MIT License MIT License
Copyright (c) 2025 BLumia Copyright (c) 2025 BLumia
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software. copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.

35
NEWS
View File

@ -1,13 +1,44 @@
Version 1.1.1
~~~~~~~~~~~~~
Released: 2025-08-02
Features:
* Click dock icon should show window when it's hidden on macOS
Bugfixes:
* Ensure "Fit by Width" position the view to the beginning of the image
Miscellaneous:
* Update translations
* Update Exiv2 version for Windows binary build
Contributors:
Heimen Stoffels, VenusGirl, தமிழ்நேரம்
Version 1.1.0
~~~~~~~~~~~~~
Released: 2025-07-06
Features:
* New option to disable built-in close window animation
* New option to disable gallery looping
* Support load m3u8 as image gallery playlist
Miscellaneous:
* Drop Qt 5 support
Contributors:
Heimen Stoffels, albanobattistella, தமிழ்நேரம்
Version 1.0.0 Version 1.0.0
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
Released: 2025-05-03 Released: 2025-05-03
Features: Features:
* Support enforce windowed mode on start-up * Support enforces windowed mode on start-up
* Reload image automatically when current image gets updated * Reload image automatically when current image gets updated
Bugfixes: Bugfixes:
* Refer to the right exiv2 CMake module so it can be found on Linux
* Display correct text language on macOS * Display correct text language on macOS
Miscellaneous: Miscellaneous:

View File

@ -23,8 +23,7 @@ Pineapple Pictures is a lightweight image viewer that allows you view JPEG, PNG,
### Maintained by contributors / certain distro's package maintainers ### Maintained by contributors / certain distro's package maintainers
- Debian (since bullseye) or Ubuntu (since 21.04): `sudo apt install pineapple-pictures` [![Packaging status](https://repology.org/badge/vertical-allrepos/pineapple-pictures.svg?columns=4)](https://repology.org/project/pineapple-pictures/versions)
- Nix / NixOS: [pineapple-pictures](https://search.nixos.org/packages?channel=unstable&show=pineapple-pictures&from=0&size=50&sort=relevance&type=packages&query=pineapple-pictures) (maintained by @wineee)
## Help Translation! ## Help Translation!

View File

@ -16,7 +16,7 @@
### 由原作者维护 ### 由原作者维护
- [GitHub Release 页面](https://github.com/BLumia/pineapple-pictures/releases) | [gitee 发布页面](https://gitee.com/blumia/pineapple-pictures/releases) - [GitHub Release 页面](https://github.com/BLumia/pineapple-pictures/releases)
- [SourceForge](https://sourceforge.net/projects/pineapple-pictures/) - [SourceForge](https://sourceforge.net/projects/pineapple-pictures/)
- Archlinux AUR: [pineapple-pictures](https://aur.archlinux.org/packages/pineapple-pictures/) | [pineapple-pictures-git](https://aur.archlinux.org/packages/pineapple-pictures-git/) - Archlinux AUR: [pineapple-pictures](https://aur.archlinux.org/packages/pineapple-pictures/) | [pineapple-pictures-git](https://aur.archlinux.org/packages/pineapple-pictures-git/)
- [Itch.io 商店](https://blumia.itch.io/pineapple-pictures) - [Itch.io 商店](https://blumia.itch.io/pineapple-pictures)
@ -24,8 +24,7 @@
### 由贡献者/对应发行版的打包人员维护 ### 由贡献者/对应发行版的打包人员维护
- Debian (自 bullseye 起) 或 Ubuntu (自 21.04 起): `sudo apt install pineapple-pictures` [![打包状态](https://repology.org/badge/vertical-allrepos/pineapple-pictures.svg?columns=4)](https://repology.org/project/pineapple-pictures/versions)
- Nix / NixOS: [pineapple-pictures](https://search.nixos.org/packages?channel=unstable&show=pineapple-pictures&from=0&size=50&sort=relevance&type=packages&query=pineapple-pictures) (由 [@wineee](https://github.com/wineee) 维护)
## 帮助翻译! ## 帮助翻译!

View File

@ -1,33 +1,33 @@
version = 1 version = 1
SPDX-PackageName = "Pineapple Pictures" SPDX-PackageName = "Pineapple Pictures"
SPDX-PackageDownloadLocation = "https://github.com/BLumia/pineapple-pictures" SPDX-PackageDownloadLocation = "https://github.com/BLumia/pineapple-pictures"
[[annotations]] [[annotations]]
path = [".gitignore", "appveyor.yml", ".github/**"] path = [".gitattributes", ".git-blame-ignore-revs", ".gitignore", "appveyor.yml", ".github/**"]
precedence = "aggregate" precedence = "aggregate"
SPDX-FileCopyrightText = "None" SPDX-FileCopyrightText = "None"
SPDX-License-Identifier = "CC0-1.0" SPDX-License-Identifier = "CC0-1.0"
[[annotations]] [[annotations]]
path = ["README**.md", "NEWS", "assets/**.rc", "assets/**.qrc", "dist/**"] path = ["README**.md", "NEWS", "assets/**.rc.in", "assets/**.qrc", "dist/**"]
precedence = "aggregate" precedence = "aggregate"
SPDX-FileCopyrightText = "None" SPDX-FileCopyrightText = "None"
SPDX-License-Identifier = "CC0-1.0" SPDX-License-Identifier = "CC0-1.0"
[[annotations]] [[annotations]]
path = ["app/translations/**.ts", "assets/plain/translators.html"] path = ["app/translations/**.ts", "assets/plain/translators.html"]
precedence = "aggregate" precedence = "aggregate"
SPDX-FileCopyrightText = "Translators from hosted.weblate.org" SPDX-FileCopyrightText = "Translators from hosted.weblate.org"
SPDX-License-Identifier = "MIT" SPDX-License-Identifier = "MIT"
[[annotations]] [[annotations]]
path = "assets/icons/**.svg" path = "assets/icons/**.svg"
precedence = "aggregate" precedence = "aggregate"
SPDX-FileCopyrightText = "2022 Gary Wang" SPDX-FileCopyrightText = "2022 Gary Wang"
SPDX-License-Identifier = "MIT" SPDX-License-Identifier = "MIT"
[[annotations]] [[annotations]]
path = "assets/icons/app-icon.**" path = "assets/icons/app-icon.**"
precedence = "aggregate" precedence = "aggregate"
SPDX-FileCopyrightText = "2020 Lovelyblack" SPDX-FileCopyrightText = "2020 Lovelyblack"
SPDX-License-Identifier = "MIT" SPDX-License-Identifier = "MIT"

View File

@ -1,179 +1,181 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "aboutdialog.h" #include "aboutdialog.h"
#include <QAbstractButton> #include <QAbstractButton>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QTextBrowser> #include <QTextBrowser>
#include <QTabWidget> #include <QTabWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QApplication> #include <QApplication>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QFile> #include <QFile>
AboutDialog::AboutDialog(QWidget *parent) using namespace Qt::Literals::StringLiterals;
: QDialog(parent)
, m_tabWidget(new QTabWidget) AboutDialog::AboutDialog(QWidget *parent)
, m_buttonBox(new QDialogButtonBox) : QDialog(parent)
, m_helpTextEdit(new QTextBrowser) , m_tabWidget(new QTabWidget)
, m_aboutTextEdit(new QTextBrowser) , m_buttonBox(new QDialogButtonBox)
, m_specialThanksTextEdit(new QTextBrowser) , m_helpTextEdit(new QTextBrowser)
, m_licenseTextEdit(new QTextBrowser) , m_aboutTextEdit(new QTextBrowser)
, m_3rdPartyLibsTextEdit(new QTextBrowser) , m_specialThanksTextEdit(new QTextBrowser)
{ , m_licenseTextEdit(new QTextBrowser)
this->setWindowTitle(tr("About")); , m_3rdPartyLibsTextEdit(new QTextBrowser)
{
const QStringList helpStr { this->setWindowTitle(tr("About"));
QStringLiteral("<p>%1</p>").arg(tr("Launch application with image file path as argument to load the file.")),
QStringLiteral("<p>%1</p>").arg(tr("Drag and drop image file onto the window is also supported.")), const QStringList helpStr {
QStringLiteral("<p>%1</p>").arg(tr("None of the operations in this application will alter the pictures on disk.")), u"<p>%1</p>"_s.arg(tr("Launch application with image file path as argument to load the file.")),
QStringLiteral("<p>%1</p>").arg(tr("Context menu option explanation:")), u"<p>%1</p>"_s.arg(tr("Drag and drop image file onto the window is also supported.")),
QStringLiteral("<ul>"), u"<p>%1</p>"_s.arg(tr("None of the operations in this application will alter the pictures on disk.")),
// blumia: Chain two arg() here since it seems lupdate will remove one of them if we use u"<p>%1</p>"_s.arg(tr("Context menu option explanation:")),
// the old `arg(QCoreApp::translate(), tr())` way, but it's worth to mention u"<ul>"_s,
// `arg(QCoreApp::translate(), this->tr())` works, but lupdate will complain about the usage. // blumia: Chain two arg() here since it seems lupdate will remove one of them if we use
QStringLiteral("<li><b>%1</b>:<br/>%2</li>") // the old `arg(QCoreApp::translate(), tr())` way, but it's worth to mention
.arg(QCoreApplication::translate("MainWindow", "Stay on top")) // `arg(QCoreApp::translate(), this->tr())` works, but lupdate will complain about the usage.
.arg(tr("Make window stay on top of all other windows.")), u"<li><b>%1</b>:<br/>%2</li>"_s
QStringLiteral("<li><b>%1</b>:<br/>%2</li>") .arg(QCoreApplication::translate("MainWindow", "Stay on top"))
.arg(QCoreApplication::translate("MainWindow", "Protected mode")) .arg(tr("Make window stay on top of all other windows.")),
.arg(tr("Avoid close window accidentally. (eg. by double clicking the window)")), u"<li><b>%1</b>:<br/>%2</li>"_s
QStringLiteral("<li><b>%1</b>:<br/>%2</li>") .arg(QCoreApplication::translate("MainWindow", "Protected mode"))
.arg(QCoreApplication::translate("MainWindow", "Keep transformation", "The 'transformation' means the flip/rotation status that currently applied to the image view")) .arg(tr("Avoid close window accidentally. (eg. by double clicking the window)")),
.arg(tr("Avoid resetting the zoom/rotation/flip state that was applied to the image view when switching between images.")), u"<li><b>%1</b>:<br/>%2</li>"_s
QStringLiteral("</ul>") .arg(QCoreApplication::translate("MainWindow", "Keep transformation", "The 'transformation' means the flip/rotation status that currently applied to the image view"))
}; .arg(tr("Avoid resetting the zoom/rotation/flip state that was applied to the image view when switching between images.")),
u"</ul>"_s
const QStringList aboutStr { };
QStringLiteral("<center><img width='128' height='128' src=':/icons/app-icon.svg'/><br/>"),
qApp->applicationDisplayName(), const QStringList aboutStr {
(QStringLiteral("<br/>") + tr("Version: %1").arg( u"<center><img width='128' height='128' src=':/icons/app-icon.svg'/><br/>"_s,
#ifdef GIT_DESCRIBE_VERSION_STRING qApp->applicationDisplayName(),
GIT_DESCRIBE_VERSION_STRING (u"<br/>"_s + tr("Version: %1").arg(
#else #ifdef GIT_DESCRIBE_VERSION_STRING
qApp->applicationVersion() GIT_DESCRIBE_VERSION_STRING
#endif // GIT_DESCRIBE_VERSION_STRING #else
)), qApp->applicationVersion()
QStringLiteral("<hr/>"), #endif // GIT_DESCRIBE_VERSION_STRING
tr("Copyright (c) %1 %2", "%1 is year, %2 is the name of copyright holder(s)") )),
.arg(QStringLiteral("2025"), QStringLiteral("<a href='https://github.com/BLumia'>@BLumia</a>")), u"<hr/>"_s,
QStringLiteral("<br/>"), tr("Copyright (c) %1 %2", "%1 is year, %2 is the name of copyright holder(s)")
tr("Logo designed by %1").arg(QStringLiteral("<a href='https://github.com/Lovelyblack'>@Lovelyblack</a>")), .arg(u"2025"_s, u"<a href='https://github.com/BLumia'>@BLumia</a>"_s),
QStringLiteral("<hr/>"), u"<br/>"_s,
tr("Built with Qt %1 (%2)").arg(QT_VERSION_STR, QSysInfo::buildCpuArchitecture()), tr("Logo designed by %1").arg(u"<a href='https://github.com/Lovelyblack'>@Lovelyblack</a>"_s),
QStringLiteral("<br/><a href='%1'>%2</a>").arg("https://github.com/BLumia/pineapple-pictures", tr("Source code")), u"<hr/>"_s,
QStringLiteral("</center>") tr("Built with Qt %1 (%2)").arg(QT_VERSION_STR, QSysInfo::buildCpuArchitecture()),
}; QStringLiteral("<br/><a href='%1'>%2</a>").arg("https://github.com/BLumia/pineapple-pictures", tr("Source code")),
u"</center>"_s
QFile translaterHtml(":/plain/translators.html"); };
bool canOpenFile = translaterHtml.open(QIODevice::ReadOnly);
const QByteArray & translatorList = canOpenFile ? translaterHtml.readAll() : QByteArrayLiteral(""); QFile translaterHtml(u":/plain/translators.html"_s);
bool canOpenFile = translaterHtml.open(QIODevice::ReadOnly);
const QStringList specialThanksStr { const QByteArray & translatorList = canOpenFile ? translaterHtml.readAll() : QByteArrayLiteral("");
QStringLiteral("<h1 align='center'>%1</h1><a href='%2'>%3</a><p>%4</p>").arg(
tr("Contributors"), const QStringList specialThanksStr {
QStringLiteral("https://github.com/BLumia/pineapple-pictures/graphs/contributors"), u"<h1 align='center'>%1</h1><a href='%2'>%3</a><p>%4</p>"_s.arg(
tr("List of contributors on GitHub"), tr("Contributors"),
tr("Thanks to all people who contributed to this project.") u"https://github.com/BLumia/pineapple-pictures/graphs/contributors"_s,
), tr("List of contributors on GitHub"),
tr("Thanks to all people who contributed to this project.")
QStringLiteral("<h1 align='center'>%1</h1><p>%2</p>%3").arg( ),
tr("Translators"),
tr("I would like to thank the following people who volunteered to translate this application."), u"<h1 align='center'>%1</h1><p>%2</p>%3"_s.arg(
translatorList tr("Translators"),
) tr("I would like to thank the following people who volunteered to translate this application."),
}; translatorList
)
const QStringList licenseStr { };
QStringLiteral("<h1 align='center'><b>%1</b></h1>").arg(tr("Your Rights")),
QStringLiteral("<p>%1</p><p>%2</p><ul><li>%3</li><li>%4</li><li>%5</li><li>%6</li></ul>").arg( const QStringList licenseStr {
tr("%1 is released under the MIT License."), // %1 u"<h1 align='center'><b>%1</b></h1>"_s.arg(tr("Your Rights")),
tr("This license grants people a number of freedoms:"), // %2 u"<p>%1</p><p>%2</p><ul><li>%3</li><li>%4</li><li>%5</li><li>%6</li></ul>"_s.arg(
tr("You are free to use %1, for any purpose"), // %3 tr("%1 is released under the MIT License."), // %1
tr("You are free to distribute %1"), // %4 tr("This license grants people a number of freedoms:"), // %2
tr("You can study how %1 works and change it"), // %5 tr("You are free to use %1, for any purpose"), // %3
tr("You can distribute changed versions of %1") // %6 tr("You are free to distribute %1"), // %4
).arg(QStringLiteral("<i>%1</i>")), tr("You can study how %1 works and change it"), // %5
QStringLiteral("<p>%1</p>").arg(tr("The MIT license guarantees you this freedom. Nobody is ever permitted to take it away.")), tr("You can distribute changed versions of %1") // %6
QStringLiteral("<hr/><pre>%2</pre>") ).arg(u"<i>%1</i>"_s),
}; u"<p>%1</p>"_s.arg(tr("The MIT license guarantees you this freedom. Nobody is ever permitted to take it away.")),
u"<hr/><pre>%2</pre>"_s
const QString mitLicense(QStringLiteral(R"(Expat/MIT License };
Copyright (c) 2025 BLumia const QString mitLicense(QStringLiteral(R"(Expat/MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy Copyright (c) 2025 BLumia
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights Permission is hereby granted, free of charge, to any person obtaining a copy
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell of this software and associated documentation files (the "Software"), to deal
copies of the Software, and to permit persons to whom the Software is in the Software without restriction, including without limitation the rights
furnished to do so, subject to the following conditions: to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
The above copyright notice and this permission notice shall be included in all furnished to do so, subject to the following conditions:
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR copies or substantial portions of the Software.
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
SOFTWARE. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
)")); OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
const QStringList thirdPartyLibsStr { )"));
QStringLiteral("<h1 align='center'><b>%1</b></h1>").arg(tr("Third-party Libraries used by %1")),
tr("%1 is built on the following free software libraries:", "Free as in freedom"), const QStringList thirdPartyLibsStr {
QStringLiteral("<ul>"), u"<h1 align='center'><b>%1</b></h1>"_s.arg(tr("Third-party Libraries used by %1")),
#ifdef HAVE_EXIV2_VERSION tr("%1 is built on the following free software libraries:", "Free as in freedom"),
QStringLiteral("<li><a href='%1'>%2</a>: %3</li>").arg("https://www.exiv2.org/", "Exiv2", "GPLv2"), u"<ul>"_s,
#endif // EXIV2_VERSION #ifdef HAVE_EXIV2_VERSION
QStringLiteral("<li><a href='%1'>%2</a>: %3</li>").arg("https://www.qt.io/", "Qt", "GPLv2 + GPLv3 + LGPLv2.1 + LGPLv3"), u"<li><a href='%1'>%2</a>: %3</li>"_s.arg("https://www.exiv2.org/", "Exiv2", "GPLv2"),
QStringLiteral("</ul>") #endif // EXIV2_VERSION
}; u"<li><a href='%1'>%2</a>: %3</li>"_s.arg("https://www.qt.io/", "Qt", "GPLv2 + GPLv3 + LGPLv2.1 + LGPLv3"),
u"</ul>"_s
m_helpTextEdit->setText(helpStr.join('\n')); };
m_aboutTextEdit->setText(aboutStr.join('\n')); m_helpTextEdit->setText(helpStr.join('\n'));
m_aboutTextEdit->setOpenExternalLinks(true);
m_aboutTextEdit->setText(aboutStr.join('\n'));
m_specialThanksTextEdit->setText(specialThanksStr.join('\n')); m_aboutTextEdit->setOpenExternalLinks(true);
m_specialThanksTextEdit->setOpenExternalLinks(true);
m_specialThanksTextEdit->setText(specialThanksStr.join('\n'));
m_licenseTextEdit->setText(licenseStr.join('\n').arg(qApp->applicationDisplayName(), mitLicense)); m_specialThanksTextEdit->setOpenExternalLinks(true);
m_3rdPartyLibsTextEdit->setText(thirdPartyLibsStr.join('\n').arg(QStringLiteral("<i>%1</i>").arg(qApp->applicationDisplayName()))); m_licenseTextEdit->setText(licenseStr.join('\n').arg(qApp->applicationDisplayName(), mitLicense));
m_3rdPartyLibsTextEdit->setOpenExternalLinks(true);
m_3rdPartyLibsTextEdit->setText(thirdPartyLibsStr.join('\n').arg(u"<i>%1</i>"_s).arg(qApp->applicationDisplayName()));
m_tabWidget->addTab(m_helpTextEdit, tr("&Help")); m_3rdPartyLibsTextEdit->setOpenExternalLinks(true);
m_tabWidget->addTab(m_aboutTextEdit, tr("&About"));
m_tabWidget->addTab(m_specialThanksTextEdit, tr("&Special Thanks")); m_tabWidget->addTab(m_helpTextEdit, tr("&Help"));
m_tabWidget->addTab(m_licenseTextEdit, tr("&License")); m_tabWidget->addTab(m_aboutTextEdit, tr("&About"));
m_tabWidget->addTab(m_3rdPartyLibsTextEdit, tr("&Third-party Libraries")); m_tabWidget->addTab(m_specialThanksTextEdit, tr("&Special Thanks"));
m_tabWidget->addTab(m_licenseTextEdit, tr("&License"));
m_buttonBox->setStandardButtons(QDialogButtonBox::Close); m_tabWidget->addTab(m_3rdPartyLibsTextEdit, tr("&Third-party Libraries"));
connect(m_buttonBox, QOverload<QAbstractButton *>::of(&QDialogButtonBox::clicked), this, [this](){
this->close(); m_buttonBox->setStandardButtons(QDialogButtonBox::Close);
}); connect(m_buttonBox, QOverload<QAbstractButton *>::of(&QDialogButtonBox::clicked), this, [this](){
this->close();
setLayout(new QVBoxLayout); });
layout()->addWidget(m_tabWidget); setLayout(new QVBoxLayout);
layout()->addWidget(m_buttonBox);
layout()->addWidget(m_tabWidget);
setMinimumSize(361, 161); // not sure why it complain "Unable to set geometry" layout()->addWidget(m_buttonBox);
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
} setMinimumSize(361, 161); // not sure why it complain "Unable to set geometry"
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
AboutDialog::~AboutDialog() }
{
AboutDialog::~AboutDialog()
} {
QSize AboutDialog::sizeHint() const }
{
return QSize(520, 350); QSize AboutDialog::sizeHint() const
} {
return QSize(520, 350);
}

View File

@ -1,36 +1,36 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef ABOUTDIALOG_H #ifndef ABOUTDIALOG_H
#define ABOUTDIALOG_H #define ABOUTDIALOG_H
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QTextBrowser; class QTextBrowser;
class QTabWidget; class QTabWidget;
class QDialogButtonBox; class QDialogButtonBox;
QT_END_NAMESPACE QT_END_NAMESPACE
class AboutDialog : public QDialog class AboutDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit AboutDialog(QWidget *parent = nullptr); explicit AboutDialog(QWidget *parent = nullptr);
~AboutDialog() override; ~AboutDialog() override;
QSize sizeHint() const override; QSize sizeHint() const override;
private: private:
QTabWidget * m_tabWidget = nullptr; QTabWidget * m_tabWidget = nullptr;
QDialogButtonBox * m_buttonBox = nullptr; QDialogButtonBox * m_buttonBox = nullptr;
QTextBrowser * m_helpTextEdit = nullptr; QTextBrowser * m_helpTextEdit = nullptr;
QTextBrowser * m_aboutTextEdit = nullptr; QTextBrowser * m_aboutTextEdit = nullptr;
QTextBrowser * m_specialThanksTextEdit = nullptr; QTextBrowser * m_specialThanksTextEdit = nullptr;
QTextBrowser * m_licenseTextEdit = nullptr; QTextBrowser * m_licenseTextEdit = nullptr;
QTextBrowser * m_3rdPartyLibsTextEdit = nullptr; QTextBrowser * m_3rdPartyLibsTextEdit = nullptr;
}; };
#endif // ABOUTDIALOG_H #endif // ABOUTDIALOG_H

View File

@ -1,163 +1,155 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "actionmanager.h" #include "actionmanager.h"
#include "mainwindow.h" #include "mainwindow.h"
#include <QGuiApplication> #include <QGuiApplication>
#include <QSvgRenderer> #include <QSvgRenderer>
#include <QPainter> #include <QPainter>
#define ICON_NAME(name)\ #define ICON_NAME(name)\
QStringLiteral(":/icons/" #name ".svg") QStringLiteral(":/icons/" #name ".svg")
#define ACTION_NAME(s) QStringLiteral(STRIFY(s)) #define ACTION_NAME(s) QStringLiteral(STRIFY(s))
#define STRIFY(s) #s #define STRIFY(s) #s
ActionManager::ActionManager() QIcon ActionManager::loadHidpiIcon(const QString &resp, QSize sz)
{ {
QSvgRenderer r(resp);
} QPixmap pm = QPixmap(sz * qApp->devicePixelRatio());
pm.fill(Qt::transparent);
ActionManager::~ActionManager() QPainter p(&pm);
{ r.render(&p);
pm.setDevicePixelRatio(qApp->devicePixelRatio());
} return QIcon(pm);
}
QIcon ActionManager::loadHidpiIcon(const QString &resp, QSize sz)
{ void ActionManager::setupAction(MainWindow *mainWindow)
QSvgRenderer r(resp); {
QPixmap pm = QPixmap(sz * qApp->devicePixelRatio()); auto create_action = [] (QWidget *w, QAction **a, QString i, QString an, bool iconFromTheme = false) {
pm.fill(Qt::transparent); *a = new QAction(w);
QPainter p(&pm); if (!i.isNull())
r.render(&p); (*a)->setIcon(iconFromTheme ? QIcon::fromTheme(i) : ActionManager::loadHidpiIcon(i));
pm.setDevicePixelRatio(qApp->devicePixelRatio()); (*a)->setObjectName(an);
return QIcon(pm); w->addAction(*a);
} };
#define CREATE_NEW_ICON_ACTION(w, a, i) create_action(w, &a, ICON_NAME(i), ACTION_NAME(a))
void ActionManager::setupAction(MainWindow *mainWindow) CREATE_NEW_ICON_ACTION(mainWindow, actionActualSize, zoom-original);
{ CREATE_NEW_ICON_ACTION(mainWindow, actionToggleMaximize, view-fullscreen);
auto create_action = [] (QWidget *w, QAction **a, QString i, QString an, bool iconFromTheme = false) { CREATE_NEW_ICON_ACTION(mainWindow, actionZoomIn, zoom-in);
*a = new QAction(w); CREATE_NEW_ICON_ACTION(mainWindow, actionZoomOut, zoom-out);
if (!i.isNull()) CREATE_NEW_ICON_ACTION(mainWindow, actionToggleCheckerboard, view-background-checkerboard);
(*a)->setIcon(iconFromTheme ? QIcon::fromTheme(i) : ActionManager::loadHidpiIcon(i)); CREATE_NEW_ICON_ACTION(mainWindow, actionRotateClockwise, object-rotate-right);
(*a)->setObjectName(an); #undef CREATE_NEW_ICON_ACTION
w->addAction(*a);
}; #define CREATE_NEW_ACTION(w, a) create_action(w, &a, QString(), ACTION_NAME(a))
#define CREATE_NEW_ICON_ACTION(w, a, i) create_action(w, &a, ICON_NAME(i), ACTION_NAME(a)) #define CREATE_NEW_THEMEICON_ACTION(w, a, i) create_action(w, &a, QLatin1String(STRIFY(i)), ACTION_NAME(a), true)
CREATE_NEW_ICON_ACTION(mainWindow, actionActualSize, zoom-original); CREATE_NEW_ACTION(mainWindow, actionRotateCounterClockwise);
CREATE_NEW_ICON_ACTION(mainWindow, actionToggleMaximize, view-fullscreen); CREATE_NEW_ACTION(mainWindow, actionPrevPicture);
CREATE_NEW_ICON_ACTION(mainWindow, actionZoomIn, zoom-in); CREATE_NEW_ACTION(mainWindow, actionNextPicture);
CREATE_NEW_ICON_ACTION(mainWindow, actionZoomOut, zoom-out);
CREATE_NEW_ICON_ACTION(mainWindow, actionToggleCheckerboard, view-background-checkerboard); CREATE_NEW_ACTION(mainWindow, actionTogglePauseAnimation);
CREATE_NEW_ICON_ACTION(mainWindow, actionRotateClockwise, object-rotate-right); CREATE_NEW_ACTION(mainWindow, actionAnimationNextFrame);
#undef CREATE_NEW_ICON_ACTION
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionOpen, document-open);
#define CREATE_NEW_ACTION(w, a) create_action(w, &a, QString(), ACTION_NAME(a)) CREATE_NEW_ACTION(mainWindow, actionHorizontalFlip);
#define CREATE_NEW_THEMEICON_ACTION(w, a, i) create_action(w, &a, QLatin1String(STRIFY(i)), ACTION_NAME(a), true) CREATE_NEW_ACTION(mainWindow, actionFitInView);
CREATE_NEW_ACTION(mainWindow, actionRotateCounterClockwise); CREATE_NEW_ACTION(mainWindow, actionFitByWidth);
CREATE_NEW_ACTION(mainWindow, actionPrevPicture); CREATE_NEW_ACTION(mainWindow, actionFitLongImage);
CREATE_NEW_ACTION(mainWindow, actionNextPicture); CREATE_NEW_THEMEICON_ACTION(mainWindow, actionCopyPixmap, edit-copy);
CREATE_NEW_ACTION(mainWindow, actionCopyFilePath);
CREATE_NEW_ACTION(mainWindow, actionTogglePauseAnimation); CREATE_NEW_THEMEICON_ACTION(mainWindow, actionPaste, edit-paste);
CREATE_NEW_ACTION(mainWindow, actionAnimationNextFrame); CREATE_NEW_THEMEICON_ACTION(mainWindow, actionTrash, edit-delete);
CREATE_NEW_ACTION(mainWindow, actionToggleStayOnTop);
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionOpen, document-open); CREATE_NEW_ACTION(mainWindow, actionToggleProtectMode);
CREATE_NEW_ACTION(mainWindow, actionHorizontalFlip); CREATE_NEW_ACTION(mainWindow, actionToggleAvoidResetTransform);
CREATE_NEW_ACTION(mainWindow, actionFitInView); CREATE_NEW_ACTION(mainWindow, actionSettings);
CREATE_NEW_ACTION(mainWindow, actionFitByWidth); CREATE_NEW_THEMEICON_ACTION(mainWindow, actionHelp, system-help);
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionCopyPixmap, edit-copy); CREATE_NEW_THEMEICON_ACTION(mainWindow, actionLocateInFileManager, system-file-manager);
CREATE_NEW_ACTION(mainWindow, actionCopyFilePath); CREATE_NEW_THEMEICON_ACTION(mainWindow, actionProperties, document-properties);
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionPaste, edit-paste); CREATE_NEW_ACTION(mainWindow, actionQuitApp);
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionTrash, edit-delete); #undef CREATE_NEW_ACTION
CREATE_NEW_ACTION(mainWindow, actionToggleStayOnTop); #undef CREATE_NEW_THEMEICON_ACTION
CREATE_NEW_ACTION(mainWindow, actionToggleProtectMode);
CREATE_NEW_ACTION(mainWindow, actionToggleAvoidResetTransform); retranslateUi(mainWindow);
CREATE_NEW_ACTION(mainWindow, actionSettings);
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionHelp, system-help); QMetaObject::connectSlotsByName(mainWindow);
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionLocateInFileManager, system-file-manager); }
CREATE_NEW_THEMEICON_ACTION(mainWindow, actionProperties, document-properties);
CREATE_NEW_ACTION(mainWindow, actionQuitApp); void ActionManager::retranslateUi(MainWindow *mainWindow)
#undef CREATE_NEW_ACTION {
#undef CREATE_NEW_THEMEICON_ACTION Q_UNUSED(mainWindow);
retranslateUi(mainWindow); actionOpen->setText(QCoreApplication::translate("MainWindow", "&Open...", nullptr));
QMetaObject::connectSlotsByName(mainWindow); actionActualSize->setText(QCoreApplication::translate("MainWindow", "Actual size", nullptr));
} actionToggleMaximize->setText(QCoreApplication::translate("MainWindow", "Toggle maximize", nullptr));
actionZoomIn->setText(QCoreApplication::translate("MainWindow", "Zoom in", nullptr));
void ActionManager::retranslateUi(MainWindow *mainWindow) actionZoomOut->setText(QCoreApplication::translate("MainWindow", "Zoom out", nullptr));
{ actionToggleCheckerboard->setText(QCoreApplication::translate("MainWindow", "Toggle Checkerboard", nullptr));
Q_UNUSED(mainWindow); actionRotateClockwise->setText(QCoreApplication::translate("MainWindow", "Rotate right", nullptr));
actionRotateCounterClockwise->setText(QCoreApplication::translate("MainWindow", "Rotate left", nullptr));
actionOpen->setText(QCoreApplication::translate("MainWindow", "&Open...", nullptr));
actionPrevPicture->setText(QCoreApplication::translate("MainWindow", "Previous image", nullptr));
actionActualSize->setText(QCoreApplication::translate("MainWindow", "Actual size", nullptr)); actionNextPicture->setText(QCoreApplication::translate("MainWindow", "Next image", nullptr));
actionToggleMaximize->setText(QCoreApplication::translate("MainWindow", "Toggle maximize", nullptr));
actionZoomIn->setText(QCoreApplication::translate("MainWindow", "Zoom in", nullptr)); actionTogglePauseAnimation->setText(QCoreApplication::translate("MainWindow", "Pause/Resume Animation", nullptr));
actionZoomOut->setText(QCoreApplication::translate("MainWindow", "Zoom out", nullptr)); actionAnimationNextFrame->setText(QCoreApplication::translate("MainWindow", "Animation Go to Next Frame", nullptr));
actionToggleCheckerboard->setText(QCoreApplication::translate("MainWindow", "Toggle Checkerboard", nullptr));
actionRotateClockwise->setText(QCoreApplication::translate("MainWindow", "Rotate right", nullptr)); actionHorizontalFlip->setText(QCoreApplication::translate("MainWindow", "Flip &Horizontally", nullptr));
actionRotateCounterClockwise->setText(QCoreApplication::translate("MainWindow", "Rotate left", nullptr)); actionFitInView->setText(QCoreApplication::translate("MainWindow", "Fit to view", nullptr));
actionFitByWidth->setText(QCoreApplication::translate("MainWindow", "Fit to width", nullptr));
actionPrevPicture->setText(QCoreApplication::translate("MainWindow", "Previous image", nullptr)); actionFitLongImage->setText(QCoreApplication::translate("MainWindow", "Fit long image", nullptr));
actionNextPicture->setText(QCoreApplication::translate("MainWindow", "Next image", nullptr)); actionCopyPixmap->setText(QCoreApplication::translate("MainWindow", "Copy P&ixmap", nullptr));
actionCopyFilePath->setText(QCoreApplication::translate("MainWindow", "Copy &File Path", nullptr));
actionTogglePauseAnimation->setText(QCoreApplication::translate("MainWindow", "Pause/Resume Animation", nullptr)); actionPaste->setText(QCoreApplication::translate("MainWindow", "&Paste", nullptr));
actionAnimationNextFrame->setText(QCoreApplication::translate("MainWindow", "Animation Go to Next Frame", nullptr)); actionTrash->setText(QCoreApplication::translate("MainWindow", "Move to Trash", nullptr));
actionToggleStayOnTop->setText(QCoreApplication::translate("MainWindow", "Stay on top", nullptr));
actionHorizontalFlip->setText(QCoreApplication::translate("MainWindow", "Flip &Horizontally", nullptr)); actionToggleProtectMode->setText(QCoreApplication::translate("MainWindow", "Protected mode", nullptr));
actionFitInView->setText(QCoreApplication::translate("MainWindow", "Fit to view", nullptr)); actionToggleAvoidResetTransform->setText(QCoreApplication::translate("MainWindow", "Keep transformation", "The 'transformation' means the flip/rotation status that currently applied to the image view"));
actionFitByWidth->setText(QCoreApplication::translate("MainWindow", "Fit to width", nullptr)); actionSettings->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr));
actionCopyPixmap->setText(QCoreApplication::translate("MainWindow", "Copy P&ixmap", nullptr)); actionHelp->setText(QCoreApplication::translate("MainWindow", "Help", nullptr));
actionCopyFilePath->setText(QCoreApplication::translate("MainWindow", "Copy &File Path", nullptr)); #ifdef Q_OS_WIN
actionPaste->setText(QCoreApplication::translate("MainWindow", "&Paste", nullptr)); actionLocateInFileManager->setText(
actionTrash->setText(QCoreApplication::translate("MainWindow", "Move to Trash", nullptr)); QCoreApplication::translate(
actionToggleStayOnTop->setText(QCoreApplication::translate("MainWindow", "Stay on top", nullptr)); "MainWindow", "Show in File Explorer",
actionToggleProtectMode->setText(QCoreApplication::translate("MainWindow", "Protected mode", nullptr)); "File Explorer is the name of explorer.exe under Windows"
actionToggleAvoidResetTransform->setText(QCoreApplication::translate("MainWindow", "Keep transformation", "The 'transformation' means the flip/rotation status that currently applied to the image view")); )
actionSettings->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr)); );
actionHelp->setText(QCoreApplication::translate("MainWindow", "Help", nullptr)); #else
#ifdef Q_OS_WIN actionLocateInFileManager->setText(QCoreApplication::translate("MainWindow", "Show in directory", nullptr));
actionLocateInFileManager->setText( #endif // Q_OS_WIN
QCoreApplication::translate( actionProperties->setText(QCoreApplication::translate("MainWindow", "Properties", nullptr));
"MainWindow", "Show in File Explorer", actionQuitApp->setText(QCoreApplication::translate("MainWindow", "Quit", nullptr));
"File Explorer is the name of explorer.exe under Windows" }
)
); void ActionManager::setupShortcuts()
#else {
actionLocateInFileManager->setText(QCoreApplication::translate("MainWindow", "Show in directory", nullptr)); actionOpen->setShortcut(QKeySequence::Open);
#endif // Q_OS_WIN actionActualSize->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
actionProperties->setText(QCoreApplication::translate("MainWindow", "Properties", nullptr)); actionZoomIn->setShortcut(QKeySequence::ZoomIn);
actionQuitApp->setText(QCoreApplication::translate("MainWindow", "Quit", nullptr)); actionZoomOut->setShortcut(QKeySequence::ZoomOut);
} actionPrevPicture->setShortcuts({
QKeySequence(Qt::Key_PageUp),
void ActionManager::setupShortcuts() QKeySequence(Qt::Key_Left),
{ });
actionOpen->setShortcut(QKeySequence::Open); actionNextPicture->setShortcuts({
actionActualSize->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0)); QKeySequence(Qt::Key_PageDown),
actionZoomIn->setShortcut(QKeySequence::ZoomIn); QKeySequence(Qt::Key_Right),
actionZoomOut->setShortcut(QKeySequence::ZoomOut); });
actionPrevPicture->setShortcuts({ actionHorizontalFlip->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R));
QKeySequence(Qt::Key_PageUp), actionCopyPixmap->setShortcut(QKeySequence::Copy);
QKeySequence(Qt::Key_Left), actionPaste->setShortcut(QKeySequence::Paste);
}); actionTrash->setShortcut(QKeySequence::Delete);
actionNextPicture->setShortcuts({ actionHelp->setShortcut(QKeySequence::HelpContents);
QKeySequence(Qt::Key_PageDown), actionSettings->setShortcut(QKeySequence::Preferences);
QKeySequence(Qt::Key_Right), actionProperties->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
}); actionQuitApp->setShortcuts({
actionHorizontalFlip->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R)); QKeySequence(Qt::Key_Space),
actionCopyPixmap->setShortcut(QKeySequence::Copy); QKeySequence(Qt::Key_Escape)
actionPaste->setShortcut(QKeySequence::Paste); });
actionTrash->setShortcut(QKeySequence::Delete); }
actionHelp->setShortcut(QKeySequence::HelpContents);
actionSettings->setShortcut(QKeySequence::Preferences);
actionProperties->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
actionQuitApp->setShortcuts({
QKeySequence(Qt::Key_Space),
QKeySequence(Qt::Key_Escape)
});
}

View File

@ -1,58 +1,59 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef ACTIONMANAGER_H #ifndef ACTIONMANAGER_H
#define ACTIONMANAGER_H #define ACTIONMANAGER_H
#include <QAction> #include <QAction>
class MainWindow; class MainWindow;
class ActionManager class ActionManager
{ {
public: public:
ActionManager(); explicit ActionManager() = default;
~ActionManager(); ~ActionManager() = default;
void setupAction(MainWindow * mainWindow); void setupAction(MainWindow * mainWindow);
void retranslateUi(MainWindow *MainWindow); void retranslateUi(MainWindow *MainWindow);
void setupShortcuts(); void setupShortcuts();
static QIcon loadHidpiIcon(const QString &resp, QSize sz = QSize(32, 32)); static QIcon loadHidpiIcon(const QString &resp, QSize sz = QSize(32, 32));
public: public:
QAction *actionOpen; QAction *actionOpen;
QAction *actionActualSize; QAction *actionActualSize;
QAction *actionToggleMaximize; QAction *actionToggleMaximize;
QAction *actionZoomIn; QAction *actionZoomIn;
QAction *actionZoomOut; QAction *actionZoomOut;
QAction *actionToggleCheckerboard; QAction *actionToggleCheckerboard;
QAction *actionRotateClockwise; QAction *actionRotateClockwise;
QAction *actionRotateCounterClockwise; QAction *actionRotateCounterClockwise;
QAction *actionPrevPicture; QAction *actionPrevPicture;
QAction *actionNextPicture; QAction *actionNextPicture;
QAction *actionTogglePauseAnimation; QAction *actionTogglePauseAnimation;
QAction *actionAnimationNextFrame; QAction *actionAnimationNextFrame;
QAction *actionHorizontalFlip; QAction *actionHorizontalFlip;
QAction *actionFitInView; QAction *actionFitInView;
QAction *actionFitByWidth; QAction *actionFitByWidth;
QAction *actionCopyPixmap; QAction *actionFitLongImage;
QAction *actionCopyFilePath; QAction *actionCopyPixmap;
QAction *actionPaste; QAction *actionCopyFilePath;
QAction *actionTrash; QAction *actionPaste;
QAction *actionToggleStayOnTop; QAction *actionTrash;
QAction *actionToggleProtectMode; QAction *actionToggleStayOnTop;
QAction *actionToggleAvoidResetTransform; QAction *actionToggleProtectMode;
QAction *actionSettings; QAction *actionToggleAvoidResetTransform;
QAction *actionHelp; QAction *actionSettings;
QAction *actionLocateInFileManager; QAction *actionHelp;
QAction *actionProperties; QAction *actionLocateInFileManager;
QAction *actionQuitApp; QAction *actionProperties;
}; QAction *actionQuitApp;
};
#endif // ACTIONMANAGER_H
#endif // ACTIONMANAGER_H

View File

@ -1,59 +1,57 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "bottombuttongroup.h" #include "bottombuttongroup.h"
#include "opacityhelper.h" #include "opacityhelper.h"
#include <functional> #include <QToolButton>
#include <QVBoxLayout>
#include <QToolButton> #include <QDebug>
#include <QVBoxLayout>
#include <QDebug> BottomButtonGroup::BottomButtonGroup(const std::vector<QAction *> &actionList, QWidget *parent)
: QGroupBox (parent)
BottomButtonGroup::BottomButtonGroup(const std::vector<QAction *> &actionList, QWidget *parent) , m_opacityHelper(new OpacityHelper(this))
: QGroupBox (parent) {
, m_opacityHelper(new OpacityHelper(this)) QHBoxLayout * mainLayout = new QHBoxLayout(this);
{ mainLayout->setSizeConstraint(QLayout::SetFixedSize);
QHBoxLayout * mainLayout = new QHBoxLayout(this); this->setLayout(mainLayout);
mainLayout->setSizeConstraint(QLayout::SetFixedSize); this->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
this->setLayout(mainLayout); this->setStyleSheet("BottomButtonGroup {"
this->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); "border: 1px solid gray;"
this->setStyleSheet("BottomButtonGroup {" "border-top-left-radius: 10px;"
"border: 1px solid gray;" "border-top-right-radius: 10px;"
"border-top-left-radius: 10px;" "border-style: none;"
"border-top-right-radius: 10px;" "background-color:rgba(0,0,0,120)"
"border-style: none;" "}"
"background-color:rgba(0,0,0,120)" "QToolButton {"
"}" "background:transparent;"
"QToolButton {" "}"
"background:transparent;" "QToolButton:!focus {"
"}" "border-style: none;"
"QToolButton:!focus {" "}");
"border-style: none;"
"}"); auto newActionBtn = [this](QAction * action) -> QToolButton * {
QToolButton * btn = new QToolButton(this);
auto newActionBtn = [this](QAction * action) -> QToolButton * { btn->setDefaultAction(action);
QToolButton * btn = new QToolButton(this); btn->setIconSize(QSize(32, 32));
btn->setDefaultAction(action); btn->setFixedSize(40, 40);
btn->setIconSize(QSize(32, 32)); return btn;
btn->setFixedSize(40, 40); };
return btn;
}; for (QAction * action : actionList) {
addButton(newActionBtn(action));
for (QAction * action : actionList) { }
addButton(newActionBtn(action)); }
}
} void BottomButtonGroup::setOpacity(qreal opacity, bool animated)
{
void BottomButtonGroup::setOpacity(qreal opacity, bool animated) m_opacityHelper->setOpacity(opacity, animated);
{ }
m_opacityHelper->setOpacity(opacity, animated);
} void BottomButtonGroup::addButton(QAbstractButton *button)
{
void BottomButtonGroup::addButton(QAbstractButton *button) layout()->addWidget(button);
{ updateGeometry();
layout()->addWidget(button); }
updateGeometry();
}

View File

@ -1,27 +1,27 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef BOTTOMBUTTONGROUP_H #ifndef BOTTOMBUTTONGROUP_H
#define BOTTOMBUTTONGROUP_H #define BOTTOMBUTTONGROUP_H
#include <vector> #include <vector>
#include <QAbstractButton> #include <QAbstractButton>
#include <QGroupBox> #include <QGroupBox>
class OpacityHelper; class OpacityHelper;
class BottomButtonGroup : public QGroupBox class BottomButtonGroup : public QGroupBox
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit BottomButtonGroup(const std::vector<QAction *> & actionList, QWidget *parent = nullptr); explicit BottomButtonGroup(const std::vector<QAction *> & actionList, QWidget *parent = nullptr);
void setOpacity(qreal opacity, bool animated = true); void setOpacity(qreal opacity, bool animated = true);
void addButton(QAbstractButton *button); void addButton(QAbstractButton *button);
private: private:
OpacityHelper * m_opacityHelper; OpacityHelper * m_opacityHelper;
}; };
#endif // BOTTOMBUTTONGROUP_H #endif // BOTTOMBUTTONGROUP_H

View File

@ -1,138 +1,138 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "exiv2wrapper.h" #include "exiv2wrapper.h"
#ifdef HAVE_EXIV2_VERSION #ifdef HAVE_EXIV2_VERSION
#include <exiv2/exiv2.hpp> #include <exiv2/exiv2.hpp>
#else // HAVE_EXIV2_VERSION #else // HAVE_EXIV2_VERSION
namespace Exiv2 { namespace Exiv2 {
class Image {}; class Image {};
} }
#endif // HAVE_EXIV2_VERSION #endif // HAVE_EXIV2_VERSION
#include <sstream> #include <sstream>
#include <QFile> #include <QFile>
#include <QDebug> #include <QDebug>
Exiv2Wrapper::Exiv2Wrapper() Exiv2Wrapper::Exiv2Wrapper()
{ {
} }
Exiv2Wrapper::~Exiv2Wrapper() Exiv2Wrapper::~Exiv2Wrapper()
{ {
} }
#ifdef HAVE_EXIV2_VERSION // stupid AppleClang... #ifdef HAVE_EXIV2_VERSION // stupid AppleClang...
template<typename Collection, typename Iterator> template<typename Collection, typename Iterator>
void Exiv2Wrapper::cacheSection(Collection collection) void Exiv2Wrapper::cacheSection(Collection collection)
{ {
const Collection& exifData = collection; const Collection& exifData = collection;
Iterator it = exifData.begin(), end = exifData.end(); Iterator it = exifData.begin(), end = exifData.end();
for (; it != end; ++it) { for (; it != end; ++it) {
QString key = QString::fromUtf8(it->key().c_str()); QString key = QString::fromUtf8(it->key().c_str());
if (it->tagName().substr(0, 2) == "0x") continue; if (it->tagName().substr(0, 2) == "0x") continue;
// We might get exceptions like "No namespace info available for XMP prefix `Item'" // We might get exceptions like "No namespace info available for XMP prefix `Item'"
// when trying to get tagLabel() data from a Xmpdatum if the tag is not common-used. // when trying to get tagLabel() data from a Xmpdatum if the tag is not common-used.
// We don't care for those rare tags so let's just use a try-cache... // We don't care for those rare tags so let's just use a try-cache...
try { try {
QString label = QString::fromLocal8Bit(it->tagLabel().c_str()); QString label = QString::fromLocal8Bit(it->tagLabel().c_str());
std::ostringstream stream; std::ostringstream stream;
stream << *it; stream << *it;
QString value = QString::fromUtf8(stream.str().c_str()); QString value = QString::fromUtf8(stream.str().c_str());
m_metadataValue.insert(key, value); m_metadataValue.insert(key, value);
m_metadataLabel.insert(key, label); m_metadataLabel.insert(key, label);
qDebug() << key << label << value; qDebug() << key << label << value;
#if EXIV2_TEST_VERSION(0, 28, 0) #if EXIV2_TEST_VERSION(0, 28, 0)
} catch (Exiv2::Error & err) { } catch (Exiv2::Error & err) {
#else // 0.27.x #else // 0.27.x
} catch (Exiv2::AnyError & err) { } catch (Exiv2::AnyError & err) {
#endif // EXIV2_TEST_VERSION(0, 28, 0) #endif // EXIV2_TEST_VERSION(0, 28, 0)
qWarning() << "Error loading key" << key << ":" << err.what(); qWarning() << "Error loading key" << key << ":" << err.what();
} }
} }
} }
#endif // HAVE_EXIV2_VERSION #endif // HAVE_EXIV2_VERSION
bool Exiv2Wrapper::load(const QString &filePath) bool Exiv2Wrapper::load(const QString &filePath)
{ {
#ifdef HAVE_EXIV2_VERSION #ifdef HAVE_EXIV2_VERSION
QByteArray filePathByteArray = QFile::encodeName(filePath); QByteArray filePathByteArray = QFile::encodeName(filePath);
try { try {
m_exivImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release()); m_exivImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release());
m_exivImage->readMetadata(); m_exivImage->readMetadata();
} catch (const Exiv2::Error& error) { } catch (const Exiv2::Error& error) {
m_errMsg = QString::fromUtf8(error.what()); m_errMsg = QString::fromUtf8(error.what());
return false; return false;
} }
return true; return true;
#else // HAVE_EXIV2_VERSION #else // HAVE_EXIV2_VERSION
Q_UNUSED(filePath); Q_UNUSED(filePath);
return false; return false;
#endif // HAVE_EXIV2_VERSION #endif // HAVE_EXIV2_VERSION
} }
void Exiv2Wrapper::cacheSections() void Exiv2Wrapper::cacheSections()
{ {
#ifdef HAVE_EXIV2_VERSION #ifdef HAVE_EXIV2_VERSION
if (m_exivImage->checkMode(Exiv2::mdExif) & Exiv2::amRead) { if (m_exivImage->checkMode(Exiv2::mdExif) & Exiv2::amRead) {
cacheSection<Exiv2::ExifData, Exiv2::ExifData::const_iterator>(m_exivImage->exifData()); cacheSection<Exiv2::ExifData, Exiv2::ExifData::const_iterator>(m_exivImage->exifData());
} }
if (m_exivImage->checkMode(Exiv2::mdIptc) & Exiv2::amRead) { if (m_exivImage->checkMode(Exiv2::mdIptc) & Exiv2::amRead) {
cacheSection<Exiv2::IptcData, Exiv2::IptcData::const_iterator>(m_exivImage->iptcData()); cacheSection<Exiv2::IptcData, Exiv2::IptcData::const_iterator>(m_exivImage->iptcData());
} }
if (m_exivImage->checkMode(Exiv2::mdXmp) & Exiv2::amRead) { if (m_exivImage->checkMode(Exiv2::mdXmp) & Exiv2::amRead) {
cacheSection<Exiv2::XmpData, Exiv2::XmpData::const_iterator>(m_exivImage->xmpData()); cacheSection<Exiv2::XmpData, Exiv2::XmpData::const_iterator>(m_exivImage->xmpData());
} }
// qDebug() << m_metadataValue; // qDebug() << m_metadataValue;
// qDebug() << m_metadataLabel; // qDebug() << m_metadataLabel;
#endif // HAVE_EXIV2_VERSION #endif // HAVE_EXIV2_VERSION
} }
QString Exiv2Wrapper::comment() const QString Exiv2Wrapper::comment() const
{ {
#ifdef HAVE_EXIV2_VERSION #ifdef HAVE_EXIV2_VERSION
return m_exivImage->comment().c_str(); return m_exivImage->comment().c_str();
#else // HAVE_EXIV2_VERSION #else // HAVE_EXIV2_VERSION
return QString(); return QString();
#endif // HAVE_EXIV2_VERSION #endif // HAVE_EXIV2_VERSION
} }
QString Exiv2Wrapper::label(const QString &key) const QString Exiv2Wrapper::label(const QString &key) const
{ {
return m_metadataLabel.value(key); return m_metadataLabel.value(key);
} }
QString Exiv2Wrapper::value(const QString &key) const QString Exiv2Wrapper::value(const QString &key) const
{ {
return m_metadataValue.value(key); return m_metadataValue.value(key);
} }
QString Exiv2Wrapper::XmpValue(const QString &rawValue) QString Exiv2Wrapper::XmpValue(const QString &rawValue)
{ {
QString ignored; QString ignored;
return Exiv2Wrapper::XmpValue(rawValue, ignored); return Exiv2Wrapper::XmpValue(rawValue, ignored);
} }
QString Exiv2Wrapper::XmpValue(const QString &rawValue, QString &language) QString Exiv2Wrapper::XmpValue(const QString &rawValue, QString &language)
{ {
if (rawValue.size() > 6 && rawValue.startsWith(QLatin1String("lang=\""))) { if (rawValue.size() > 6 && rawValue.startsWith(QLatin1String("lang=\""))) {
int pos = rawValue.indexOf('"', 6); int pos = rawValue.indexOf('"', 6);
if (pos != -1) { if (pos != -1) {
language = rawValue.mid(6, pos - 6); language = rawValue.mid(6, pos - 6);
return (rawValue.mid(pos + 2)); return (rawValue.mid(pos + 2));
} }
} }
language.clear(); language.clear();
return rawValue; return rawValue;
} }

View File

@ -1,43 +1,43 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef EXIV2WRAPPER_H #ifndef EXIV2WRAPPER_H
#define EXIV2WRAPPER_H #define EXIV2WRAPPER_H
#include <memory> #include <memory>
#include <QString> #include <QString>
#include <QMap> #include <QMap>
namespace Exiv2 { namespace Exiv2 {
class Image; class Image;
} }
class Exiv2Wrapper class Exiv2Wrapper
{ {
public: public:
Exiv2Wrapper(); Exiv2Wrapper();
~Exiv2Wrapper(); ~Exiv2Wrapper();
bool load(const QString& filePath); bool load(const QString& filePath);
void cacheSections(); void cacheSections();
QString comment() const; QString comment() const;
QString label(const QString & key) const; QString label(const QString & key) const;
QString value(const QString & key) const; QString value(const QString & key) const;
static QString XmpValue(const QString &rawValue); static QString XmpValue(const QString &rawValue);
static QString XmpValue(const QString &rawValue, QString & language); static QString XmpValue(const QString &rawValue, QString & language);
private: private:
std::unique_ptr<Exiv2::Image> m_exivImage; std::unique_ptr<Exiv2::Image> m_exivImage;
QMap<QString, QString> m_metadataValue; QMap<QString, QString> m_metadataValue;
QMap<QString, QString> m_metadataLabel; QMap<QString, QString> m_metadataLabel;
QString m_errMsg; QString m_errMsg;
template<typename Collection, typename Iterator> template<typename Collection, typename Iterator>
void cacheSection(Collection collection); void cacheSection(Collection collection);
}; };
#endif // EXIV2WRAPPER_H #endif // EXIV2WRAPPER_H

View File

@ -1,147 +1,136 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// SPDX-FileCopyrightText: 2023 Tad Young <yyc12321@outlook.com> // SPDX-FileCopyrightText: 2023 Tad Young <yyc12321@outlook.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "framelesswindow.h" #include "framelesswindow.h"
#include <QMouseEvent> #include <QMouseEvent>
#include <QHoverEvent> #include <QHoverEvent>
#include <QApplication> #include <QApplication>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWindow> #include <QWindow>
FramelessWindow::FramelessWindow(QWidget *parent) FramelessWindow::FramelessWindow(QWidget *parent)
: QWidget(parent) : QWidget(parent)
, m_centralLayout(new QVBoxLayout(this)) , m_centralLayout(new QVBoxLayout(this))
, m_oldCursorShape(Qt::ArrowCursor) , m_oldCursorShape(Qt::ArrowCursor)
, m_oldEdges() , m_oldEdges()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinMaxButtonsHint);
this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinMaxButtonsHint); this->setMouseTracking(true);
#else this->setAttribute(Qt::WA_Hover, true);
// There is a bug in Qt 5 that will make pressing Meta+Up cause the app this->installEventFilter(this);
// fullscreen under Windows, see QTBUG-91226 to learn more.
// The bug seems no longer exists in Qt 6 (I only tested it under Qt 6.3.0). m_centralLayout->setContentsMargins(QMargins());
this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint); }
#endif // QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
this->setMouseTracking(true); void FramelessWindow::setCentralWidget(QWidget *widget)
this->setAttribute(Qt::WA_Hover, true); {
this->installEventFilter(this); if (m_centralWidget) {
m_centralLayout->removeWidget(m_centralWidget);
m_centralLayout->setContentsMargins(QMargins()); m_centralWidget->deleteLater();
} }
void FramelessWindow::setCentralWidget(QWidget *widget) m_centralLayout->addWidget(widget);
{ m_centralWidget = widget;
if (m_centralWidget) { }
m_centralLayout->removeWidget(m_centralWidget);
m_centralWidget->deleteLater(); void FramelessWindow::installResizeCapture(QObject* widget)
} {
widget->installEventFilter(this);
m_centralLayout->addWidget(widget); }
m_centralWidget = widget;
} bool FramelessWindow::eventFilter(QObject* o, QEvent* e)
{
void FramelessWindow::installResizeCapture(QObject* widget) switch (e->type()) {
{ case QEvent::HoverMove:
widget->installEventFilter(this); {
} QWidget* wg = qobject_cast<QWidget*>(o);
if (wg != nullptr)
bool FramelessWindow::eventFilter(QObject* o, QEvent* e) return mouseHover(static_cast<QHoverEvent*>(e), wg);
{
switch (e->type()) { break;
case QEvent::HoverMove: }
{ case QEvent::MouseButtonPress:
QWidget* wg = qobject_cast<QWidget*>(o); return mousePress(static_cast<QMouseEvent*>(e));
if (wg != nullptr) }
return mouseHover(static_cast<QHoverEvent*>(e), wg);
return QWidget::eventFilter(o, e);
break; }
}
case QEvent::MouseButtonPress: bool FramelessWindow::mouseHover(QHoverEvent* event, QWidget* wg)
return mousePress(static_cast<QMouseEvent*>(e)); {
} if (!isMaximized() && !isFullScreen()) {
QWindow* win = window()->windowHandle();
return QWidget::eventFilter(o, e); Qt::Edges edges = this->getEdgesByPos(wg->mapToGlobal(event->oldPos()), win->frameGeometry());
}
// backup & restore cursor shape
bool FramelessWindow::mouseHover(QHoverEvent* event, QWidget* wg) if (edges && !m_oldEdges)
{ // entering the edge. backup cursor shape
if (!isMaximized() && !isFullScreen()) { m_oldCursorShape = win->cursor().shape();
QWindow* win = window()->windowHandle(); if (!edges && m_oldEdges)
Qt::Edges edges = this->getEdgesByPos(wg->mapToGlobal(event->oldPos()), win->frameGeometry()); // leaving the edge. restore cursor shape
win->setCursor(m_oldCursorShape);
// backup & restore cursor shape
if (edges && !m_oldEdges) // save the latest edges status
// entering the edge. backup cursor shape m_oldEdges = edges;
m_oldCursorShape = win->cursor().shape();
if (!edges && m_oldEdges) // show resize cursor shape if cursor is within border
// leaving the edge. restore cursor shape if (edges) {
win->setCursor(m_oldCursorShape); win->setCursor(this->getCursorByEdge(edges, Qt::ArrowCursor));
return true;
// save the latest edges status }
m_oldEdges = edges; }
// show resize cursor shape if cursor is within border return false;
if (edges) { }
win->setCursor(this->getCursorByEdge(edges, Qt::ArrowCursor));
return true; bool FramelessWindow::mousePress(QMouseEvent* event)
} {
} if (event->buttons() & Qt::LeftButton && !isMaximized() && !isFullScreen()) {
QWindow* win = window()->windowHandle();
return false; Qt::Edges edges = this->getEdgesByPos(event->globalPosition().toPoint(), win->frameGeometry());
} if (edges) {
win->startSystemResize(edges);
bool FramelessWindow::mousePress(QMouseEvent* event) return true;
{ }
if (event->buttons() & Qt::LeftButton && !isMaximized() && !isFullScreen()) { }
QWindow* win = window()->windowHandle();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return false;
Qt::Edges edges = this->getEdgesByPos(event->globalPosition().toPoint(), win->frameGeometry()); }
#else
Qt::Edges edges = this->getEdgesByPos(event->globalPos(), win->frameGeometry()); Qt::CursorShape FramelessWindow::getCursorByEdge(const Qt::Edges& edges, Qt::CursorShape default_cursor)
#endif // QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) {
if (edges) { if ((edges == (Qt::TopEdge | Qt::LeftEdge)) || (edges == (Qt::RightEdge | Qt::BottomEdge)))
win->startSystemResize(edges); return Qt::SizeFDiagCursor;
return true; else if ((edges == (Qt::TopEdge | Qt::RightEdge)) || (edges == (Qt::LeftEdge | Qt::BottomEdge)))
} return Qt::SizeBDiagCursor;
} else if (edges & (Qt::TopEdge | Qt::BottomEdge))
return Qt::SizeVerCursor;
return false; else if (edges & (Qt::LeftEdge | Qt::RightEdge))
} return Qt::SizeHorCursor;
else
Qt::CursorShape FramelessWindow::getCursorByEdge(const Qt::Edges& edges, Qt::CursorShape default_cursor) return default_cursor;
{ }
if ((edges == (Qt::TopEdge | Qt::LeftEdge)) || (edges == (Qt::RightEdge | Qt::BottomEdge)))
return Qt::SizeFDiagCursor; Qt::Edges FramelessWindow::getEdgesByPos(const QPoint gpos, const QRect& winrect)
else if ((edges == (Qt::TopEdge | Qt::RightEdge)) || (edges == (Qt::LeftEdge | Qt::BottomEdge))) {
return Qt::SizeBDiagCursor; const int borderWidth = 8;
else if (edges & (Qt::TopEdge | Qt::BottomEdge)) Qt::Edges edges;
return Qt::SizeVerCursor;
else if (edges & (Qt::LeftEdge | Qt::RightEdge)) int x = gpos.x() - winrect.x();
return Qt::SizeHorCursor; int y = gpos.y() - winrect.y();
else
return default_cursor; if (x < borderWidth)
} edges |= Qt::LeftEdge;
if (x > (winrect.width() - borderWidth))
Qt::Edges FramelessWindow::getEdgesByPos(const QPoint gpos, const QRect& winrect) edges |= Qt::RightEdge;
{ if (y < borderWidth)
const int borderWidth = 8; edges |= Qt::TopEdge;
Qt::Edges edges; if (y > (winrect.height() - borderWidth))
edges |= Qt::BottomEdge;
int x = gpos.x() - winrect.x();
int y = gpos.y() - winrect.y(); return edges;
}
if (x < borderWidth)
edges |= Qt::LeftEdge;
if (x > (winrect.width() - borderWidth))
edges |= Qt::RightEdge;
if (y < borderWidth)
edges |= Qt::TopEdge;
if (y > (winrect.height() - borderWidth))
edges |= Qt::BottomEdge;
return edges;
}

View File

@ -1,39 +1,39 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef FRAMELESSWINDOW_H #ifndef FRAMELESSWINDOW_H
#define FRAMELESSWINDOW_H #define FRAMELESSWINDOW_H
#include <QWidget> #include <QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QVBoxLayout; class QVBoxLayout;
QT_END_NAMESPACE QT_END_NAMESPACE
class FramelessWindow : public QWidget class FramelessWindow : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit FramelessWindow(QWidget *parent = nullptr); explicit FramelessWindow(QWidget *parent = nullptr);
void setCentralWidget(QWidget * widget); void setCentralWidget(QWidget * widget);
void installResizeCapture(QObject* widget); void installResizeCapture(QObject* widget);
protected: protected:
bool eventFilter(QObject *o, QEvent *e) override; bool eventFilter(QObject *o, QEvent *e) override;
bool mouseHover(QHoverEvent* event, QWidget* wg); bool mouseHover(QHoverEvent* event, QWidget* wg);
bool mousePress(QMouseEvent* event); bool mousePress(QMouseEvent* event);
private: private:
Qt::Edges m_oldEdges; Qt::Edges m_oldEdges;
Qt::CursorShape m_oldCursorShape; Qt::CursorShape m_oldCursorShape;
Qt::CursorShape getCursorByEdge(const Qt::Edges& edges, Qt::CursorShape default_cursor); Qt::CursorShape getCursorByEdge(const Qt::Edges& edges, Qt::CursorShape default_cursor);
Qt::Edges getEdgesByPos(const QPoint pos, const QRect& winrect); Qt::Edges getEdgesByPos(const QPoint pos, const QRect& winrect);
QVBoxLayout * m_centralLayout = nullptr; QVBoxLayout * m_centralLayout = nullptr;
QWidget * m_centralWidget = nullptr; // just a pointer, doesn't take the ownership. QWidget * m_centralWidget = nullptr; // just a pointer, doesn't take the ownership.
}; };
#endif // FRAMELESSWINDOW_H #endif // FRAMELESSWINDOW_H

View File

@ -1,373 +1,495 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "graphicsview.h" #include "graphicsview.h"
#include "graphicsscene.h" #include "graphicsscene.h"
#include "settings.h" #include "settings.h"
#include <QDebug> #include <QDebug>
#include <QMouseEvent> #include <QMouseEvent>
#include <QScrollBar> #include <QScrollBar>
#include <QMimeData> #include <QMimeData>
#include <QImageReader> #include <QImageReader>
#include <QStyleOptionGraphicsItem> #include <QStyleOptionGraphicsItem>
GraphicsView::GraphicsView(QWidget *parent) GraphicsView::GraphicsView(QWidget *parent)
: QGraphicsView (parent) : QGraphicsView (parent)
{ {
setDragMode(QGraphicsView::ScrollHandDrag); setDragMode(QGraphicsView::ScrollHandDrag);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setResizeAnchor(QGraphicsView::AnchorUnderMouse); setResizeAnchor(QGraphicsView::AnchorUnderMouse);
setTransformationAnchor(QGraphicsView::AnchorUnderMouse); setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
setStyleSheet("background-color: rgba(0, 0, 0, 220);" setStyleSheet("background-color: rgba(0, 0, 0, 220);"
"border-radius: 3px;"); "border-radius: 3px;");
setAcceptDrops(false); setAcceptDrops(false);
setCheckerboardEnabled(false); setCheckerboardEnabled(false);
connect(horizontalScrollBar(), &QScrollBar::valueChanged, this, &GraphicsView::viewportRectChanged); connect(horizontalScrollBar(), &QScrollBar::valueChanged, this, &GraphicsView::viewportRectChanged);
connect(verticalScrollBar(), &QScrollBar::valueChanged, this, &GraphicsView::viewportRectChanged); connect(verticalScrollBar(), &QScrollBar::valueChanged, this, &GraphicsView::viewportRectChanged);
} }
void GraphicsView::showFileFromPath(const QString &filePath) void GraphicsView::showFileFromPath(const QString &filePath)
{ {
emit navigatorViewRequired(false, transform()); emit navigatorViewRequired(false, transform());
if (filePath.endsWith(".svg")) { if (filePath.endsWith(".svg")) {
showSvg(filePath); showSvg(filePath);
} else { } else {
QImageReader imageReader(filePath); QImageReader imageReader(filePath);
imageReader.setAutoTransform(true); imageReader.setAutoTransform(true);
imageReader.setDecideFormatFromContent(true); imageReader.setDecideFormatFromContent(true);
#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) imageReader.setAllocationLimit(0);
imageReader.setAllocationLimit(0);
#endif //QT_VERSION > QT_VERSION_CHECK(6, 0, 0) // Since if the image format / plugin does not support this feature, imageFormat() will returns an invalid format.
// So we cannot use imageFormat() and check if it returns QImage::Format_Invalid to detect if we support the file.
// Since if the image format / plugin does not support this feature, imageFormat() will returns an invalid format. // QImage::Format imageFormat = imageReader.imageFormat();
// So we cannot use imageFormat() and check if it returns QImage::Format_Invalid to detect if we support the file. if (imageReader.format().isEmpty()) {
// QImage::Format imageFormat = imageReader.imageFormat(); showText(tr("File is not a valid image"));
if (imageReader.format().isEmpty()) { } else if (imageReader.supportsAnimation() && imageReader.imageCount() > 1) {
showText(tr("File is not a valid image")); showAnimated(filePath);
} else if (imageReader.supportsAnimation() && imageReader.imageCount() > 1) { } else if (!imageReader.canRead()) {
showAnimated(filePath); showText(tr("Image data is invalid or currently unsupported"));
} else if (!imageReader.canRead()) { } else {
showText(tr("Image data is invalid or currently unsupported")); QPixmap && pixmap = QPixmap::fromImageReader(&imageReader);
} else { if (pixmap.isNull()) {
QPixmap && pixmap = QPixmap::fromImageReader(&imageReader); showText(tr("Image data is invalid or currently unsupported"));
if (pixmap.isNull()) { } else {
showText(tr("Image data is invalid or currently unsupported")); pixmap.setDevicePixelRatio(devicePixelRatioF());
} else { showImage(pixmap);
pixmap.setDevicePixelRatio(devicePixelRatioF()); }
showImage(pixmap); }
} }
} }
}
} void GraphicsView::showImage(const QPixmap &pixmap)
{
void GraphicsView::showImage(const QPixmap &pixmap) resetTransform();
{ scene()->showImage(pixmap);
resetTransform(); displayScene();
scene()->showImage(pixmap); }
displayScene();
} void GraphicsView::showImage(const QImage &image)
{
void GraphicsView::showImage(const QImage &image) resetTransform();
{ scene()->showImage(QPixmap::fromImage(image));
resetTransform(); displayScene();
scene()->showImage(QPixmap::fromImage(image)); }
displayScene();
} void GraphicsView::showText(const QString &text)
{
void GraphicsView::showText(const QString &text) resetTransform();
{ scene()->showText(text);
resetTransform(); displayScene();
scene()->showText(text); }
displayScene();
} void GraphicsView::showSvg(const QString &filepath)
{
void GraphicsView::showSvg(const QString &filepath) resetTransform();
{ scene()->showSvg(filepath);
resetTransform(); displayScene();
scene()->showSvg(filepath); }
displayScene();
} void GraphicsView::showAnimated(const QString &filepath)
{
void GraphicsView::showAnimated(const QString &filepath) resetTransform();
{ scene()->showAnimated(filepath);
resetTransform(); displayScene();
scene()->showAnimated(filepath); }
displayScene();
} GraphicsScene *GraphicsView::scene() const
{
GraphicsScene *GraphicsView::scene() const return qobject_cast<GraphicsScene*>(QGraphicsView::scene());
{ }
return qobject_cast<GraphicsScene*>(QGraphicsView::scene());
} void GraphicsView::setScene(GraphicsScene *scene)
{
void GraphicsView::setScene(GraphicsScene *scene) return QGraphicsView::setScene(scene);
{ }
return QGraphicsView::setScene(scene);
} qreal GraphicsView::scaleFactor() const
{
qreal GraphicsView::scaleFactor() const return QStyleOptionGraphicsItem::levelOfDetailFromTransform(transform());
{ }
return QStyleOptionGraphicsItem::levelOfDetailFromTransform(transform());
} void GraphicsView::resetTransform()
{
void GraphicsView::resetTransform() if (!shouldAvoidTransform()) {
{ QGraphicsView::resetTransform();
if (!shouldAvoidTransform()) { }
QGraphicsView::resetTransform(); }
}
} void GraphicsView::zoomView(qreal scaleFactor)
{
void GraphicsView::zoomView(qreal scaleFactor) m_enableFitInView = false;
{ m_longImageMode = false;
m_enableFitInView = false; scale(scaleFactor, scaleFactor);
scale(scaleFactor, scaleFactor); applyTransformationModeByScaleFactor();
applyTransformationModeByScaleFactor(); emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform()); }
}
// This is always according to user's view.
// This is always according to user's view. // the direction of the rotation will NOT be clockwise because the y-axis points downwards.
// the direction of the rotation will NOT be clockwise because the y-axis points downwards. void GraphicsView::rotateView(bool clockwise)
void GraphicsView::rotateView(bool clockwise) {
{ resetScale();
resetScale();
QTransform tf(0, clockwise ? 1 : -1, 0,
QTransform tf(0, clockwise ? 1 : -1, 0, clockwise ? -1 : 1, 0, 0,
clockwise ? -1 : 1, 0, 0, 0, 0, 1);
0, 0, 1); tf = transform() * tf;
tf = transform() * tf; setTransform(tf);
setTransform(tf);
} // Apply transformation mode but don't emit navigator signal here
// Let displayScene() handle the navigator visibility correctly
void GraphicsView::flipView(bool horizontal) applyTransformationModeByScaleFactor();
{ }
QTransform tf(horizontal ? -1 : 1, 0, 0,
0, horizontal ? 1 : -1, 0, void GraphicsView::flipView(bool horizontal)
0, 0, 1); {
tf = transform() * tf; QTransform tf(horizontal ? -1 : 1, 0, 0,
setTransform(tf); 0, horizontal ? 1 : -1, 0,
0, 0, 1);
// Ensure the navigation view is also flipped. tf = transform() * tf;
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform()); setTransform(tf);
}
// Ensure the navigation view is also flipped.
void GraphicsView::resetScale() emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
{ }
setTransform(resetScale(transform()));
applyTransformationModeByScaleFactor(); void GraphicsView::resetScale()
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform()); {
} setTransform(resetScale(transform()));
applyTransformationModeByScaleFactor();
void GraphicsView::fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRadioMode) emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
{ }
QGraphicsView::fitInView(rect, aspectRadioMode);
applyTransformationModeByScaleFactor(); void GraphicsView::fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRadioMode)
} {
QGraphicsView::fitInView(rect, aspectRadioMode);
void GraphicsView::fitByOrientation(Qt::Orientation ori, bool scaleDownOnly) applyTransformationModeByScaleFactor();
{ }
resetScale();
void GraphicsView::fitByOrientation(Qt::Orientation ori, bool scaleDownOnly)
QRectF viewRect = this->viewport()->rect().adjusted(2, 2, -2, -2); {
QRectF imageRect = transform().mapRect(sceneRect()); resetScale();
qreal ratio; QRectF viewRect = this->viewport()->rect();
QRectF imageRect = transform().mapRect(sceneRect());
if (ori == Qt::Horizontal) { QSize viewSize = viewRect.size().toSize();
ratio = viewRect.width() / imageRect.width();
} else { qreal ratio;
ratio = viewRect.height() / imageRect.height();
} if (ori == Qt::Horizontal) {
// Horizontal fit means fit by width
if (scaleDownOnly && ratio > 1) ratio = 1; if (scaleDownOnly && imageRect.width() <= viewSize.width()) {
// Image width already fits, no scaling needed
scale(ratio, ratio); ratio = 1;
centerOn(imageRect.top(), 0); } else {
m_enableFitInView = false; ratio = viewRect.width() / imageRect.width();
}
applyTransformationModeByScaleFactor(); } else {
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform()); // Vertical fit means fit by height
} if (scaleDownOnly && imageRect.height() <= viewSize.height()) {
// Image height already fits, no scaling needed
void GraphicsView::displayScene() ratio = 1;
{ } else {
if (shouldAvoidTransform()) { ratio = viewRect.height() / imageRect.height();
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform()); }
return; }
}
if (ratio != 1) {
if (isSceneBiggerThanView()) { scale(ratio, ratio);
fitInView(sceneRect(), Qt::KeepAspectRatio); }
}
// Position the image correctly based on orientation with rotation consideration
m_enableFitInView = true; QRectF originalScene = sceneRect();
m_firstUserMediaLoaded = true; QTransform currentTransform = transform();
}
if (ori == Qt::Horizontal) {
bool GraphicsView::isSceneBiggerThanView() const // For horizontal fit (fit by width), position at top (for tall images)
{ // Find the scene point that corresponds to the top-center of the transformed image
if (!isThingSmallerThanWindowWith(transform())) { QPointF sceneTopCenter;
return true;
} else { if (qFuzzyIsNull(currentTransform.m12()) && qFuzzyIsNull(currentTransform.m21())) {
return false; // 0° or 180° rotation
} if (currentTransform.m11() > 0 && currentTransform.m22() > 0) {
} // 0° rotation: use original top-center
sceneTopCenter = QPointF(originalScene.center().x(), originalScene.top());
// Automately do fit in view when viewport(window) smaller than image original size. } else {
void GraphicsView::setEnableAutoFitInView(bool enable) // 180° rotation: the visual "top" is now at the scene bottom
{ sceneTopCenter = QPointF(originalScene.center().x(), originalScene.bottom());
m_enableFitInView = enable; }
} } else {
// 90/270 degree rotation: the "top" in view corresponds to left/right in scene
bool GraphicsView::avoidResetTransform() const if (currentTransform.m12() > 0) {
{ // 90 degree: top in view = left in scene
return m_avoidResetTransform; sceneTopCenter = QPointF(originalScene.left(), originalScene.center().y());
} } else {
// 270 degree: top in view = right in scene
void GraphicsView::setAvoidResetTransform(bool avoidReset) sceneTopCenter = QPointF(originalScene.right(), originalScene.center().y());
{ }
m_avoidResetTransform = avoidReset; }
} centerOn(sceneTopCenter);
} else {
inline double zeroOrOne(double number) // For vertical fit (fit by height), position at left (for wide images)
{ // Find the scene point that corresponds to the left-center of the transformed image
return qFuzzyIsNull(number) ? 0 : (number > 0 ? 1 : -1); QPointF sceneLeftCenter;
}
if (qFuzzyIsNull(currentTransform.m12()) && qFuzzyIsNull(currentTransform.m21())) {
// Note: this only works if we only have 90 degree based rotation // 0° or 180° rotation
// and no shear/translate. if (currentTransform.m11() > 0 && currentTransform.m22() > 0) {
QTransform GraphicsView::resetScale(const QTransform & orig) // 0° rotation: use original left-center
{ sceneLeftCenter = QPointF(originalScene.left(), originalScene.center().y());
return QTransform(zeroOrOne(orig.m11()), zeroOrOne(orig.m12()), } else {
zeroOrOne(orig.m21()), zeroOrOne(orig.m22()), // 180° rotation: the visual "left" is now at the scene right
orig.dx(), orig.dy()); sceneLeftCenter = QPointF(originalScene.right(), originalScene.center().y());
} }
} else {
void GraphicsView::toggleCheckerboard(bool invertCheckerboardColor) // 90/270 degree rotation: the "left" in view corresponds to top/bottom in scene
{ if (currentTransform.m21() > 0) {
setCheckerboardEnabled(!m_checkerboardEnabled, invertCheckerboardColor); // 90 degree: left in view = top in scene
} sceneLeftCenter = QPointF(originalScene.center().x(), originalScene.top());
} else {
void GraphicsView::mousePressEvent(QMouseEvent *event) // 270 degree: left in view = bottom in scene
{ sceneLeftCenter = QPointF(originalScene.center().x(), originalScene.bottom());
if (shouldIgnoreMousePressMoveEvent(event)) { }
event->ignore(); }
// blumia: return here, or the QMouseEvent event transparency won't centerOn(sceneLeftCenter);
// work if we set a QGraphicsView::ScrollHandDrag drag mode. }
return;
} m_enableFitInView = false;
return QGraphicsView::mousePressEvent(event); applyTransformationModeByScaleFactor();
} emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
}
void GraphicsView::mouseMoveEvent(QMouseEvent *event)
{ bool GraphicsView::isLongImage() const
if (shouldIgnoreMousePressMoveEvent(event)) { {
event->ignore(); // Get the transformed image size (considering rotation and other transforms)
} QRectF transformedRect = transform().mapRect(sceneRect());
QSizeF imageSize = transformedRect.size();
return QGraphicsView::mouseMoveEvent(event);
} if (imageSize.isEmpty()) return false;
void GraphicsView::mouseReleaseEvent(QMouseEvent *event) qreal aspectRatio = imageSize.width() / imageSize.height();
{
if (event->button() == Qt::ForwardButton || event->button() == Qt::BackButton) { // Check if aspect ratio exceeds 5:2 (wide) or 2:5 (tall)
event->ignore(); return aspectRatio > 2.5 || aspectRatio < 0.4;
} else { }
QGraphicsItem *item = itemAt(event->pos());
if (!item) { void GraphicsView::fitLongImage()
event->ignore(); {
} QRectF transformedRect = transform().mapRect(sceneRect());
}
if (transformedRect.width() < transformedRect.height()) {
return QGraphicsView::mouseReleaseEvent(event); fitByOrientation(Qt::Horizontal, true);
} } else {
fitByOrientation(Qt::Vertical, true);
void GraphicsView::wheelEvent(QWheelEvent *event) }
{ }
event->ignore();
// blumia: no need for calling parent method. void GraphicsView::displayScene()
} {
if (shouldAvoidTransform()) {
void GraphicsView::resizeEvent(QResizeEvent *event) emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
{ return;
if (m_enableFitInView) { }
bool originalSizeSmallerThanWindow = isThingSmallerThanWindowWith(resetScale(transform()));
if (originalSizeSmallerThanWindow && scaleFactor() >= 1) { // Check if should apply long image mode
// no longer need to do fitInView() if (Settings::instance()->autoLongImageMode() && isLongImage()) {
// but we leave the m_enableFitInView value unchanged in case m_longImageMode = true;
// user resize down the window again. m_firstUserMediaLoaded = true;
} else if (originalSizeSmallerThanWindow && scaleFactor() < 1) { if (isSceneBiggerThanView()) fitLongImage();
resetScale(); return;
} else { }
fitInView(sceneRect(), Qt::KeepAspectRatio);
} if (isSceneBiggerThanView()) {
} else { // Do fit-in-view
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform()); fitInView(sceneRect(), Qt::KeepAspectRatio);
} // After fitInView, the image should fit the window, so hide navigator
return QGraphicsView::resizeEvent(event); emit navigatorViewRequired(false, transform());
} } else {
// Image is already smaller than window, no navigator needed
bool GraphicsView::isThingSmallerThanWindowWith(const QTransform &transform) const emit navigatorViewRequired(false, transform());
{ }
return rect().size().expandedTo(transform.mapRect(sceneRect()).size().toSize())
== rect().size(); m_longImageMode = false;
} m_enableFitInView = true;
m_firstUserMediaLoaded = true;
bool GraphicsView::shouldIgnoreMousePressMoveEvent(const QMouseEvent *event) const }
{
if (event->buttons() == Qt::NoButton) { bool GraphicsView::isSceneBiggerThanView() const
return true; {
} if (!isThingSmallerThanWindowWith(transform())) {
return true;
QGraphicsItem *item = itemAt(event->pos()); } else {
if (!item) { return false;
return true; }
} }
if (isThingSmallerThanWindowWith(transform())) { // Automately do fit in view when viewport(window) smaller than image original size.
return true; void GraphicsView::setEnableAutoFitInView(bool enable)
} {
m_enableFitInView = enable;
return false; }
}
void GraphicsView::setLongImageMode(bool enable)
void GraphicsView::setCheckerboardEnabled(bool enabled, bool invertColor) {
{ m_longImageMode = enable;
m_checkerboardEnabled = enabled; }
bool isLightCheckerboard = Settings::instance()->useLightCheckerboard() ^ invertColor;
if (m_checkerboardEnabled) { bool GraphicsView::avoidResetTransform() const
// Prepare background check-board pattern {
QPixmap tilePixmap(0x20, 0x20); return m_avoidResetTransform;
tilePixmap.fill(isLightCheckerboard ? QColor(220, 220, 220, 170) : QColor(35, 35, 35, 170)); }
QPainter tilePainter(&tilePixmap);
constexpr QColor color(45, 45, 45, 170); void GraphicsView::setAvoidResetTransform(bool avoidReset)
constexpr QColor invertedColor(210, 210, 210, 170); {
tilePainter.fillRect(0, 0, 0x10, 0x10, isLightCheckerboard ? invertedColor : color); m_avoidResetTransform = avoidReset;
tilePainter.fillRect(0x10, 0x10, 0x10, 0x10, isLightCheckerboard ? invertedColor : color); }
tilePainter.end();
inline double zeroOrOne(double number)
setBackgroundBrush(tilePixmap); {
} else { return qFuzzyIsNull(number) ? 0 : (number > 0 ? 1 : -1);
setBackgroundBrush(Qt::transparent); }
}
} // Note: this only works if we only have 90 degree based rotation
// and no shear/translate.
void GraphicsView::applyTransformationModeByScaleFactor() QTransform GraphicsView::resetScale(const QTransform & orig)
{ {
if (this->scaleFactor() < 1) { return QTransform(zeroOrOne(orig.m11()), zeroOrOne(orig.m12()),
scene()->trySetTransformationMode(Qt::SmoothTransformation, this->scaleFactor()); zeroOrOne(orig.m21()), zeroOrOne(orig.m22()),
} else { orig.dx(), orig.dy());
scene()->trySetTransformationMode(Qt::FastTransformation, this->scaleFactor()); }
}
} void GraphicsView::toggleCheckerboard(bool invertCheckerboardColor)
{
bool GraphicsView::shouldAvoidTransform() const setCheckerboardEnabled(!m_checkerboardEnabled, invertCheckerboardColor);
{ }
return m_firstUserMediaLoaded && m_avoidResetTransform;
} void GraphicsView::mousePressEvent(QMouseEvent *event)
{
if (shouldIgnoreMousePressMoveEvent(event)) {
event->ignore();
// blumia: return here, or the QMouseEvent event transparency won't
// work if we set a QGraphicsView::ScrollHandDrag drag mode.
return;
}
return QGraphicsView::mousePressEvent(event);
}
void GraphicsView::mouseMoveEvent(QMouseEvent *event)
{
if (shouldIgnoreMousePressMoveEvent(event)) {
event->ignore();
}
return QGraphicsView::mouseMoveEvent(event);
}
void GraphicsView::mouseReleaseEvent(QMouseEvent *event)
{
if (event->button() == Qt::ForwardButton || event->button() == Qt::BackButton) {
event->ignore();
} else {
QGraphicsItem *item = itemAt(event->pos());
if (!item) {
event->ignore();
}
}
return QGraphicsView::mouseReleaseEvent(event);
}
void GraphicsView::wheelEvent(QWheelEvent *event)
{
event->ignore();
// blumia: no need for calling parent method.
}
void GraphicsView::resizeEvent(QResizeEvent *event)
{
if (m_longImageMode) {
// In long image mode, reapply long image logic on resize
// We directly apply the long image mode logic without rechecking
// if we should enter long image mode, as the mode is already active
fitLongImage();
} else if (m_enableFitInView) {
bool originalSizeSmallerThanWindow = isThingSmallerThanWindowWith(resetScale(transform()));
if (originalSizeSmallerThanWindow && scaleFactor() >= 1) {
// no longer need to do fitInView()
// but we leave the m_enableFitInView value unchanged in case
// user resize down the window again.
} else if (originalSizeSmallerThanWindow && scaleFactor() < 1) {
resetScale();
} else {
fitInView(sceneRect(), Qt::KeepAspectRatio);
}
} else {
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
}
return QGraphicsView::resizeEvent(event);
}
bool GraphicsView::isThingSmallerThanWindowWith(const QTransform &transform) const
{
return rect().size().expandedTo(transform.mapRect(sceneRect()).size().toSize())
== rect().size();
}
bool GraphicsView::shouldIgnoreMousePressMoveEvent(const QMouseEvent *event) const
{
if (event->buttons() == Qt::NoButton) {
return true;
}
QGraphicsItem *item = itemAt(event->pos());
if (!item) {
return true;
}
if (isThingSmallerThanWindowWith(transform())) {
return true;
}
return false;
}
void GraphicsView::setCheckerboardEnabled(bool enabled, bool invertColor)
{
m_checkerboardEnabled = enabled;
bool isLightCheckerboard = Settings::instance()->useLightCheckerboard() ^ invertColor;
if (m_checkerboardEnabled) {
// Prepare background check-board pattern
QPixmap tilePixmap(0x20, 0x20);
tilePixmap.fill(isLightCheckerboard ? QColor(220, 220, 220, 170) : QColor(35, 35, 35, 170));
QPainter tilePainter(&tilePixmap);
constexpr QColor color(45, 45, 45, 170);
constexpr QColor invertedColor(210, 210, 210, 170);
tilePainter.fillRect(0, 0, 0x10, 0x10, isLightCheckerboard ? invertedColor : color);
tilePainter.fillRect(0x10, 0x10, 0x10, 0x10, isLightCheckerboard ? invertedColor : color);
tilePainter.end();
setBackgroundBrush(tilePixmap);
} else {
setBackgroundBrush(Qt::transparent);
}
}
void GraphicsView::applyTransformationModeByScaleFactor()
{
if (this->scaleFactor() < 1) {
scene()->trySetTransformationMode(Qt::SmoothTransformation, this->scaleFactor());
} else {
scene()->trySetTransformationMode(Qt::FastTransformation, this->scaleFactor());
}
}
bool GraphicsView::shouldAvoidTransform() const
{
return m_firstUserMediaLoaded && m_avoidResetTransform;
}

View File

@ -1,79 +1,85 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef GRAPHICSVIEW_H #ifndef GRAPHICSVIEW_H
#define GRAPHICSVIEW_H #define GRAPHICSVIEW_H
#include <QGraphicsView> #include <QGraphicsView>
#include <QUrl> #include <QUrl>
class GraphicsScene; class GraphicsScene;
class GraphicsView : public QGraphicsView class GraphicsView : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
GraphicsView(QWidget *parent = nullptr); GraphicsView(QWidget *parent = nullptr);
void showFileFromPath(const QString &filePath); void showFileFromPath(const QString &filePath);
void showImage(const QPixmap &pixmap); void showImage(const QPixmap &pixmap);
void showImage(const QImage &image); void showImage(const QImage &image);
void showText(const QString &text); void showText(const QString &text);
void showSvg(const QString &filepath); void showSvg(const QString &filepath);
void showAnimated(const QString &filepath); void showAnimated(const QString &filepath);
GraphicsScene * scene() const; GraphicsScene * scene() const;
void setScene(GraphicsScene *scene); void setScene(GraphicsScene *scene);
qreal scaleFactor() const; qreal scaleFactor() const;
void resetTransform(); void resetTransform();
void zoomView(qreal scaleFactor); void zoomView(qreal scaleFactor);
void rotateView(bool clockwise = true); void rotateView(bool clockwise = true);
void flipView(bool horizontal = true); void flipView(bool horizontal = true);
void resetScale(); void resetScale();
void fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRadioMode = Qt::IgnoreAspectRatio); void fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRadioMode = Qt::IgnoreAspectRatio);
void fitByOrientation(Qt::Orientation ori = Qt::Horizontal, bool scaleDownOnly = false); void fitByOrientation(Qt::Orientation ori = Qt::Horizontal, bool scaleDownOnly = false);
void displayScene(); void displayScene();
bool isSceneBiggerThanView() const; bool isSceneBiggerThanView() const;
void setEnableAutoFitInView(bool enable = true); void setEnableAutoFitInView(bool enable = true);
void setLongImageMode(bool enable = true);
bool avoidResetTransform() const;
void setAvoidResetTransform(bool avoidReset); bool avoidResetTransform() const;
void setAvoidResetTransform(bool avoidReset);
static QTransform resetScale(const QTransform & orig);
static QTransform resetScale(const QTransform & orig);
signals:
void navigatorViewRequired(bool required, QTransform transform); // Long image mode support
void viewportRectChanged(); bool isLongImage() const;
void fitLongImage();
public slots:
void toggleCheckerboard(bool invertCheckerboardColor = false); signals:
void navigatorViewRequired(bool required, QTransform transform);
private: void viewportRectChanged();
void mousePressEvent(QMouseEvent * event) override;
void mouseMoveEvent(QMouseEvent * event) override; public slots:
void mouseReleaseEvent(QMouseEvent * event) override; void toggleCheckerboard(bool invertCheckerboardColor = false);
void wheelEvent(QWheelEvent *event) override;
void resizeEvent(QResizeEvent *event) override; private:
void mousePressEvent(QMouseEvent * event) override;
bool isThingSmallerThanWindowWith(const QTransform &transform) const; void mouseMoveEvent(QMouseEvent * event) override;
bool shouldIgnoreMousePressMoveEvent(const QMouseEvent *event) const; void mouseReleaseEvent(QMouseEvent * event) override;
void setCheckerboardEnabled(bool enabled, bool invertColor = false); void wheelEvent(QWheelEvent *event) override;
void applyTransformationModeByScaleFactor(); void resizeEvent(QResizeEvent *event) override;
inline bool shouldAvoidTransform() const; bool isThingSmallerThanWindowWith(const QTransform &transform) const;
bool shouldIgnoreMousePressMoveEvent(const QMouseEvent *event) const;
// Consider switch to 3 state for "no fit", "always fit" and "fit when view is smaller"? void setCheckerboardEnabled(bool enabled, bool invertColor = false);
// ... or even more? e.g. "fit/snap width" things... void applyTransformationModeByScaleFactor();
// Currently it's "no fit" when it's false and "fit when view is smaller" when it's true.
bool m_enableFitInView = false; inline bool shouldAvoidTransform() const;
bool m_avoidResetTransform = false;
bool m_checkerboardEnabled = false; // Consider switch to 3 state for "no fit", "always fit" and "fit when view is smaller"?
bool m_useLightCheckerboard = false; // ... or even more? e.g. "fit/snap width" things...
bool m_firstUserMediaLoaded = false; // Currently it's "no fit" when it's false and "fit when view is smaller" when it's true.
}; bool m_enableFitInView = false;
bool m_longImageMode = false;
#endif // GRAPHICSVIEW_H bool m_avoidResetTransform = false;
bool m_checkerboardEnabled = false;
bool m_useLightCheckerboard = false;
bool m_firstUserMediaLoaded = false;
};
#endif // GRAPHICSVIEW_H

View File

@ -1,92 +1,103 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "mainwindow.h" #include "mainwindow.h"
#include "playlistmanager.h" #include "playlistmanager.h"
#include "settings.h" #include "settings.h"
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
#include "fileopeneventhandler.h" #include "fileopeneventhandler.h"
#endif // Q_OS_MACOS #endif // Q_OS_MACOS
#include <QApplication> #include <QApplication>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QDir> #include <QDir>
#include <QTranslator> #include <QTranslator>
#include <QUrl> #include <QUrl>
int main(int argc, char *argv[]) using namespace Qt::Literals::StringLiterals;
{
QCoreApplication::setApplicationName("Pineapple Pictures"); int main(int argc, char *argv[])
QCoreApplication::setApplicationVersion(PPIC_VERSION_STRING); {
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Settings::instance()->hiDpiScaleFactorBehavior()); QCoreApplication::setApplicationName(u"Pineapple Pictures"_s);
QCoreApplication::setApplicationVersion(PPIC_VERSION_STRING);
QApplication a(argc, argv); QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Settings::instance()->hiDpiScaleFactorBehavior());
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
a.setAttribute(Qt::ApplicationAttribute::AA_UseHighDpiPixmaps); QApplication a(argc, argv);
#endif
QTranslator translator;
QTranslator translator; #if defined(TRANSLATION_RESOURCE_EMBEDDING)
#if defined(TRANSLATION_RESOURCE_EMBEDDING) const QString qmDir = u":/i18n/"_s;
const QString qmDir = QLatin1String(":/i18n/"); #elif defined(QM_FILE_INSTALL_ABSOLUTE_DIR)
#elif defined(QM_FILE_INSTALL_ABSOLUTE_DIR) const QString qmDir = QT_STRINGIFY(QM_FILE_INSTALL_ABSOLUTE_DIR);
const QString qmDir = QT_STRINGIFY(QM_FILE_INSTALL_ABSOLUTE_DIR); #else
#else const QString qmDir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath("translations");
const QString qmDir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath("translations"); #endif
#endif if (translator.load(QLocale(), u"PineapplePictures"_s, u"_"_s, qmDir)) {
if (translator.load(QLocale(), QLatin1String("PineapplePictures"), QLatin1String("_"), qmDir)) { QCoreApplication::installTranslator(&translator);
QCoreApplication::installTranslator(&translator); }
}
QGuiApplication::setApplicationDisplayName(QCoreApplication::translate("main", "Pineapple Pictures"));
QGuiApplication::setApplicationDisplayName(QCoreApplication::translate("main", "Pineapple Pictures"));
// commandline options
// commandline options QCommandLineOption supportedImageFormats(u"supported-image-formats"_s, 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.")); // parse commandline arguments
// parse commandline arguments QCommandLineParser parser;
QCommandLineParser parser; parser.addOption(supportedImageFormats);
parser.addOption(supportedImageFormats); parser.addPositionalArgument("File list", QCoreApplication::translate("main", "File list."));
parser.addPositionalArgument("File list", QCoreApplication::translate("main", "File list.")); parser.addHelpOption();
parser.addHelpOption(); parser.process(a);
parser.process(a);
if (parser.isSet(supportedImageFormats)) {
if (parser.isSet(supportedImageFormats)) { #if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) fputs(qPrintable(MainWindow::supportedImageFormats().join(QChar('\n'))), stdout);
fputs(qPrintable(MainWindow::supportedImageFormats().join(QChar('\n'))), stdout); ::exit(EXIT_SUCCESS);
::exit(EXIT_SUCCESS); #else
#else QCommandLineParser::showMessageAndExit(QCommandLineParser::MessageType::Information,
QCommandLineParser::showMessageAndExit(QCommandLineParser::MessageType::Information, MainWindow::supportedImageFormats().join(QChar('\n')));
MainWindow::supportedImageFormats().join(QChar('\n'))); #endif
#endif }
}
MainWindow w;
MainWindow w; w.show();
w.show();
#ifdef Q_OS_MACOS
#ifdef Q_OS_MACOS FileOpenEventHandler * fileOpenEventHandler = new FileOpenEventHandler(&a);
FileOpenEventHandler * fileOpenEventHandler = new FileOpenEventHandler(&a); a.installEventFilter(fileOpenEventHandler);
a.installEventFilter(fileOpenEventHandler); a.connect(fileOpenEventHandler, &FileOpenEventHandler::fileOpen, [&w](const QUrl & url){
a.connect(fileOpenEventHandler, &FileOpenEventHandler::fileOpen, [&w](const QUrl & url){ if (w.isHidden()) {
if (w.isHidden()) { w.setWindowOpacity(1);
w.setWindowOpacity(1); w.showNormal();
w.showNormal(); } else {
} else { w.activateWindow();
w.activateWindow(); }
} w.showUrls({url});
w.showUrls({url}); w.initWindowSize();
w.initWindowSize(); });
});
#endif // Q_OS_MACOS // Handle dock icon clicks to show hidden window
a.connect(&a, &QApplication::applicationStateChanged, [&w](Qt::ApplicationState state) {
QStringList urlStrList = parser.positionalArguments(); if (state == Qt::ApplicationActive && w.isHidden()) {
QList<QUrl> && urlList = PlaylistManager::convertToUrlList(urlStrList); w.showUrls({});
w.galleryCurrent(true, true);
if (!urlList.isEmpty()) { w.setWindowOpacity(1);
w.showUrls(urlList); w.showNormal();
} w.raise();
w.activateWindow();
w.initWindowSize(); }
});
return QApplication::exec(); #endif // Q_OS_MACOS
}
QStringList urlStrList = parser.positionalArguments();
QList<QUrl> && urlList = PlaylistManager::convertToUrlList(urlStrList);
if (!urlList.isEmpty()) {
w.showUrls(urlList);
}
w.initWindowSize();
return QApplication::exec();
}

View File

@ -44,6 +44,8 @@
#include <QDBusConnectionInterface> #include <QDBusConnectionInterface>
#endif // HAVE_QTDBUS #endif // HAVE_QTDBUS
using namespace Qt::Literals::StringLiterals;
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: FramelessWindow(parent) : FramelessWindow(parent)
, m_am(new ActionManager) , m_am(new ActionManager)
@ -56,28 +58,24 @@ MainWindow::MainWindow(QWidget *parent)
this->setAttribute(Qt::WA_TranslucentBackground, true); this->setAttribute(Qt::WA_TranslucentBackground, true);
this->setMinimumSize(350, 330); this->setMinimumSize(350, 330);
this->setWindowIcon(QIcon(":/icons/app-icon.svg")); this->setWindowIcon(QIcon(u":/icons/app-icon.svg"_s));
this->setMouseTracking(true); this->setMouseTracking(true);
this->setAcceptDrops(true); this->setAcceptDrops(true);
m_pm->setAutoLoadFilterSuffixes(supportedImageFormats()); m_pm->setAutoLoadFilterSuffixes(supportedImageFormats());
m_fadeOutAnimation = new QPropertyAnimation(this, "windowOpacity"); m_fadeOutAnimation = new QPropertyAnimation(this, "windowOpacity"_ba);
m_fadeOutAnimation->setDuration(300); m_fadeOutAnimation->setDuration(300);
m_fadeOutAnimation->setStartValue(1); m_fadeOutAnimation->setStartValue(1);
m_fadeOutAnimation->setEndValue(0); m_fadeOutAnimation->setEndValue(0);
m_floatUpAnimation = new QPropertyAnimation(this, "geometry"); m_floatUpAnimation = new QPropertyAnimation(this, "geometry"_ba);
m_floatUpAnimation->setDuration(300); m_floatUpAnimation->setDuration(300);
m_floatUpAnimation->setEasingCurve(QEasingCurve::OutCirc); m_floatUpAnimation->setEasingCurve(QEasingCurve::OutCirc);
m_exitAnimationGroup = new QParallelAnimationGroup(this); m_exitAnimationGroup = new QParallelAnimationGroup(this);
m_exitAnimationGroup->addAnimation(m_fadeOutAnimation); m_exitAnimationGroup->addAnimation(m_fadeOutAnimation);
m_exitAnimationGroup->addAnimation(m_floatUpAnimation); m_exitAnimationGroup->addAnimation(m_floatUpAnimation);
connect(m_exitAnimationGroup, &QParallelAnimationGroup::finished, connect(m_exitAnimationGroup, &QParallelAnimationGroup::finished,
#ifdef Q_OS_MAC this, &MainWindow::doCloseWindow);
this, &QWidget::hide);
#else
this, &QWidget::close);
#endif
GraphicsScene * scene = new GraphicsScene(this); GraphicsScene * scene = new GraphicsScene(this);
@ -92,7 +90,7 @@ MainWindow::MainWindow(QWidget *parent)
m_gv->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio); m_gv->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio);
connect(m_graphicsView, &GraphicsView::navigatorViewRequired, connect(m_graphicsView, &GraphicsView::navigatorViewRequired,
this, [ = ](bool required, const QTransform & tf){ this, [this](bool required, const QTransform & tf){
m_gv->setTransform(GraphicsView::resetScale(tf)); m_gv->setTransform(GraphicsView::resetScale(tf));
m_gv->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio); m_gv->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio);
m_gv->setVisible(required); m_gv->setVisible(required);
@ -141,10 +139,7 @@ MainWindow::MainWindow(QWidget *parent)
m_gv->setOpacity(0, false); m_gv->setOpacity(0, false);
m_closeButton->setOpacity(0, false); m_closeButton->setOpacity(0, false);
connect(m_pm, &PlaylistManager::totalCountChanged, this, [this](int galleryFileCount) { connect(m_pm, &PlaylistManager::totalCountChanged, this, &MainWindow::updateGalleryButtonsVisibility);
m_prevButton->setVisible(galleryFileCount > 1);
m_nextButton->setVisible(galleryFileCount > 1);
});
connect(m_pm->model(), &PlaylistModel::modelReset, this, std::bind(&MainWindow::galleryCurrent, this, false, false)); connect(m_pm->model(), &PlaylistModel::modelReset, this, std::bind(&MainWindow::galleryCurrent, this, false, false));
connect(m_pm, &PlaylistManager::currentIndexChanged, this, std::bind(&MainWindow::galleryCurrent, this, true, false)); connect(m_pm, &PlaylistManager::currentIndexChanged, this, std::bind(&MainWindow::galleryCurrent, this, true, false));
@ -180,10 +175,20 @@ MainWindow::~MainWindow()
void MainWindow::showUrls(const QList<QUrl> &urls) void MainWindow::showUrls(const QList<QUrl> &urls)
{ {
if (!urls.isEmpty()) { if (!urls.isEmpty()) {
m_graphicsView->showFileFromPath(urls.first().toLocalFile()); const QUrl & firstUrl = urls.first();
if (urls.count() == 1) {
const QString lowerCaseUrlPath(firstUrl.path().toLower());
if (lowerCaseUrlPath.endsWith(".m3u8") || lowerCaseUrlPath.endsWith(".m3u")) {
m_pm->loadM3U8Playlist(firstUrl);
galleryCurrent(true, true);
return;
}
}
m_graphicsView->showFileFromPath(firstUrl.toLocalFile());
m_pm->loadPlaylist(urls); m_pm->loadPlaylist(urls);
} else { } else {
m_graphicsView->showText(tr("File url list is empty")); m_graphicsView->showText(tr("File url list is empty"));
m_pm->setPlaylist(urls);
return; return;
} }
@ -217,7 +222,7 @@ void MainWindow::adjustWindowSizeBySceneRect()
if (m_graphicsView->scaleFactor() < 1 || size().expandedTo(sceneSizeWithMargins) != size()) { if (m_graphicsView->scaleFactor() < 1 || size().expandedTo(sceneSizeWithMargins) != size()) {
// if it scaled down by the resize policy: // if it scaled down by the resize policy:
QSize screenSize = qApp->screenAt(QCursor::pos())->availableSize(); QSize screenSize = window()->screen()->availableSize();
if (screenSize.expandedTo(sceneSize) == screenSize) { if (screenSize.expandedTo(sceneSize) == screenSize) {
// we can show the picture by increase the window size. // we can show the picture by increase the window size.
QSize finalSize = (screenSize.expandedTo(sceneSizeWithMargins) == screenSize) ? QSize finalSize = (screenSize.expandedTo(sceneSizeWithMargins) == screenSize) ?
@ -251,6 +256,9 @@ void MainWindow::clearGallery()
void MainWindow::galleryPrev() void MainWindow::galleryPrev()
{ {
const bool loopGallery = Settings::instance()->loopGallery();
if (!loopGallery && m_pm->isFirstIndex()) return;
QModelIndex index = m_pm->previousIndex(); QModelIndex index = m_pm->previousIndex();
if (index.isValid()) { if (index.isValid()) {
m_pm->setCurrentIndex(index); m_pm->setCurrentIndex(index);
@ -260,6 +268,9 @@ void MainWindow::galleryPrev()
void MainWindow::galleryNext() void MainWindow::galleryNext()
{ {
const bool loopGallery = Settings::instance()->loopGallery();
if (!loopGallery && m_pm->isLastIndex()) return;
QModelIndex index = m_pm->nextIndex(); QModelIndex index = m_pm->nextIndex();
if (index.isValid()) { if (index.isValid()) {
m_pm->setCurrentIndex(index); m_pm->setCurrentIndex(index);
@ -281,6 +292,8 @@ void MainWindow::galleryCurrent(bool showLoadImageHintWhenEmpty, bool reloadImag
m_graphicsView->showText(QCoreApplication::translate("GraphicsScene", "Drag image here")); m_graphicsView->showText(QCoreApplication::translate("GraphicsScene", "Drag image here"));
} }
updateGalleryButtonsVisibility();
if (shouldResetfileWatcher) updateFileWatcher(); if (shouldResetfileWatcher) updateFileWatcher();
} }
@ -304,7 +317,7 @@ void MainWindow::showEvent(QShowEvent *event)
return FramelessWindow::showEvent(event); return FramelessWindow::showEvent(event);
} }
void MainWindow::enterEvent(QT_ENTER_EVENT *event) void MainWindow::enterEvent(QEnterEvent *event)
{ {
m_bottomButtonGroup->setOpacity(1); m_bottomButtonGroup->setOpacity(1);
m_gv->setOpacity(1); m_gv->setOpacity(1);
@ -345,11 +358,7 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event)
{ {
if (event->buttons() & Qt::LeftButton && m_clickedOnWindow && !isMaximized() && !isFullScreen()) { if (event->buttons() & Qt::LeftButton && m_clickedOnWindow && !isMaximized() && !isFullScreen()) {
if (!window()->windowHandle()->startSystemMove()) { if (!window()->windowHandle()->startSystemMove()) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
move(event->globalPosition().toPoint() - m_oldMousePos); move(event->globalPosition().toPoint() - m_oldMousePos);
#else
move(event->globalPos() - m_oldMousePos);
#endif // QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
} }
event->accept(); event->accept();
} }
@ -451,13 +460,11 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
QMenu * menu = new QMenu; QMenu * menu = new QMenu;
QMenu * copyMenu = new QMenu(tr("&Copy")); QMenu * copyMenu = new QMenu(tr("&Copy"));
QUrl currentFileUrl = currentImageFileUrl(); QUrl currentFileUrl = currentImageFileUrl();
QImage clipboardImage;
QUrl clipboardFileUrl;
QAction * copyPixmap = m_am->actionCopyPixmap; QAction * copyPixmap = m_am->actionCopyPixmap;
QAction * copyFilePath = m_am->actionCopyFilePath; QAction * copyFilePath = m_am->actionCopyFilePath;
copyMenu->setIcon(QIcon::fromTheme(QLatin1String("edit-copy"))); copyMenu->setIcon(QIcon::fromTheme(u"edit-copy"_s));
copyMenu->addAction(copyPixmap); copyMenu->addAction(copyPixmap);
if (currentFileUrl.isValid()) { if (currentFileUrl.isValid()) {
copyMenu->addAction(copyFilePath); copyMenu->addAction(copyFilePath);
@ -577,19 +584,23 @@ void MainWindow::centerWindow()
Qt::LeftToRight, Qt::LeftToRight,
Qt::AlignCenter, Qt::AlignCenter,
this->size(), this->size(),
qApp->screenAt(QCursor::pos())->availableGeometry() window()->screen()->availableGeometry()
) )
); );
} }
void MainWindow::closeWindow() void MainWindow::closeWindow()
{ {
QRect windowRect(this->geometry()); if (Settings::instance()->useBuiltInCloseAnimation()) {
m_floatUpAnimation->setStartValue(windowRect); QRect windowRect(this->geometry());
m_floatUpAnimation->setEndValue(windowRect.adjusted(0, -80, 0, 0)); m_floatUpAnimation->setStartValue(windowRect);
m_floatUpAnimation->setStartValue(QRect(this->geometry().x(), this->geometry().y(), this->geometry().width(), this->geometry().height())); m_floatUpAnimation->setEndValue(windowRect.adjusted(0, -80, 0, 0));
m_floatUpAnimation->setEndValue(QRect(this->geometry().x(), this->geometry().y()-80, this->geometry().width(), this->geometry().height())); m_floatUpAnimation->setStartValue(QRect(this->geometry().x(), this->geometry().y(), this->geometry().width(), this->geometry().height()));
m_exitAnimationGroup->start(); m_floatUpAnimation->setEndValue(QRect(this->geometry().x(), this->geometry().y()-80, this->geometry().width(), this->geometry().height()));
m_exitAnimationGroup->start();
} else {
doCloseWindow();
}
} }
void MainWindow::updateWidgetsPosition() void MainWindow::updateWidgetsPosition()
@ -607,8 +618,7 @@ void MainWindow::toggleProtectedMode()
{ {
m_protectedMode = !m_protectedMode; m_protectedMode = !m_protectedMode;
m_closeButton->setVisible(!m_protectedMode); m_closeButton->setVisible(!m_protectedMode);
m_prevButton->setVisible(!m_protectedMode); updateGalleryButtonsVisibility();
m_nextButton->setVisible(!m_protectedMode);
} }
void MainWindow::toggleStayOnTop() void MainWindow::toggleStayOnTop()
@ -690,6 +700,7 @@ void MainWindow::on_actionActualSize_triggered()
{ {
m_graphicsView->resetScale(); m_graphicsView->resetScale();
m_graphicsView->setEnableAutoFitInView(false); m_graphicsView->setEnableAutoFitInView(false);
m_graphicsView->setLongImageMode(false);
} }
void MainWindow::on_actionToggleMaximize_triggered() void MainWindow::on_actionToggleMaximize_triggered()
@ -718,6 +729,7 @@ void MainWindow::on_actionFitInView_triggered()
{ {
m_graphicsView->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio); m_graphicsView->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio);
m_graphicsView->setEnableAutoFitInView(m_graphicsView->scaleFactor() <= 1); m_graphicsView->setEnableAutoFitInView(m_graphicsView->scaleFactor() <= 1);
m_graphicsView->setLongImageMode(false);
} }
void MainWindow::on_actionFitByWidth_triggered() void MainWindow::on_actionFitByWidth_triggered()
@ -725,6 +737,12 @@ void MainWindow::on_actionFitByWidth_triggered()
m_graphicsView->fitByOrientation(); m_graphicsView->fitByOrientation();
} }
void MainWindow::on_actionFitLongImage_triggered()
{
m_graphicsView->setLongImageMode(true);
m_graphicsView->fitLongImage();
}
void MainWindow::on_actionCopyPixmap_triggered() void MainWindow::on_actionCopyPixmap_triggered()
{ {
QClipboard *cb = QApplication::clipboard(); QClipboard *cb = QApplication::clipboard();
@ -784,7 +802,7 @@ void MainWindow::on_actionTrash_triggered()
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
bool succ = file.moveToTrash(); bool succ = file.moveToTrash();
if (!succ) { if (!succ) {
QMessageBox::warning(this, "Failed to move file to trash", QMessageBox::warning(this, tr("Failed to move file to trash"),
tr("Move to trash failed, it might caused by file permission issue, file system limitation, or platform limitation.")); tr("Move to trash failed, it might caused by file permission issue, file system limitation, or platform limitation."));
} else { } else {
m_pm->removeAt(index); m_pm->removeAt(index);
@ -803,14 +821,12 @@ void MainWindow::on_actionRotateClockwise_triggered()
{ {
m_graphicsView->rotateView(); m_graphicsView->rotateView();
m_graphicsView->displayScene(); m_graphicsView->displayScene();
m_gv->setVisible(false);
} }
void MainWindow::on_actionRotateCounterClockwise_triggered() void MainWindow::on_actionRotateCounterClockwise_triggered()
{ {
m_graphicsView->rotateView(false); m_graphicsView->rotateView(false);
m_graphicsView->displayScene(); m_graphicsView->displayScene();
m_gv->setVisible(false);
} }
void MainWindow::on_actionPrevPicture_triggered() void MainWindow::on_actionPrevPicture_triggered()
@ -895,9 +911,9 @@ void MainWindow::on_actionLocateInFileManager_triggered()
QDesktopServices::openUrl(folderUrl); QDesktopServices::openUrl(folderUrl);
return; return;
} }
QDBusInterface fm1Iface(QStringLiteral("org.freedesktop.FileManager1"), QDBusInterface fm1Iface(u"org.freedesktop.FileManager1"_s,
QStringLiteral("/org/freedesktop/FileManager1"), u"/org/freedesktop/FileManager1"_s,
QStringLiteral("org.freedesktop.FileManager1")); u"org.freedesktop.FileManager1"_s);
fm1Iface.setTimeout(1000); fm1Iface.setTimeout(1000);
fm1Iface.callWithArgumentList(QDBus::Block, "ShowItems", { fm1Iface.callWithArgumentList(QDBus::Block, "ShowItems", {
QStringList{currentFileUrl.toString()}, QStringList{currentFileUrl.toString()},
@ -916,9 +932,28 @@ void MainWindow::on_actionQuitApp_triggered()
quitAppAction(false); quitAppAction(false);
} }
void MainWindow::doCloseWindow()
{
#ifdef Q_OS_MAC
this->hide();
#else
this->close();
#endif
}
bool MainWindow::updateFileWatcher(const QString &basePath) bool MainWindow::updateFileWatcher(const QString &basePath)
{ {
m_fileSystemWatcher->removePaths(m_fileSystemWatcher->files()); m_fileSystemWatcher->removePaths(m_fileSystemWatcher->files());
if (!basePath.isEmpty()) return m_fileSystemWatcher->addPath(basePath); if (!basePath.isEmpty()) return m_fileSystemWatcher->addPath(basePath);
return false; return false;
} }
void MainWindow::updateGalleryButtonsVisibility()
{
const int galleryFileCount = m_pm->totalCount();
const bool loopGallery = Settings::instance()->loopGallery();
m_prevButton->setVisible(!m_protectedMode && galleryFileCount > 1);
m_nextButton->setVisible(!m_protectedMode && galleryFileCount > 1);
m_prevButton->setEnabled(loopGallery || !m_pm->isFirstIndex());
m_nextButton->setEnabled(loopGallery || !m_pm->isLastIndex());
}

View File

@ -1,137 +1,135 @@
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net> // SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef MAINWINDOW_H #ifndef MAINWINDOW_H
#define MAINWINDOW_H #define MAINWINDOW_H
#include "framelesswindow.h" #include "framelesswindow.h"
#include <QParallelAnimationGroup> #include <QParallelAnimationGroup>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QPushButton> #include <QPushButton>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QT_BEGIN_NAMESPACE
typedef QEnterEvent QT_ENTER_EVENT; class QGraphicsOpacityEffect;
#else class QGraphicsView;
typedef QEvent QT_ENTER_EVENT; class QFileSystemWatcher;
#endif // QT_VERSION_CHECK(6, 0, 0) QT_END_NAMESPACE
QT_BEGIN_NAMESPACE class ActionManager;
class QGraphicsOpacityEffect; class PlaylistManager;
class QGraphicsView; class ToolButton;
class QFileSystemWatcher; class GraphicsView;
QT_END_NAMESPACE class NavigatorView;
class BottomButtonGroup;
class ActionManager; class MainWindow : public FramelessWindow
class PlaylistManager; {
class ToolButton; Q_OBJECT
class GraphicsView;
class NavigatorView; public:
class BottomButtonGroup; explicit MainWindow(QWidget *parent = nullptr);
class MainWindow : public FramelessWindow ~MainWindow() override;
{
Q_OBJECT void showUrls(const QList<QUrl> &urls);
void initWindowSize();
public: void adjustWindowSizeBySceneRect();
explicit MainWindow(QWidget *parent = nullptr); QUrl currentImageFileUrl() const;
~MainWindow() override;
void clearGallery();
void showUrls(const QList<QUrl> &urls); void galleryPrev();
void initWindowSize(); void galleryNext();
void adjustWindowSizeBySceneRect(); void galleryCurrent(bool showLoadImageHintWhenEmpty, bool reloadImage);
QUrl currentImageFileUrl() const;
static QStringList supportedImageFormats();
void clearGallery();
void galleryPrev(); protected slots:
void galleryNext(); void showEvent(QShowEvent *event) override;
void galleryCurrent(bool showLoadImageHintWhenEmpty, bool reloadImage); void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
static QStringList supportedImageFormats(); void mousePressEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
protected slots: void mouseReleaseEvent(QMouseEvent *event) override;
void showEvent(QShowEvent *event) override; void mouseDoubleClickEvent(QMouseEvent *event) override;
void enterEvent(QT_ENTER_EVENT *event) override; void wheelEvent(QWheelEvent *event) override;
void leaveEvent(QEvent *event) override; void resizeEvent(QResizeEvent *event) override;
void mousePressEvent(QMouseEvent *event) override; void contextMenuEvent(QContextMenuEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override; void dragEnterEvent(QDragEnterEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override; void dragMoveEvent(QDragMoveEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event) override; void dropEvent(QDropEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
void resizeEvent(QResizeEvent *event) override; void centerWindow();
void contextMenuEvent(QContextMenuEvent *event) override; void closeWindow();
void dragEnterEvent(QDragEnterEvent *event) override; void updateWidgetsPosition();
void dragMoveEvent(QDragMoveEvent *event) override; void toggleProtectedMode();
void dropEvent(QDropEvent *event) override; void toggleStayOnTop();
void toggleAvoidResetTransform();
void centerWindow(); bool stayOnTop() const;
void closeWindow(); bool canPaste() const;
void updateWidgetsPosition(); void quitAppAction(bool force = false);
void toggleProtectedMode(); void toggleFullscreen();
void toggleStayOnTop(); void toggleMaximize();
void toggleAvoidResetTransform();
bool stayOnTop() const; protected:
bool canPaste() const; QSize sizeHint() const override;
void quitAppAction(bool force = false);
void toggleFullscreen(); private slots:
void toggleMaximize(); void on_actionOpen_triggered();
protected: void on_actionActualSize_triggered();
QSize sizeHint() const override; void on_actionToggleMaximize_triggered();
void on_actionZoomIn_triggered();
private slots: void on_actionZoomOut_triggered();
void on_actionOpen_triggered(); void on_actionToggleCheckerboard_triggered();
void on_actionRotateClockwise_triggered();
void on_actionActualSize_triggered(); void on_actionRotateCounterClockwise_triggered();
void on_actionToggleMaximize_triggered();
void on_actionZoomIn_triggered(); void on_actionPrevPicture_triggered();
void on_actionZoomOut_triggered(); void on_actionNextPicture_triggered();
void on_actionToggleCheckerboard_triggered();
void on_actionRotateClockwise_triggered(); void on_actionTogglePauseAnimation_triggered();
void on_actionRotateCounterClockwise_triggered(); void on_actionAnimationNextFrame_triggered();
void on_actionPrevPicture_triggered(); void on_actionHorizontalFlip_triggered();
void on_actionNextPicture_triggered(); void on_actionFitInView_triggered();
void on_actionFitByWidth_triggered();
void on_actionTogglePauseAnimation_triggered(); void on_actionFitLongImage_triggered();
void on_actionAnimationNextFrame_triggered(); void on_actionCopyPixmap_triggered();
void on_actionCopyFilePath_triggered();
void on_actionHorizontalFlip_triggered(); void on_actionPaste_triggered();
void on_actionFitInView_triggered(); void on_actionTrash_triggered();
void on_actionFitByWidth_triggered(); void on_actionToggleStayOnTop_triggered();
void on_actionCopyPixmap_triggered(); void on_actionToggleProtectMode_triggered();
void on_actionCopyFilePath_triggered(); void on_actionToggleAvoidResetTransform_triggered();
void on_actionPaste_triggered(); void on_actionSettings_triggered();
void on_actionTrash_triggered(); void on_actionHelp_triggered();
void on_actionToggleStayOnTop_triggered(); void on_actionProperties_triggered();
void on_actionToggleProtectMode_triggered(); void on_actionLocateInFileManager_triggered();
void on_actionToggleAvoidResetTransform_triggered(); void on_actionQuitApp_triggered();
void on_actionSettings_triggered();
void on_actionHelp_triggered(); void doCloseWindow();
void on_actionProperties_triggered();
void on_actionLocateInFileManager_triggered(); private:
void on_actionQuitApp_triggered(); bool updateFileWatcher(const QString & basePath = QString());
void updateGalleryButtonsVisibility();
private:
bool updateFileWatcher(const QString & basePath = QString()); private:
ActionManager *m_am;
private: PlaylistManager *m_pm;
ActionManager *m_am;
PlaylistManager *m_pm; QPoint m_oldMousePos;
QPropertyAnimation *m_fadeOutAnimation;
QPoint m_oldMousePos; QPropertyAnimation *m_floatUpAnimation;
QPropertyAnimation *m_fadeOutAnimation; QParallelAnimationGroup *m_exitAnimationGroup;
QPropertyAnimation *m_floatUpAnimation; QFileSystemWatcher *m_fileSystemWatcher;
QParallelAnimationGroup *m_exitAnimationGroup; ToolButton *m_closeButton;
QFileSystemWatcher *m_fileSystemWatcher; ToolButton *m_prevButton;
ToolButton *m_closeButton; ToolButton *m_nextButton;
ToolButton *m_prevButton; GraphicsView *m_graphicsView;
ToolButton *m_nextButton; NavigatorView *m_gv;
GraphicsView *m_graphicsView; BottomButtonGroup *m_bottomButtonGroup;
NavigatorView *m_gv; bool m_protectedMode = false;
BottomButtonGroup *m_bottomButtonGroup; bool m_clickedOnWindow = false;
bool m_protectedMode = false; };
bool m_clickedOnWindow = false;
}; #endif // MAINWINDOW_H
#endif // MAINWINDOW_H

View File

@ -1,110 +1,110 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "metadatadialog.h" #include "metadatadialog.h"
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QPainter> #include <QPainter>
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QHeaderView> #include <QHeaderView>
#include "metadatamodel.h" #include "metadatamodel.h"
class PropertyTreeView : public QTreeView class PropertyTreeView : public QTreeView
{ {
public: public:
explicit PropertyTreeView(QWidget* parent) : QTreeView(parent) {} explicit PropertyTreeView(QWidget* parent) : QTreeView(parent) {}
~PropertyTreeView() {} ~PropertyTreeView() {}
protected: protected:
void rowsInserted(const QModelIndex& parent, int start, int end) override void rowsInserted(const QModelIndex& parent, int start, int end) override
{ {
QTreeView::rowsInserted(parent, start, end); QTreeView::rowsInserted(parent, start, end);
if (!parent.isValid()) { if (!parent.isValid()) {
// we are inserting a section group // we are inserting a section group
for (int row = start; row <= end; ++row) { for (int row = start; row <= end; ++row) {
setupSection(row); setupSection(row);
} }
} else { } else {
// we are inserting a property // we are inserting a property
setRowHidden(parent.row(), QModelIndex(), false); setRowHidden(parent.row(), QModelIndex(), false);
} }
} }
void reset() override void reset() override
{ {
QTreeView::reset(); QTreeView::reset();
if (model()) { if (model()) {
for (int row = 0; row < model()->rowCount(); ++row) { for (int row = 0; row < model()->rowCount(); ++row) {
setupSection(row); setupSection(row);
} }
} }
} }
private: private:
void setupSection(int row) void setupSection(int row)
{ {
expand(model()->index(row, 0)); expand(model()->index(row, 0));
setFirstColumnSpanned(row, QModelIndex(), true); setFirstColumnSpanned(row, QModelIndex(), true);
setRowHidden(row, QModelIndex(), !model()->hasChildren(model()->index(row, 0))); setRowHidden(row, QModelIndex(), !model()->hasChildren(model()->index(row, 0)));
} }
}; };
class PropertyTreeItemDelegate : public QStyledItemDelegate class PropertyTreeItemDelegate : public QStyledItemDelegate
{ {
public: public:
PropertyTreeItemDelegate(QObject* parent) PropertyTreeItemDelegate(QObject* parent)
: QStyledItemDelegate(parent) : QStyledItemDelegate(parent)
{} {}
protected: protected:
void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override
{ {
QStyleOptionViewItem opt = option; QStyleOptionViewItem opt = option;
if (!index.parent().isValid()) { if (!index.parent().isValid()) {
opt.font.setBold(true); opt.font.setBold(true);
opt.features.setFlag(QStyleOptionViewItem::Alternate); opt.features.setFlag(QStyleOptionViewItem::Alternate);
} }
QStyledItemDelegate::paint(painter, opt, index); QStyledItemDelegate::paint(painter, opt, index);
} }
}; };
MetadataDialog::MetadataDialog(QWidget *parent) MetadataDialog::MetadataDialog(QWidget *parent)
: QDialog(parent) : QDialog(parent)
, m_treeView(new PropertyTreeView(this)) , m_treeView(new PropertyTreeView(this))
{ {
m_treeView->setRootIsDecorated(false); m_treeView->setRootIsDecorated(false);
m_treeView->setIndentation(0); m_treeView->setIndentation(0);
m_treeView->setItemDelegate(new PropertyTreeItemDelegate(m_treeView)); m_treeView->setItemDelegate(new PropertyTreeItemDelegate(m_treeView));
m_treeView->header()->resizeSection(0, sizeHint().width() / 2); m_treeView->header()->resizeSection(0, sizeHint().width() / 2);
setWindowTitle(tr("Image Metadata")); setWindowTitle(tr("Image Metadata"));
QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
setLayout(new QVBoxLayout); setLayout(new QVBoxLayout);
layout()->addWidget(m_treeView); layout()->addWidget(m_treeView);
layout()->addWidget(buttonBox); layout()->addWidget(buttonBox);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::close); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::close);
setWindowFlag(Qt::WindowContextHelpButtonHint, false); setWindowFlag(Qt::WindowContextHelpButtonHint, false);
} }
MetadataDialog::~MetadataDialog() MetadataDialog::~MetadataDialog()
{ {
} }
void MetadataDialog::setMetadataModel(MetadataModel * model) void MetadataDialog::setMetadataModel(MetadataModel * model)
{ {
m_treeView->setModel(model); m_treeView->setModel(model);
} }
QSize MetadataDialog::sizeHint() const QSize MetadataDialog::sizeHint() const
{ {
return QSize(520, 350); return QSize(520, 350);
} }

View File

@ -1,30 +1,30 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef METADATADIALOG_H #ifndef METADATADIALOG_H
#define METADATADIALOG_H #define METADATADIALOG_H
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QTreeView; class QTreeView;
QT_END_NAMESPACE QT_END_NAMESPACE
class MetadataModel; class MetadataModel;
class MetadataDialog : public QDialog class MetadataDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit MetadataDialog(QWidget * parent); explicit MetadataDialog(QWidget * parent);
~MetadataDialog() override; ~MetadataDialog() override;
void setMetadataModel(MetadataModel * model); void setMetadataModel(MetadataModel * model);
QSize sizeHint() const override; QSize sizeHint() const override;
private: private:
QTreeView * m_treeView = nullptr; QTreeView * m_treeView = nullptr;
}; };
#endif // METADATADIALOG_H #endif // METADATADIALOG_H

View File

@ -1,318 +1,320 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "metadatamodel.h" #include "metadatamodel.h"
#include "exiv2wrapper.h" #include "exiv2wrapper.h"
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#include <QDateTime> #include <QDateTime>
#include <QFileInfo> #include <QFileInfo>
#include <QImageReader> #include <QImageReader>
MetadataModel::MetadataModel(QObject *parent) using namespace Qt::Literals::StringLiterals;
: QAbstractItemModel(parent)
{ MetadataModel::MetadataModel(QObject *parent)
: QAbstractItemModel(parent)
} {
MetadataModel::~MetadataModel() }
{
MetadataModel::~MetadataModel()
} {
void MetadataModel::setFile(const QString &imageFilePath) }
{
QFileInfo fileInfo(imageFilePath); void MetadataModel::setFile(const QString &imageFilePath)
// It'll be fine if we don't re-use the image reader we pass to the graphics scene for now. {
QImageReader imgReader(imageFilePath); QFileInfo fileInfo(imageFilePath);
imgReader.setAutoTransform(true); // It'll be fine if we don't re-use the image reader we pass to the graphics scene for now.
imgReader.setDecideFormatFromContent(true); QImageReader imgReader(imageFilePath);
imgReader.setAutoTransform(true);
const QString & itemTypeString = tr("%1 File").arg(QString(imgReader.format().toUpper())); imgReader.setDecideFormatFromContent(true);
const QString & sizeString = QLocale().formattedDataSize(fileInfo.size());
const QString & birthTimeString = QLocale().toString(fileInfo.birthTime(), QLocale::LongFormat); const QString & itemTypeString = tr("%1 File").arg(QString(imgReader.format().toUpper()));
const QString & lastModifiedTimeString = QLocale().toString(fileInfo.lastModified(), QLocale::LongFormat); const QString & sizeString = QLocale().formattedDataSize(fileInfo.size());
const QString & imageDimensionsString = imageSize(imgReader.size()); const QString & birthTimeString = QLocale().toString(fileInfo.birthTime(), QLocale::LongFormat);
const QString & imageRatioString = imageSizeRatio(imgReader.size()); const QString & lastModifiedTimeString = QLocale().toString(fileInfo.lastModified(), QLocale::LongFormat);
const QString & imageDimensionsString = imageSize(imgReader.size());
appendSection(QStringLiteral("Description"), tr("Description", "Section name.")); const QString & imageRatioString = imageSizeRatio(imgReader.size());
appendSection(QStringLiteral("Origin"), tr("Origin", "Section name."));
appendSection(QStringLiteral("Image"), tr("Image", "Section name.")); appendSection(u"Description"_s, tr("Description", "Section name."));
appendSection(QStringLiteral("Camera"), tr("Camera", "Section name.")); appendSection(u"Origin"_s, tr("Origin", "Section name."));
appendSection(QStringLiteral("AdvancedPhoto"), tr("Advanced photo", "Section name.")); appendSection(u"Image"_s, tr("Image", "Section name."));
appendSection(QStringLiteral("GPS"), tr("GPS", "Section name.")); appendSection(u"Camera"_s, tr("Camera", "Section name."));
appendSection(QStringLiteral("File"), tr("File", "Section name.")); appendSection(u"AdvancedPhoto"_s, tr("Advanced photo", "Section name."));
appendSection(u"GPS"_s, tr("GPS", "Section name."));
if (imgReader.supportsOption(QImageIOHandler::Size)) { appendSection(u"File"_s, tr("File", "Section name."));
appendProperty(QStringLiteral("Image"), QStringLiteral("Image.Dimensions"),
tr("Dimensions"), imageDimensionsString); if (imgReader.supportsOption(QImageIOHandler::Size)) {
appendProperty(QStringLiteral("Image"), QStringLiteral("Image.SizeRatio"), appendProperty(u"Image"_s, u"Image.Dimensions"_s,
tr("Aspect ratio"), imageRatioString); tr("Dimensions"), imageDimensionsString);
} appendProperty(u"Image"_s, u"Image.SizeRatio"_s,
if (imgReader.supportsAnimation() && imgReader.imageCount() > 1) { tr("Aspect ratio"), imageRatioString);
appendProperty(QStringLiteral("Image"), QStringLiteral("Image.FrameCount"), }
tr("Frame count"), QString::number(imgReader.imageCount())); if (imgReader.supportsAnimation() && imgReader.imageCount() > 1) {
} appendProperty(u"Image"_s, u"Image.FrameCount"_s,
tr("Frame count"), QString::number(imgReader.imageCount()));
appendProperty(QStringLiteral("File"), QStringLiteral("File.Name"), }
tr("Name"), fileInfo.fileName());
appendProperty(QStringLiteral("File"), QStringLiteral("File.ItemType"), appendProperty(u"File"_s, u"File.Name"_s,
tr("Item type"), itemTypeString); tr("Name"), fileInfo.fileName());
appendProperty(QStringLiteral("File"), QStringLiteral("File.Path"), appendProperty(u"File"_s, u"File.ItemType"_s,
tr("Folder path"), QDir::toNativeSeparators(fileInfo.path())); tr("Item type"), itemTypeString);
appendProperty(QStringLiteral("File"), QStringLiteral("File.Size"), appendProperty(u"File"_s, u"File.Path"_s,
tr("Size"), sizeString); tr("Folder path"), QDir::toNativeSeparators(fileInfo.path()));
appendProperty(QStringLiteral("File"), QStringLiteral("File.CreatedTime"), appendProperty(u"File"_s, u"File.Size"_s,
tr("Date created"), birthTimeString); tr("Size"), sizeString);
appendProperty(QStringLiteral("File"), QStringLiteral("File.LastModified"), appendProperty(u"File"_s, u"File.CreatedTime"_s,
tr("Date modified"), lastModifiedTimeString); tr("Date created"), birthTimeString);
appendProperty(u"File"_s, u"File.LastModified"_s,
Exiv2Wrapper wrapper; tr("Date modified"), lastModifiedTimeString);
if (wrapper.load(imageFilePath)) {
wrapper.cacheSections(); Exiv2Wrapper wrapper;
if (wrapper.load(imageFilePath)) {
appendExivPropertyIfExist(wrapper, QStringLiteral("Description"), wrapper.cacheSections();
QStringLiteral("Xmp.dc.title"), tr("Title"), true);
appendExivPropertyIfExist(wrapper, QStringLiteral("Description"), appendExivPropertyIfExist(wrapper, u"Description"_s,
QStringLiteral("Exif.Image.ImageDescription"), tr("Subject"), true); u"Xmp.dc.title"_s, tr("Title"), true);
appendExivPropertyIfExist(wrapper, QStringLiteral("Description"), appendExivPropertyIfExist(wrapper, u"Description"_s,
QStringLiteral("Exif.Image.Rating"), tr("Rating")); u"Exif.Image.ImageDescription"_s, tr("Subject"), true);
appendExivPropertyIfExist(wrapper, QStringLiteral("Description"), appendExivPropertyIfExist(wrapper, u"Description"_s,
QStringLiteral("Xmp.dc.subject"), tr("Tags")); u"Exif.Image.Rating"_s, tr("Rating"));
appendPropertyIfNotEmpty(QStringLiteral("Description"), QStringLiteral("Description.Comments"), appendExivPropertyIfExist(wrapper, u"Description"_s,
tr("Comments"), wrapper.comment()); u"Xmp.dc.subject"_s, tr("Tags"));
appendPropertyIfNotEmpty(u"Description"_s, u"Description.Comments"_s,
appendExivPropertyIfExist(wrapper, QStringLiteral("Origin"), tr("Comments"), wrapper.comment());
QStringLiteral("Exif.Image.Artist"), tr("Authors"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Origin"), appendExivPropertyIfExist(wrapper, u"Origin"_s,
QStringLiteral("Exif.Photo.DateTimeOriginal"), tr("Date taken")); u"Exif.Image.Artist"_s, tr("Authors"));
// FIXME: We may fetch the same type of metadata from different metadata collection. appendExivPropertyIfExist(wrapper, u"Origin"_s,
// Current implementation is not pretty and may need to do a rework... u"Exif.Photo.DateTimeOriginal"_s, tr("Date taken"));
// appendExivPropertyIfExist(wrapper, QStringLiteral("Origin"), // FIXME: We may fetch the same type of metadata from different metadata collection.
// QStringLiteral("Xmp.xmp.CreatorTool"), tr("Program name")); // Current implementation is not pretty and may need to do a rework...
appendExivPropertyIfExist(wrapper, QStringLiteral("Origin"), // appendExivPropertyIfExist(wrapper, QStringLiteral("Origin"),
QStringLiteral("Exif.Image.Software"), tr("Program name")); // QStringLiteral("Xmp.xmp.CreatorTool"), tr("Program name"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Origin"), appendExivPropertyIfExist(wrapper, u"Origin"_s,
QStringLiteral("Exif.Image.Copyright"), tr("Copyright")); u"Exif.Image.Software"_s, tr("Program name"));
appendExivPropertyIfExist(wrapper, u"Origin"_s,
appendExivPropertyIfExist(wrapper, QStringLiteral("Image"), u"Exif.Image.Copyright"_s, tr("Copyright"));
QStringLiteral("Exif.Image.XResolution"), tr("Horizontal resolution"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Image"), appendExivPropertyIfExist(wrapper, u"Image"_s,
QStringLiteral("Exif.Image.YResolution"), tr("Vertical resolution")); u"Exif.Image.XResolution"_s, tr("Horizontal resolution"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Image"), appendExivPropertyIfExist(wrapper, u"Image"_s,
QStringLiteral("Exif.Image.ResolutionUnit"), tr("Resolution unit")); u"Exif.Image.YResolution"_s, tr("Vertical resolution"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Image"), appendExivPropertyIfExist(wrapper, u"Image"_s,
QStringLiteral("Exif.Photo.ColorSpace"), tr("Colour representation")); u"Exif.Image.ResolutionUnit"_s, tr("Resolution unit"));
appendExivPropertyIfExist(wrapper, u"Image"_s,
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), u"Exif.Photo.ColorSpace"_s, tr("Colour representation"));
QStringLiteral("Exif.Image.Make"), tr("Camera maker"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Image.Model"), tr("Camera model")); u"Exif.Image.Make"_s, tr("Camera maker"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.FNumber"), tr("F-stop")); u"Exif.Image.Model"_s, tr("Camera model"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.ExposureTime"), tr("Exposure time")); u"Exif.Photo.FNumber"_s, tr("F-stop"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.ISOSpeedRatings"), tr("ISO speed")); u"Exif.Photo.ExposureTime"_s, tr("Exposure time"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.ExposureBiasValue"), tr("Exposure bias")); u"Exif.Photo.ISOSpeedRatings"_s, tr("ISO speed"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.FocalLength"), tr("Focal length")); u"Exif.Photo.ExposureBiasValue"_s, tr("Exposure bias"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.MaxApertureValue"), tr("Max aperture")); u"Exif.Photo.FocalLength"_s, tr("Focal length"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.MeteringMode"), tr("Metering mode")); u"Exif.Photo.MaxApertureValue"_s, tr("Max aperture"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.SubjectDistance"), tr("Subject distance")); u"Exif.Photo.MeteringMode"_s, tr("Metering mode"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.Flash"), tr("Flash mode")); u"Exif.Photo.SubjectDistance"_s, tr("Subject distance"));
appendExivPropertyIfExist(wrapper, QStringLiteral("Camera"), appendExivPropertyIfExist(wrapper, u"Camera"_s,
QStringLiteral("Exif.Photo.FocalLengthIn35mmFilm"), tr("35mm focal length")); u"Exif.Photo.Flash"_s, tr("Flash mode"));
appendExivPropertyIfExist(wrapper, u"Camera"_s,
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), u"Exif.Photo.FocalLengthIn35mmFilm"_s, tr("35mm focal length"));
QStringLiteral("Exif.Photo.LensModel"), tr("Lens model"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.Contrast"), tr("Contrast")); u"Exif.Photo.LensModel"_s, tr("Lens model"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.BrightnessValue"), tr("Brightness")); u"Exif.Photo.Contrast"_s, tr("Contrast"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.ExposureProgram"), tr("Exposure program")); u"Exif.Photo.BrightnessValue"_s, tr("Brightness"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.Saturation"), tr("Saturation")); u"Exif.Photo.ExposureProgram"_s, tr("Exposure program"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.Sharpness"), tr("Sharpness")); u"Exif.Photo.Saturation"_s, tr("Saturation"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.WhiteBalance"), tr("White balance")); u"Exif.Photo.Sharpness"_s, tr("Sharpness"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.DigitalZoomRatio"), tr("Digital zoom")); u"Exif.Photo.WhiteBalance"_s, tr("White balance"));
appendExivPropertyIfExist(wrapper, QStringLiteral("AdvancedPhoto"), appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
QStringLiteral("Exif.Photo.ExifVersion"), tr("EXIF version")); u"Exif.Photo.DigitalZoomRatio"_s, tr("Digital zoom"));
appendExivPropertyIfExist(wrapper, u"AdvancedPhoto"_s,
appendExivPropertyIfExist(wrapper, QStringLiteral("GPS"), u"Exif.Photo.ExifVersion"_s, tr("EXIF version"));
QStringLiteral("Exif.GPSInfo.GPSLatitudeRef"), tr("Latitude reference"));
appendExivPropertyIfExist(wrapper, QStringLiteral("GPS"), appendExivPropertyIfExist(wrapper, u"GPS"_s,
QStringLiteral("Exif.GPSInfo.GPSLatitude"), tr("Latitude")); u"Exif.GPSInfo.GPSLatitudeRef"_s, tr("Latitude reference"));
appendExivPropertyIfExist(wrapper, QStringLiteral("GPS"), appendExivPropertyIfExist(wrapper, u"GPS"_s,
QStringLiteral("Exif.GPSInfo.GPSLongitudeRef"), tr("Longitude reference")); u"Exif.GPSInfo.GPSLatitude"_s, tr("Latitude"));
appendExivPropertyIfExist(wrapper, QStringLiteral("GPS"), appendExivPropertyIfExist(wrapper, u"GPS"_s,
QStringLiteral("Exif.GPSInfo.GPSLongitude"), tr("Longitude")); u"Exif.GPSInfo.GPSLongitudeRef"_s, tr("Longitude reference"));
appendExivPropertyIfExist(wrapper, QStringLiteral("GPS"), appendExivPropertyIfExist(wrapper, u"GPS"_s,
QStringLiteral("Exif.GPSInfo.GPSAltitudeRef"), tr("Altitude reference")); u"Exif.GPSInfo.GPSLongitude"_s, tr("Longitude"));
appendExivPropertyIfExist(wrapper, QStringLiteral("GPS"), appendExivPropertyIfExist(wrapper, u"GPS"_s,
QStringLiteral("Exif.GPSInfo.GPSAltitude"), tr("Altitude")); u"Exif.GPSInfo.GPSAltitudeRef"_s, tr("Altitude reference"));
appendExivPropertyIfExist(wrapper, u"GPS"_s,
} u"Exif.GPSInfo.GPSAltitude"_s, tr("Altitude"));
}
}
QString MetadataModel::imageSize(const QSize &size) }
{
QString imageSize; QString MetadataModel::imageSize(const QSize &size)
{
if (size.isValid()) { QString imageSize;
imageSize = tr("%1 x %2").arg(QString::number(size.width()), QString::number(size.height()));
} else { if (size.isValid()) {
imageSize = QLatin1Char('-'); imageSize = tr("%1 x %2").arg(QString::number(size.width()), QString::number(size.height()));
} } else {
imageSize = QLatin1Char('-');
return imageSize; }
}
return imageSize;
int simplegcd(int a, int b) { }
return b == 0 ? a : simplegcd(b, a % b);
} int simplegcd(int a, int b) {
return b == 0 ? a : simplegcd(b, a % b);
QString MetadataModel::imageSizeRatio(const QSize &size) }
{
if (!size.isValid()) { QString MetadataModel::imageSizeRatio(const QSize &size)
return QStringLiteral("-"); {
} if (!size.isValid()) {
int gcd = simplegcd(size.width(), size.height()); return QStringLiteral("-");
return tr("%1 : %2").arg(QString::number(size.width() / gcd), QString::number(size.height() / gcd)); }
} int gcd = simplegcd(size.width(), size.height());
return tr("%1 : %2").arg(QString::number(size.width() / gcd), QString::number(size.height() / gcd));
bool MetadataModel::appendSection(const QString &sectionKey, QStringView sectionDisplayName) }
{
if (m_sections.contains(sectionKey)) { bool MetadataModel::appendSection(const QString &sectionKey, QStringView sectionDisplayName)
return false; {
} if (m_sections.contains(sectionKey)) {
return false;
m_sections.append(sectionKey); }
m_sectionProperties[sectionKey] = qMakePair<QString, QList<QString> >(sectionDisplayName.toString(), {});
m_sections.append(sectionKey);
return true; m_sectionProperties[sectionKey] = qMakePair<QString, QList<QString> >(sectionDisplayName.toString(), {});
}
return true;
bool MetadataModel::appendPropertyIfNotEmpty(const QString &sectionKey, const QString &propertyKey, const QString &propertyDisplayName, const QString &propertyValue) }
{
if (propertyValue.isEmpty()) return false; bool MetadataModel::appendPropertyIfNotEmpty(const QString &sectionKey, const QString &propertyKey, const QString &propertyDisplayName, const QString &propertyValue)
{
return appendProperty(sectionKey, propertyKey, propertyDisplayName, propertyValue); if (propertyValue.isEmpty()) return false;
}
return appendProperty(sectionKey, propertyKey, propertyDisplayName, propertyValue);
bool MetadataModel::appendProperty(const QString &sectionKey, const QString &propertyKey, QStringView propertyDisplayName, QStringView propertyValue) }
{
if (!m_sections.contains(sectionKey)) { bool MetadataModel::appendProperty(const QString &sectionKey, const QString &propertyKey, QStringView propertyDisplayName, QStringView propertyValue)
return false; {
} if (!m_sections.contains(sectionKey)) {
return false;
QList<QString> & propertyList = m_sectionProperties[sectionKey].second; }
if (!propertyList.contains(propertyKey)) {
propertyList.append(propertyKey); QList<QString> & propertyList = m_sectionProperties[sectionKey].second;
} if (!propertyList.contains(propertyKey)) {
propertyList.append(propertyKey);
m_properties[propertyKey] = qMakePair<QString, QString>(propertyDisplayName.toString(), propertyValue.toString()); }
return true; m_properties[propertyKey] = qMakePair<QString, QString>(propertyDisplayName.toString(), propertyValue.toString());
}
return true;
bool MetadataModel::appendExivPropertyIfExist(const Exiv2Wrapper &wrapper, const QString &sectionKey, const QString &exiv2propertyKey, const QString &propertyDisplayName, bool isXmpString) }
{
const QString & value = wrapper.value(exiv2propertyKey); bool MetadataModel::appendExivPropertyIfExist(const Exiv2Wrapper &wrapper, const QString &sectionKey, const QString &exiv2propertyKey, const QString &propertyDisplayName, bool isXmpString)
if (!value.isEmpty()) { {
appendProperty(sectionKey, exiv2propertyKey, const QString & value = wrapper.value(exiv2propertyKey);
propertyDisplayName.isEmpty() ? wrapper.label(exiv2propertyKey) : propertyDisplayName, if (!value.isEmpty()) {
isXmpString ? Exiv2Wrapper::XmpValue(value) : value); appendProperty(sectionKey, exiv2propertyKey,
return true; propertyDisplayName.isEmpty() ? wrapper.label(exiv2propertyKey) : propertyDisplayName,
} isXmpString ? Exiv2Wrapper::XmpValue(value) : value);
return false; return true;
} }
return false;
QModelIndex MetadataModel::index(int row, int column, const QModelIndex &parent) const }
{
if (!hasIndex(row, column, parent)) { QModelIndex MetadataModel::index(int row, int column, const QModelIndex &parent) const
return QModelIndex(); {
} if (!hasIndex(row, column, parent)) {
return QModelIndex();
if (!parent.isValid()) { }
return createIndex(row, column, RowType::SectionRow);
} else { if (!parent.isValid()) {
// internalid param: row means nth section it belongs to. return createIndex(row, column, RowType::SectionRow);
return createIndex(row, column, RowType::PropertyRow + parent.row()); } else {
} // internalid param: row means nth section it belongs to.
} return createIndex(row, column, RowType::PropertyRow + parent.row());
}
QModelIndex MetadataModel::parent(const QModelIndex &child) const }
{
if (!child.isValid()) { QModelIndex MetadataModel::parent(const QModelIndex &child) const
return QModelIndex(); {
} if (!child.isValid()) {
return QModelIndex();
if (child.internalId() == RowType::SectionRow) { }
return QModelIndex();
} else { if (child.internalId() == RowType::SectionRow) {
return createIndex(child.internalId() - RowType::PropertyRow, 0, SectionRow); return QModelIndex();
} } else {
} return createIndex(child.internalId() - RowType::PropertyRow, 0, SectionRow);
}
int MetadataModel::rowCount(const QModelIndex &parent) const }
{
if (!parent.isValid()) { int MetadataModel::rowCount(const QModelIndex &parent) const
return m_sections.count(); {
} if (!parent.isValid()) {
return m_sections.count();
if (parent.internalId() == RowType::SectionRow) { }
const QString & sectionKey = m_sections[parent.row()];
return m_sectionProperties[sectionKey].second.count(); if (parent.internalId() == RowType::SectionRow) {
} const QString & sectionKey = m_sections[parent.row()];
return m_sectionProperties[sectionKey].second.count();
return 0; }
}
return 0;
int MetadataModel::columnCount(const QModelIndex &) const }
{
// Always key(display name) and value. int MetadataModel::columnCount(const QModelIndex &) const
return 2; {
} // Always key(display name) and value.
return 2;
QVariant MetadataModel::data(const QModelIndex &index, int role) const }
{
if (!index.isValid()) { QVariant MetadataModel::data(const QModelIndex &index, int role) const
return QVariant(); {
} if (!index.isValid()) {
return QVariant();
if (role != Qt::DisplayRole) { }
return QVariant();
} if (role != Qt::DisplayRole) {
return QVariant();
if (index.internalId() == RowType::SectionRow) { }
return (index.column() == 0) ? m_sectionProperties[m_sections[index.row()]].first
: QVariant(); if (index.internalId() == RowType::SectionRow) {
} else { return (index.column() == 0) ? m_sectionProperties[m_sections[index.row()]].first
int sectionIndex = index.internalId() - RowType::PropertyRow; : QVariant();
const QString & sectionKey = m_sections[sectionIndex]; } else {
const QList<QString> & propertyList = m_sectionProperties[sectionKey].second; int sectionIndex = index.internalId() - RowType::PropertyRow;
return (index.column() == 0) ? m_properties[propertyList[index.row()]].first const QString & sectionKey = m_sections[sectionIndex];
: m_properties[propertyList[index.row()]].second; const QList<QString> & propertyList = m_sectionProperties[sectionKey].second;
} return (index.column() == 0) ? m_properties[propertyList[index.row()]].first
} : m_properties[propertyList[index.row()]].second;
}
QVariant MetadataModel::headerData(int section, Qt::Orientation orientation, int role) const }
{
if (orientation == Qt::Vertical || role != Qt::DisplayRole) { QVariant MetadataModel::headerData(int section, Qt::Orientation orientation, int role) const
return QVariant(); {
} if (orientation == Qt::Vertical || role != Qt::DisplayRole) {
return QVariant();
return section == 0 ? tr("Property") : tr("Value"); }
}
return section == 0 ? tr("Property") : tr("Value");
}

View File

@ -1,52 +1,52 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef METADATAMODEL_H #ifndef METADATAMODEL_H
#define METADATAMODEL_H #define METADATAMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>
class Exiv2Wrapper; class Exiv2Wrapper;
class MetadataModel : public QAbstractItemModel class MetadataModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit MetadataModel(QObject *parent = nullptr); explicit MetadataModel(QObject *parent = nullptr);
~MetadataModel(); ~MetadataModel();
void setFile(const QString & imageFilePath); void setFile(const QString & imageFilePath);
static QString imageSize(const QSize &size); static QString imageSize(const QSize &size);
static QString imageSizeRatio(const QSize &size); static QString imageSizeRatio(const QSize &size);
bool appendSection(const QString & sectionKey, QStringView sectionDisplayName); bool appendSection(const QString & sectionKey, QStringView sectionDisplayName);
bool appendPropertyIfNotEmpty(const QString & sectionKey, const QString & propertyKey, bool appendPropertyIfNotEmpty(const QString & sectionKey, const QString & propertyKey,
const QString & propertyDisplayName, const QString & propertyValue = QString()); const QString & propertyDisplayName, const QString & propertyValue = QString());
bool appendProperty(const QString & sectionKey, const QString & propertyKey, bool appendProperty(const QString & sectionKey, const QString & propertyKey,
QStringView propertyDisplayName, QStringView propertyValue = QString()); QStringView propertyDisplayName, QStringView propertyValue = QString());
bool appendExivPropertyIfExist(const Exiv2Wrapper & wrapper, const QString & sectionKey, bool appendExivPropertyIfExist(const Exiv2Wrapper & wrapper, const QString & sectionKey,
const QString & exiv2propertyKey, const QString & propertyDisplayName = QString(), const QString & exiv2propertyKey, const QString & propertyDisplayName = QString(),
bool isXmpString = false); bool isXmpString = false);
private: private:
enum RowType : quintptr { enum RowType : quintptr {
SectionRow, SectionRow,
PropertyRow, PropertyRow,
}; };
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const override; QModelIndex parent(const QModelIndex &child) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex & = QModelIndex()) const override; int columnCount(const QModelIndex & = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
// [SECTION_KEY] // [SECTION_KEY]
QList<QString> m_sections; QList<QString> m_sections;
// {SECTION_KEY: (SECTION_DISPLAY_NAME, [PROPERTY_KEY])} // {SECTION_KEY: (SECTION_DISPLAY_NAME, [PROPERTY_KEY])}
QMap<QString, QPair<QString, QList<QString> > > m_sectionProperties; QMap<QString, QPair<QString, QList<QString> > > m_sectionProperties;
// {PROPERTY_KEY: (PROPERTY_DISPLAY_NAME, PROPERTY_VALUE)} // {PROPERTY_KEY: (PROPERTY_DISPLAY_NAME, PROPERTY_VALUE)}
QMap<QString, QPair<QString, QString> > m_properties; QMap<QString, QPair<QString, QString> > m_properties;
}; };
#endif // METADATAMODEL_H #endif // METADATAMODEL_H

View File

@ -1,86 +1,91 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "navigatorview.h" #include "navigatorview.h"
#include "graphicsview.h" #include "graphicsview.h"
#include "opacityhelper.h" #include "opacityhelper.h"
#include <QMouseEvent> #include <QMouseEvent>
#include <QDebug> #include <QDebug>
#include <QTimer>
NavigatorView::NavigatorView(QWidget *parent)
: QGraphicsView (parent) NavigatorView::NavigatorView(QWidget *parent)
, m_viewportRegion(this->rect()) : QGraphicsView (parent)
, m_opacityHelper(new OpacityHelper(this)) , m_viewportRegion(this->rect())
{ , m_opacityHelper(new OpacityHelper(this))
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); {
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setStyleSheet("background-color: rgba(0, 0, 0, 120);" setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
"border-radius: 3px;"); setStyleSheet("background-color: rgba(0, 0, 0, 120);"
} "border-radius: 3px;");
}
// doesn't take or manage its ownership
void NavigatorView::setMainView(GraphicsView *mainView) // doesn't take or manage its ownership
{ void NavigatorView::setMainView(GraphicsView *mainView)
m_mainView = mainView; {
} m_mainView = mainView;
}
void NavigatorView::setOpacity(qreal opacity, bool animated)
{ void NavigatorView::setOpacity(qreal opacity, bool animated)
m_opacityHelper->setOpacity(opacity, animated); {
} m_opacityHelper->setOpacity(opacity, animated);
}
void NavigatorView::updateMainViewportRegion()
{ void NavigatorView::updateMainViewportRegion()
if (m_mainView != nullptr) { {
m_viewportRegion = mapFromScene(m_mainView->mapToScene(m_mainView->rect())); // Use QTimer::singleShot with lambda to delay the update
update(); // This ensures all geometry updates are complete before calculating viewport region
} QTimer::singleShot(0, [this]() {
} if (m_mainView != nullptr) {
m_viewportRegion = mapFromScene(m_mainView->mapToScene(m_mainView->rect()));
void NavigatorView::mousePressEvent(QMouseEvent *event) update();
{ }
m_mouseDown = true; });
}
if (m_mainView) {
m_mainView->centerOn(mapToScene(event->pos())); void NavigatorView::mousePressEvent(QMouseEvent *event)
update(); {
} m_mouseDown = true;
event->accept(); if (m_mainView) {
} m_mainView->centerOn(mapToScene(event->pos()));
update();
void NavigatorView::mouseMoveEvent(QMouseEvent *event) }
{
if (m_mouseDown && m_mainView) { event->accept();
m_mainView->centerOn(mapToScene(event->pos())); }
update();
event->accept(); void NavigatorView::mouseMoveEvent(QMouseEvent *event)
} else { {
event->ignore(); if (m_mouseDown && m_mainView) {
} m_mainView->centerOn(mapToScene(event->pos()));
} update();
event->accept();
void NavigatorView::mouseReleaseEvent(QMouseEvent *event) } else {
{ event->ignore();
m_mouseDown = false; }
}
event->accept();
} void NavigatorView::mouseReleaseEvent(QMouseEvent *event)
{
void NavigatorView::wheelEvent(QWheelEvent *event) m_mouseDown = false;
{
event->ignore(); event->accept();
return QGraphicsView::wheelEvent(event); }
}
void NavigatorView::wheelEvent(QWheelEvent *event)
void NavigatorView::paintEvent(QPaintEvent *event) {
{ event->ignore();
QGraphicsView::paintEvent(event); return QGraphicsView::wheelEvent(event);
}
QPainter painter(viewport());
painter.setPen(QPen(Qt::gray, 2)); void NavigatorView::paintEvent(QPaintEvent *event)
painter.drawRect(m_viewportRegion.boundingRect()); {
} QGraphicsView::paintEvent(event);
QPainter painter(viewport());
painter.setPen(QPen(Qt::gray, 2));
painter.drawRect(m_viewportRegion.boundingRect());
}

View File

@ -1,38 +1,38 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef NAVIGATORVIEW_H #ifndef NAVIGATORVIEW_H
#define NAVIGATORVIEW_H #define NAVIGATORVIEW_H
#include <QGraphicsView> #include <QGraphicsView>
class OpacityHelper; class OpacityHelper;
class GraphicsView; class GraphicsView;
class NavigatorView : public QGraphicsView class NavigatorView : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
NavigatorView(QWidget *parent = nullptr); NavigatorView(QWidget *parent = nullptr);
void setMainView(GraphicsView *mainView); void setMainView(GraphicsView *mainView);
void setOpacity(qreal opacity, bool animated = true); void setOpacity(qreal opacity, bool animated = true);
public slots: public slots:
void updateMainViewportRegion(); void updateMainViewportRegion();
private: private:
void mousePressEvent(QMouseEvent * event) override; void mousePressEvent(QMouseEvent * event) override;
void mouseMoveEvent(QMouseEvent * event) override; void mouseMoveEvent(QMouseEvent * event) override;
void mouseReleaseEvent(QMouseEvent * event) override; void mouseReleaseEvent(QMouseEvent * event) override;
void wheelEvent(QWheelEvent *event) override; void wheelEvent(QWheelEvent *event) override;
void paintEvent(QPaintEvent *event) override; void paintEvent(QPaintEvent *event) override;
bool m_mouseDown = false; bool m_mouseDown = false;
QPolygon m_viewportRegion; QPolygon m_viewportRegion;
QGraphicsView *m_mainView = nullptr; QGraphicsView *m_mainView = nullptr;
OpacityHelper *m_opacityHelper = nullptr; OpacityHelper *m_opacityHelper = nullptr;
}; };
#endif // NAVIGATORVIEW_H #endif // NAVIGATORVIEW_H

View File

@ -1,31 +1,31 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "opacityhelper.h" #include "opacityhelper.h"
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#include <QPropertyAnimation> #include <QPropertyAnimation>
OpacityHelper::OpacityHelper(QWidget *parent) OpacityHelper::OpacityHelper(QWidget *parent)
: QObject(parent) : QObject(parent)
, m_opacityFx(new QGraphicsOpacityEffect(parent)) , m_opacityFx(new QGraphicsOpacityEffect(parent))
, m_opacityAnimation(new QPropertyAnimation(m_opacityFx, "opacity")) , m_opacityAnimation(new QPropertyAnimation(m_opacityFx, "opacity"))
{ {
parent->setGraphicsEffect(m_opacityFx); parent->setGraphicsEffect(m_opacityFx);
m_opacityAnimation->setDuration(300); m_opacityAnimation->setDuration(300);
} }
void OpacityHelper::setOpacity(qreal opacity, bool animated) void OpacityHelper::setOpacity(qreal opacity, bool animated)
{ {
if (!animated) { if (!animated) {
m_opacityFx->setOpacity(opacity); m_opacityFx->setOpacity(opacity);
return; return;
} }
m_opacityAnimation->stop(); m_opacityAnimation->stop();
m_opacityAnimation->setStartValue(m_opacityFx->opacity()); m_opacityAnimation->setStartValue(m_opacityFx->opacity());
m_opacityAnimation->setEndValue(opacity); m_opacityAnimation->setEndValue(opacity);
m_opacityAnimation->start(); m_opacityAnimation->start();
} }

View File

@ -1,27 +1,27 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef OPACITYHELPER_H #ifndef OPACITYHELPER_H
#define OPACITYHELPER_H #define OPACITYHELPER_H
#include <QWidget> #include <QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QGraphicsOpacityEffect; class QGraphicsOpacityEffect;
class QPropertyAnimation; class QPropertyAnimation;
QT_END_NAMESPACE QT_END_NAMESPACE
class OpacityHelper : QObject class OpacityHelper : QObject
{ {
public: public:
OpacityHelper(QWidget * parent); OpacityHelper(QWidget * parent);
void setOpacity(qreal opacity, bool animated = true); void setOpacity(qreal opacity, bool animated = true);
protected: protected:
QGraphicsOpacityEffect * m_opacityFx; QGraphicsOpacityEffect * m_opacityFx;
QPropertyAnimation * m_opacityAnimation; QPropertyAnimation * m_opacityAnimation;
}; };
#endif // OPACITYHELPER_H #endif // OPACITYHELPER_H

View File

@ -1,253 +1,283 @@
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net> // SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "playlistmanager.h" #include "playlistmanager.h"
#include <QCollator> #include <QCollator>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QUrl> #include <QUrl>
PlaylistModel::PlaylistModel(QObject *parent) PlaylistModel::PlaylistModel(QObject *parent)
: QAbstractListModel(parent) : QAbstractListModel(parent)
{ {
} }
PlaylistModel::~PlaylistModel() PlaylistModel::~PlaylistModel()
= default; = default;
void PlaylistModel::setPlaylist(const QList<QUrl> &urls) void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
{ {
beginResetModel(); beginResetModel();
m_playlist = urls; m_playlist = urls;
endResetModel(); endResetModel();
} }
QModelIndex PlaylistModel::loadPlaylist(const QList<QUrl> & urls) QModelIndex PlaylistModel::loadPlaylist(const QList<QUrl> & urls)
{ {
if (urls.isEmpty()) return {}; if (urls.isEmpty()) return {};
if (urls.count() == 1) { if (urls.count() == 1) {
return loadPlaylist(urls.constFirst()); return loadPlaylist(urls.constFirst());
} else { } else {
setPlaylist(urls); setPlaylist(urls);
return index(0); return index(0);
} }
} }
QModelIndex PlaylistModel::loadPlaylist(const QUrl &url) QModelIndex PlaylistModel::loadPlaylist(const QUrl &url)
{ {
QFileInfo info(url.toLocalFile()); QFileInfo info(url.toLocalFile());
QDir dir(info.path()); QDir dir(info.path());
QString && currentFileName = info.fileName(); QString && currentFileName = info.fileName();
if (dir.path() == m_currentDir) { if (dir.path() == m_currentDir) {
int idx = indexOf(url); int idx = indexOf(url);
return idx == -1 ? appendToPlaylist(url) : index(idx); return idx == -1 ? appendToPlaylist(url) : index(idx);
} }
QStringList entryList = dir.entryList( QStringList entryList = dir.entryList(
m_autoLoadSuffixes, m_autoLoadSuffixes,
QDir::Files | QDir::NoSymLinks, QDir::NoSort); QDir::Files | QDir::NoSymLinks, QDir::NoSort);
QCollator collator; QCollator collator;
collator.setNumericMode(true); collator.setNumericMode(true);
std::sort(entryList.begin(), entryList.end(), collator); std::sort(entryList.begin(), entryList.end(), collator);
QList<QUrl> playlist; QList<QUrl> playlist;
int idx = -1; int idx = -1;
for (int i = 0; i < entryList.count(); i++) { for (int i = 0; i < entryList.count(); i++) {
const QString & fileName = entryList.at(i); const QString & fileName = entryList.at(i);
const QString & oneEntry = dir.absoluteFilePath(fileName); const QString & oneEntry = dir.absoluteFilePath(fileName);
const QUrl & url = QUrl::fromLocalFile(oneEntry); const QUrl & url = QUrl::fromLocalFile(oneEntry);
playlist.append(url); playlist.append(url);
if (fileName == currentFileName) { if (fileName == currentFileName) {
idx = i; idx = i;
} }
} }
if (idx == -1) { if (idx == -1) {
idx = playlist.count(); idx = playlist.count();
playlist.append(url); playlist.append(url);
} }
m_currentDir = dir.path(); m_currentDir = dir.path();
setPlaylist(playlist); setPlaylist(playlist);
return index(idx); return index(idx);
} }
QModelIndex PlaylistModel::appendToPlaylist(const QUrl &url) QModelIndex PlaylistModel::appendToPlaylist(const QUrl &url)
{ {
const int lastIndex = rowCount(); const int lastIndex = rowCount();
beginInsertRows(QModelIndex(), lastIndex, lastIndex); beginInsertRows(QModelIndex(), lastIndex, lastIndex);
m_playlist.append(url); m_playlist.append(url);
endInsertRows(); endInsertRows();
return index(lastIndex); return index(lastIndex);
} }
bool PlaylistModel::removeAt(int index) bool PlaylistModel::removeAt(int index)
{ {
if (index < 0 || index >= rowCount()) return false; if (index < 0 || index >= rowCount()) return false;
beginRemoveRows(QModelIndex(), index, index); beginRemoveRows(QModelIndex(), index, index);
m_playlist.removeAt(index); m_playlist.removeAt(index);
endRemoveRows(); endRemoveRows();
return true; return true;
} }
int PlaylistModel::indexOf(const QUrl &url) const int PlaylistModel::indexOf(const QUrl &url) const
{ {
return m_playlist.indexOf(url); return m_playlist.indexOf(url);
} }
QUrl PlaylistModel::urlByIndex(int index) const QUrl PlaylistModel::urlByIndex(int index) const
{ {
return m_playlist.value(index); return m_playlist.value(index);
} }
QStringList PlaylistModel::autoLoadFilterSuffixes() const QStringList PlaylistModel::autoLoadFilterSuffixes() const
{ {
return m_autoLoadSuffixes; return m_autoLoadSuffixes;
} }
QHash<int, QByteArray> PlaylistModel::roleNames() const QHash<int, QByteArray> PlaylistModel::roleNames() const
{ {
QHash<int, QByteArray> result = QAbstractListModel::roleNames(); QHash<int, QByteArray> result = QAbstractListModel::roleNames();
result.insert(UrlRole, "url"); result.insert(UrlRole, "url");
return result; return result;
} }
int PlaylistModel::rowCount(const QModelIndex &parent) const int PlaylistModel::rowCount(const QModelIndex &parent) const
{ {
return m_playlist.count(); return m_playlist.count();
} }
QVariant PlaylistModel::data(const QModelIndex &index, int role) const QVariant PlaylistModel::data(const QModelIndex &index, int role) const
{ {
if (!index.isValid()) return {}; if (!index.isValid()) return {};
switch (role) { switch (role) {
case Qt::DisplayRole: case Qt::DisplayRole:
return m_playlist.at(index.row()).fileName(); return m_playlist.at(index.row()).fileName();
case UrlRole: case UrlRole:
return m_playlist.at(index.row()); return m_playlist.at(index.row());
} }
return {}; return {};
} }
PlaylistManager::PlaylistManager(QObject *parent) PlaylistManager::PlaylistManager(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
connect(&m_model, &PlaylistModel::rowsRemoved, this, connect(&m_model, &PlaylistModel::rowsRemoved, this,
[this](const QModelIndex &, int, int) { [this](const QModelIndex &, int, int) {
if (m_model.rowCount() <= m_currentIndex) { if (m_model.rowCount() <= m_currentIndex) {
setProperty("currentIndex", m_currentIndex - 1); setProperty("currentIndex", m_currentIndex - 1);
} }
}); });
auto onRowCountChanged = [this](){ auto onRowCountChanged = [this](){
emit totalCountChanged(m_model.rowCount()); emit totalCountChanged(m_model.rowCount());
}; };
connect(&m_model, &PlaylistModel::rowsInserted, this, onRowCountChanged); connect(&m_model, &PlaylistModel::rowsInserted, this, onRowCountChanged);
connect(&m_model, &PlaylistModel::rowsRemoved, this, onRowCountChanged); connect(&m_model, &PlaylistModel::rowsRemoved, this, onRowCountChanged);
connect(&m_model, &PlaylistModel::modelReset, this, onRowCountChanged); connect(&m_model, &PlaylistModel::modelReset, this, onRowCountChanged);
} }
PlaylistManager::~PlaylistManager() PlaylistManager::~PlaylistManager()
{ {
} }
PlaylistModel *PlaylistManager::model() PlaylistModel *PlaylistManager::model()
{ {
return &m_model; return &m_model;
} }
void PlaylistManager::setPlaylist(const QList<QUrl> &urls) void PlaylistManager::setPlaylist(const QList<QUrl> &urls)
{ {
m_model.setPlaylist(urls); m_model.setPlaylist(urls);
} }
QModelIndex PlaylistManager::loadPlaylist(const QList<QUrl> &urls) QModelIndex PlaylistManager::loadPlaylist(const QList<QUrl> &urls)
{ {
QModelIndex idx = m_model.loadPlaylist(urls); QModelIndex idx = m_model.loadPlaylist(urls);
setProperty("currentIndex", idx.row()); setProperty("currentIndex", idx.row());
return idx; return idx;
} }
QModelIndex PlaylistManager::loadPlaylist(const QUrl &url) QModelIndex PlaylistManager::loadPlaylist(const QUrl &url)
{ {
QModelIndex idx = m_model.loadPlaylist(url); QModelIndex idx = m_model.loadPlaylist(url);
setProperty("currentIndex", idx.row()); setProperty("currentIndex", idx.row());
return idx; return idx;
} }
int PlaylistManager::totalCount() const QModelIndex PlaylistManager::loadM3U8Playlist(const QUrl &url)
{ {
return m_model.rowCount(); QFile file(url.toLocalFile());
} if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QList<QUrl> urls;
QModelIndex PlaylistManager::previousIndex() const while (!file.atEnd()) {
{ QString line = file.readLine();
int count = totalCount(); if (line.startsWith('#')) {
if (count == 0) return {}; continue;
}
return m_model.index(m_currentIndex - 1 < 0 ? count - 1 : m_currentIndex - 1); QFileInfo fileInfo(file);
} QUrl item = QUrl::fromUserInput(line, fileInfo.absolutePath());
urls.append(item);
QModelIndex PlaylistManager::nextIndex() const }
{ return loadPlaylist(urls);
int count = totalCount(); } else {
if (count == 0) return {}; return {};
}
return m_model.index(m_currentIndex + 1 == count ? 0 : m_currentIndex + 1); }
}
int PlaylistManager::totalCount() const
QModelIndex PlaylistManager::curIndex() const {
{ return m_model.rowCount();
return m_model.index(m_currentIndex); }
}
QModelIndex PlaylistManager::previousIndex() const
void PlaylistManager::setCurrentIndex(const QModelIndex &index) {
{ int count = totalCount();
if (index.isValid() && index.row() >= 0 && index.row() < totalCount()) { if (count == 0) return {};
setProperty("currentIndex", index.row());
} return m_model.index(isFirstIndex() ? count - 1 : m_currentIndex - 1);
} }
QUrl PlaylistManager::urlByIndex(const QModelIndex &index) QModelIndex PlaylistManager::nextIndex() const
{ {
return m_model.urlByIndex(index.row()); int count = totalCount();
} if (count == 0) return {};
QString PlaylistManager::localFileByIndex(const QModelIndex &index) return m_model.index(isLastIndex() ? 0 : m_currentIndex + 1);
{ }
return urlByIndex(index).toLocalFile();
} QModelIndex PlaylistManager::curIndex() const
{
bool PlaylistManager::removeAt(const QModelIndex &index) return m_model.index(m_currentIndex);
{ }
return m_model.removeAt(index.row());
} bool PlaylistManager::isFirstIndex() const
{
void PlaylistManager::setAutoLoadFilterSuffixes(const QStringList &nameFilters) return m_currentIndex == 0;
{ }
m_model.setProperty("autoLoadFilterSuffixes", nameFilters);
} bool PlaylistManager::isLastIndex() const
{
QList<QUrl> PlaylistManager::convertToUrlList(const QStringList &files) return m_currentIndex + 1 == totalCount();
{ }
QList<QUrl> urlList;
for (const QString & str : std::as_const(files)) { void PlaylistManager::setCurrentIndex(const QModelIndex &index)
QUrl url = QUrl::fromLocalFile(str); {
if (url.isValid()) { if (index.isValid() && index.row() >= 0 && index.row() < totalCount()) {
urlList.append(url); setProperty("currentIndex", index.row());
} }
} }
return urlList; QUrl PlaylistManager::urlByIndex(const QModelIndex &index)
} {
return m_model.urlByIndex(index.row());
}
QString PlaylistManager::localFileByIndex(const QModelIndex &index)
{
return urlByIndex(index).toLocalFile();
}
bool PlaylistManager::removeAt(const QModelIndex &index)
{
return m_model.removeAt(index.row());
}
void PlaylistManager::setAutoLoadFilterSuffixes(const QStringList &nameFilters)
{
m_model.setProperty("autoLoadFilterSuffixes", nameFilters);
}
QList<QUrl> PlaylistManager::convertToUrlList(const QStringList &files)
{
QList<QUrl> urlList;
for (const QString & str : std::as_const(files)) {
QUrl url = QUrl::fromLocalFile(str);
if (url.isValid()) {
urlList.append(url);
}
}
return urlList;
}

View File

@ -1,85 +1,88 @@
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net> // SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#pragma once #pragma once
#include <QUrl> #include <QUrl>
#include <QAbstractListModel> #include <QAbstractListModel>
class PlaylistModel : public QAbstractListModel class PlaylistModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
public: public:
enum PlaylistRole { enum PlaylistRole {
UrlRole = Qt::UserRole UrlRole = Qt::UserRole
}; };
Q_ENUM(PlaylistRole) Q_ENUM(PlaylistRole)
Q_PROPERTY(QStringList autoLoadFilterSuffixes MEMBER m_autoLoadSuffixes NOTIFY autoLoadFilterSuffixesChanged) Q_PROPERTY(QStringList autoLoadFilterSuffixes MEMBER m_autoLoadSuffixes NOTIFY autoLoadFilterSuffixesChanged)
explicit PlaylistModel(QObject *parent = nullptr); explicit PlaylistModel(QObject *parent = nullptr);
~PlaylistModel() override; ~PlaylistModel() override;
void setPlaylist(const QList<QUrl> & urls); void setPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QList<QUrl> & urls); QModelIndex loadPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QUrl & url); QModelIndex loadPlaylist(const QUrl & url);
QModelIndex appendToPlaylist(const QUrl & url); QModelIndex appendToPlaylist(const QUrl & url);
bool removeAt(int index); bool removeAt(int index);
int indexOf(const QUrl & url) const; int indexOf(const QUrl & url) const;
QUrl urlByIndex(int index) const; QUrl urlByIndex(int index) const;
QStringList autoLoadFilterSuffixes() const; QStringList autoLoadFilterSuffixes() const;
QHash<int, QByteArray> roleNames() const override; QHash<int, QByteArray> roleNames() const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
signals: signals:
void autoLoadFilterSuffixesChanged(QStringList suffixes); void autoLoadFilterSuffixesChanged(QStringList suffixes);
private: private:
// model data // model data
QList<QUrl> m_playlist; QList<QUrl> m_playlist;
// properties // properties
QStringList m_autoLoadSuffixes = {}; QStringList m_autoLoadSuffixes = {};
// internal // internal
QString m_currentDir; QString m_currentDir;
}; };
class PlaylistManager : public QObject class PlaylistManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
Q_PROPERTY(int currentIndex MEMBER m_currentIndex NOTIFY currentIndexChanged) Q_PROPERTY(int currentIndex MEMBER m_currentIndex NOTIFY currentIndexChanged)
Q_PROPERTY(QStringList autoLoadFilterSuffixes WRITE setAutoLoadFilterSuffixes) Q_PROPERTY(QStringList autoLoadFilterSuffixes WRITE setAutoLoadFilterSuffixes)
Q_PROPERTY(PlaylistModel * model READ model CONSTANT) Q_PROPERTY(PlaylistModel * model READ model CONSTANT)
explicit PlaylistManager(QObject *parent = nullptr); explicit PlaylistManager(QObject *parent = nullptr);
~PlaylistManager(); ~PlaylistManager();
PlaylistModel * model(); PlaylistModel * model();
void setPlaylist(const QList<QUrl> & url); void setPlaylist(const QList<QUrl> & url);
Q_INVOKABLE QModelIndex loadPlaylist(const QList<QUrl> & urls); Q_INVOKABLE QModelIndex loadPlaylist(const QList<QUrl> & urls);
Q_INVOKABLE QModelIndex loadPlaylist(const QUrl & url); Q_INVOKABLE QModelIndex loadPlaylist(const QUrl & url);
Q_INVOKABLE QModelIndex loadM3U8Playlist(const QUrl & url);
int totalCount() const;
QModelIndex previousIndex() const; int totalCount() const;
QModelIndex nextIndex() const; QModelIndex previousIndex() const;
QModelIndex curIndex() const; QModelIndex nextIndex() const;
void setCurrentIndex(const QModelIndex & index); QModelIndex curIndex() const;
QUrl urlByIndex(const QModelIndex & index); bool isFirstIndex() const;
QString localFileByIndex(const QModelIndex & index); bool isLastIndex() const;
bool removeAt(const QModelIndex & index); void setCurrentIndex(const QModelIndex & index);
QUrl urlByIndex(const QModelIndex & index);
void setAutoLoadFilterSuffixes(const QStringList &nameFilters); QString localFileByIndex(const QModelIndex & index);
bool removeAt(const QModelIndex & index);
static QList<QUrl> convertToUrlList(const QStringList & files);
void setAutoLoadFilterSuffixes(const QStringList &nameFilters);
signals:
void currentIndexChanged(int index); static QList<QUrl> convertToUrlList(const QStringList & files);
void totalCountChanged(int count);
signals:
private: void currentIndexChanged(int index);
int m_currentIndex = -1; void totalCountChanged(int count);
PlaylistModel m_model;
}; private:
int m_currentIndex = -1;
PlaylistModel m_model;
};

View File

@ -1,204 +1,237 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "settings.h" #include "settings.h"
#include <QApplication> #include <QApplication>
#include <QStandardPaths> #include <QStandardPaths>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QAction> #include <QAction>
#include <QWidget> #include <QWidget>
#include <QKeySequence> #include <QKeySequence>
#include <QMetaEnum> #include <QMetaEnum>
namespace QEnumHelper namespace QEnumHelper
{ {
template <typename E> template <typename E>
E fromString(const QString &text, const E defaultValue) E fromString(const QString &text, const E defaultValue)
{ {
bool ok; bool ok;
E result = static_cast<E>(QMetaEnum::fromType<E>().keyToValue(text.toUtf8(), &ok)); E result = static_cast<E>(QMetaEnum::fromType<E>().keyToValue(text.toUtf8(), &ok));
if (!ok) { if (!ok) {
return defaultValue; return defaultValue;
} }
return result; return result;
} }
template <typename E> template <typename E>
QString toString(E value) QString toString(E value)
{ {
const int intValue = static_cast<int>(value); const int intValue = static_cast<int>(value);
return QString::fromUtf8(QMetaEnum::fromType<E>().valueToKey(intValue)); return QString::fromUtf8(QMetaEnum::fromType<E>().valueToKey(intValue));
} }
} }
Settings *Settings::m_settings_instance = nullptr; Settings *Settings::m_settings_instance = nullptr;
Settings *Settings::instance() Settings *Settings::instance()
{ {
if (!m_settings_instance) { if (!m_settings_instance) {
m_settings_instance = new Settings; m_settings_instance = new Settings;
} }
return m_settings_instance; return m_settings_instance;
} }
bool Settings::stayOnTop() bool Settings::stayOnTop() const
{ {
return m_qsettings->value("stay_on_top", true).toBool(); return m_qsettings->value("stay_on_top", true).toBool();
} }
bool Settings::useLightCheckerboard() bool Settings::useBuiltInCloseAnimation() const
{ {
return m_qsettings->value("use_light_checkerboard", false).toBool(); return m_qsettings->value("use_built_in_close_animation", true).toBool();
} }
Settings::DoubleClickBehavior Settings::doubleClickBehavior() const bool Settings::useLightCheckerboard() const
{ {
QString result = m_qsettings->value("double_click_behavior", "Close").toString(); return m_qsettings->value("use_light_checkerboard", false).toBool();
}
return QEnumHelper::fromString<DoubleClickBehavior>(result, DoubleClickBehavior::Close);
} bool Settings::loopGallery() const
{
Settings::MouseWheelBehavior Settings::mouseWheelBehavior() const return m_qsettings->value("loop_gallery", true).toBool();
{ }
QString result = m_qsettings->value("mouse_wheel_behavior", "Zoom").toString();
bool Settings::autoLongImageMode() const
return QEnumHelper::fromString<MouseWheelBehavior>(result, MouseWheelBehavior::Zoom); {
} return m_qsettings->value("auto_long_image_mode", true).toBool();
}
Settings::WindowSizeBehavior Settings::initWindowSizeBehavior() const
{ Settings::DoubleClickBehavior Settings::doubleClickBehavior() const
QString result = m_qsettings->value("init_window_size_behavior", "Auto").toString(); {
QString result = m_qsettings->value("double_click_behavior", "Close").toString();
return QEnumHelper::fromString<WindowSizeBehavior>(result, WindowSizeBehavior::Auto);
} return QEnumHelper::fromString<DoubleClickBehavior>(result, DoubleClickBehavior::Close);
}
Qt::HighDpiScaleFactorRoundingPolicy Settings::hiDpiScaleFactorBehavior() const
{ Settings::MouseWheelBehavior Settings::mouseWheelBehavior() const
QString result = m_qsettings->value("hidpi_scale_factor_behavior", "PassThrough").toString(); {
QString result = m_qsettings->value("mouse_wheel_behavior", "Zoom").toString();
return QEnumHelper::fromString<Qt::HighDpiScaleFactorRoundingPolicy>(result, Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
} return QEnumHelper::fromString<MouseWheelBehavior>(result, MouseWheelBehavior::Zoom);
}
void Settings::setStayOnTop(bool on)
{ Settings::WindowSizeBehavior Settings::initWindowSizeBehavior() const
m_qsettings->setValue("stay_on_top", on); {
m_qsettings->sync(); QString result = m_qsettings->value("init_window_size_behavior", "Auto").toString();
}
return QEnumHelper::fromString<WindowSizeBehavior>(result, WindowSizeBehavior::Auto);
void Settings::setUseLightCheckerboard(bool light) }
{
m_qsettings->setValue("use_light_checkerboard", light); Qt::HighDpiScaleFactorRoundingPolicy Settings::hiDpiScaleFactorBehavior() const
m_qsettings->sync(); {
} QString result = m_qsettings->value("hidpi_scale_factor_behavior", "PassThrough").toString();
void Settings::setDoubleClickBehavior(DoubleClickBehavior dcb) return QEnumHelper::fromString<Qt::HighDpiScaleFactorRoundingPolicy>(result, Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
{ }
m_qsettings->setValue("double_click_behavior", QEnumHelper::toString(dcb));
m_qsettings->sync(); void Settings::setStayOnTop(bool on)
} {
m_qsettings->setValue("stay_on_top", on);
void Settings::setMouseWheelBehavior(MouseWheelBehavior mwb) m_qsettings->sync();
{ }
m_qsettings->setValue("mouse_wheel_behavior", QEnumHelper::toString(mwb));
m_qsettings->sync(); void Settings::setUseBuiltInCloseAnimation(bool on)
} {
m_qsettings->setValue("use_built_in_close_animation", on);
void Settings::setInitWindowSizeBehavior(WindowSizeBehavior wsb) m_qsettings->sync();
{ }
m_qsettings->setValue("init_window_size_behavior", QEnumHelper::toString(wsb));
m_qsettings->sync(); void Settings::setUseLightCheckerboard(bool light)
} {
m_qsettings->setValue("use_light_checkerboard", light);
void Settings::setHiDpiScaleFactorBehavior(Qt::HighDpiScaleFactorRoundingPolicy hidpi) m_qsettings->sync();
{ }
m_qsettings->setValue("hidpi_scale_factor_behavior", QEnumHelper::toString(hidpi));
m_qsettings->sync(); void Settings::setLoopGallery(bool on)
} {
m_qsettings->setValue("loop_gallery", on);
void Settings::applyUserShortcuts(QWidget *widget) m_qsettings->sync();
{ }
m_qsettings->beginGroup("shortcuts");
const QStringList shortcutNames = m_qsettings->allKeys(); void Settings::setAutoLongImageMode(bool on)
for (const QString & name : shortcutNames) { {
QList<QKeySequence> shortcuts = m_qsettings->value(name).value<QList<QKeySequence>>(); m_qsettings->setValue("auto_long_image_mode", on);
setShortcutsForAction(widget, name, shortcuts, false); m_qsettings->sync();
} }
m_qsettings->endGroup();
} void Settings::setDoubleClickBehavior(DoubleClickBehavior dcb)
{
bool Settings::setShortcutsForAction(QWidget *widget, const QString &objectName, m_qsettings->setValue("double_click_behavior", QEnumHelper::toString(dcb));
QList<QKeySequence> shortcuts, bool writeConfig) m_qsettings->sync();
{ }
QAction * targetAction = nullptr;
for (QAction * action : widget->actions()) { void Settings::setMouseWheelBehavior(MouseWheelBehavior mwb)
if (action->objectName() == objectName) { {
targetAction = action; m_qsettings->setValue("mouse_wheel_behavior", QEnumHelper::toString(mwb));
} else { m_qsettings->sync();
for (const QKeySequence & shortcut : std::as_const(shortcuts)) { }
if (action->shortcuts().contains(shortcut)) {
return false; void Settings::setInitWindowSizeBehavior(WindowSizeBehavior wsb)
} {
} m_qsettings->setValue("init_window_size_behavior", QEnumHelper::toString(wsb));
} m_qsettings->sync();
} }
if (targetAction) { void Settings::setHiDpiScaleFactorBehavior(Qt::HighDpiScaleFactorRoundingPolicy hidpi)
targetAction->setShortcuts(shortcuts); {
} m_qsettings->setValue("hidpi_scale_factor_behavior", QEnumHelper::toString(hidpi));
m_qsettings->sync();
if (targetAction && writeConfig) { }
m_qsettings->beginGroup("shortcuts");
m_qsettings->setValue(objectName, QVariant::fromValue(shortcuts)); void Settings::applyUserShortcuts(QWidget *widget)
m_qsettings->endGroup(); {
m_qsettings->sync(); m_qsettings->beginGroup("shortcuts");
} const QStringList shortcutNames = m_qsettings->allKeys();
for (const QString & name : shortcutNames) {
return true; QList<QKeySequence> shortcuts = m_qsettings->value(name).value<QList<QKeySequence>>();
} setShortcutsForAction(widget, name, shortcuts, false);
}
#if defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN) m_qsettings->endGroup();
#include <windows.h> }
// QCoreApplication::applicationDirPath() parses the "applicationDirPath" from arg0, which...
// 1. rely on a QApplication object instance bool Settings::setShortcutsForAction(QWidget *widget, const QString &objectName,
// but we need to call QGuiApplication::setHighDpiScaleFactorRoundingPolicy() before QApplication get created QList<QKeySequence> shortcuts, bool writeConfig)
// 2. arg0 is NOT garanteed to be the path of execution {
// see also: https://stackoverflow.com/questions/383973/is-args0-guaranteed-to-be-the-path-of-execution QAction * targetAction = nullptr;
// This function is here mainly for #1. for (QAction * action : widget->actions()) {
QString getApplicationDirPath() if (action->objectName() == objectName) {
{ targetAction = action;
WCHAR buffer[MAX_PATH]; } else {
GetModuleFileNameW(NULL, buffer, MAX_PATH); for (const QKeySequence & shortcut : std::as_const(shortcuts)) {
QString appPath = QString::fromWCharArray(buffer); if (action->shortcuts().contains(shortcut)) {
return false;
return appPath.left(appPath.lastIndexOf('\\')); }
} }
#endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN) }
}
Settings::Settings()
: QObject(qApp) if (targetAction) {
{ targetAction->setShortcuts(shortcuts);
QString configPath; }
#if defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN) if (targetAction && writeConfig) {
QString portableConfigDirPath = QDir(getApplicationDirPath()).absoluteFilePath("data"); m_qsettings->beginGroup("shortcuts");
QFileInfo portableConfigDirInfo(portableConfigDirPath); m_qsettings->setValue(objectName, QVariant::fromValue(shortcuts));
if (portableConfigDirInfo.exists() && portableConfigDirInfo.isDir() && portableConfigDirInfo.isWritable()) { m_qsettings->endGroup();
// we can use it. m_qsettings->sync();
configPath = portableConfigDirPath; }
}
#endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN) return true;
}
if (configPath.isEmpty()) {
// Should be %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux. #if defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation); #include <windows.h>
} // QCoreApplication::applicationDirPath() parses the "applicationDirPath" from arg0, which...
// 1. rely on a QApplication object instance
m_qsettings = new QSettings(QDir(configPath).absoluteFilePath("config.ini"), QSettings::IniFormat, this); // but we need to call QGuiApplication::setHighDpiScaleFactorRoundingPolicy() before QApplication get created
// 2. arg0 is NOT garanteed to be the path of execution
qRegisterMetaType<QList<QKeySequence>>(); // see also: https://stackoverflow.com/questions/383973/is-args0-guaranteed-to-be-the-path-of-execution
} // This function is here mainly for #1.
QString getApplicationDirPath()
{
WCHAR buffer[MAX_PATH];
GetModuleFileNameW(NULL, buffer, MAX_PATH);
QString appPath = QString::fromWCharArray(buffer);
return appPath.left(appPath.lastIndexOf('\\'));
}
#endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
Settings::Settings()
: QObject(qApp)
{
QString configPath;
#if defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
QString portableConfigDirPath = QDir(getApplicationDirPath()).absoluteFilePath("data");
QFileInfo portableConfigDirInfo(portableConfigDirPath);
if (portableConfigDirInfo.exists() && portableConfigDirInfo.isDir() && portableConfigDirInfo.isWritable()) {
// we can use it.
configPath = portableConfigDirPath;
}
#endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
if (configPath.isEmpty()) {
// Should be %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux.
configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
}
m_qsettings = new QSettings(QDir(configPath).absoluteFilePath("config.ini"), QSettings::IniFormat, this);
qRegisterMetaType<QList<QKeySequence>>();
}

View File

@ -1,65 +1,71 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#pragma once #pragma once
#include <QObject> #include <QObject>
#include <QSettings> #include <QSettings>
class Settings : public QObject class Settings : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum DoubleClickBehavior { enum DoubleClickBehavior {
Ignore, Ignore,
Close, Close,
Maximize, Maximize,
FullScreen, FullScreen,
}; };
Q_ENUM(DoubleClickBehavior) Q_ENUM(DoubleClickBehavior)
enum MouseWheelBehavior { enum MouseWheelBehavior {
Zoom, Zoom,
Switch, Switch,
}; };
Q_ENUM(MouseWheelBehavior) Q_ENUM(MouseWheelBehavior)
enum WindowSizeBehavior { enum WindowSizeBehavior {
Auto, Auto,
Maximized, Maximized,
Windowed, Windowed,
}; };
Q_ENUM(WindowSizeBehavior) Q_ENUM(WindowSizeBehavior)
static Settings *instance(); static Settings *instance();
bool stayOnTop(); bool stayOnTop() const;
bool useLightCheckerboard(); bool useBuiltInCloseAnimation() const;
DoubleClickBehavior doubleClickBehavior() const; bool useLightCheckerboard() const;
MouseWheelBehavior mouseWheelBehavior() const; bool loopGallery() const;
WindowSizeBehavior initWindowSizeBehavior() const; bool autoLongImageMode() const;
Qt::HighDpiScaleFactorRoundingPolicy hiDpiScaleFactorBehavior() const; DoubleClickBehavior doubleClickBehavior() const;
MouseWheelBehavior mouseWheelBehavior() const;
void setStayOnTop(bool on); WindowSizeBehavior initWindowSizeBehavior() const;
void setUseLightCheckerboard(bool light); Qt::HighDpiScaleFactorRoundingPolicy hiDpiScaleFactorBehavior() const;
void setDoubleClickBehavior(DoubleClickBehavior dcb);
void setMouseWheelBehavior(MouseWheelBehavior mwb); void setStayOnTop(bool on);
void setInitWindowSizeBehavior(WindowSizeBehavior wsb); void setUseBuiltInCloseAnimation(bool on);
void setHiDpiScaleFactorBehavior(Qt::HighDpiScaleFactorRoundingPolicy hidpi); void setUseLightCheckerboard(bool light);
void setLoopGallery(bool on);
void applyUserShortcuts(QWidget * widget); void setAutoLongImageMode(bool on);
bool setShortcutsForAction(QWidget * widget, const QString & objectName, void setDoubleClickBehavior(DoubleClickBehavior dcb);
QList<QKeySequence> shortcuts, bool writeConfig = true); void setMouseWheelBehavior(MouseWheelBehavior mwb);
void setInitWindowSizeBehavior(WindowSizeBehavior wsb);
private: void setHiDpiScaleFactorBehavior(Qt::HighDpiScaleFactorRoundingPolicy hidpi);
Settings();
void applyUserShortcuts(QWidget * widget);
static Settings *m_settings_instance; bool setShortcutsForAction(QWidget * widget, const QString & objectName,
QList<QKeySequence> shortcuts, bool writeConfig = true);
QSettings *m_qsettings;
private:
signals: Settings();
public slots: static Settings *m_settings_instance;
};
QSettings *m_qsettings;
signals:
public slots:
};

View File

@ -1,178 +1,207 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "settingsdialog.h" #include "settingsdialog.h"
#include "settings.h" #include "settings.h"
#include "shortcutedit.h" #include "shortcutedit.h"
#include <QAction> #include <QAction>
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <QFormLayout> #include <QFormLayout>
#include <QKeySequenceEdit> #include <QKeySequenceEdit>
#include <QScrollArea> #include <QScrollArea>
#include <QSplitter> #include <QSplitter>
#include <QStringListModel> #include <QStringListModel>
#include <QMessageBox> #include <QMessageBox>
SettingsDialog::SettingsDialog(QWidget *parent) SettingsDialog::SettingsDialog(QWidget *parent)
: QDialog(parent) : QDialog(parent)
, m_stayOnTop(new QCheckBox) , m_stayOnTop(new QCheckBox)
, m_useLightCheckerboard(new QCheckBox) , m_useBuiltInCloseAnimation(new QCheckBox)
, m_doubleClickBehavior(new QComboBox) , m_useLightCheckerboard(new QCheckBox)
, m_mouseWheelBehavior(new QComboBox) , m_loopGallery(new QCheckBox)
, m_initWindowSizeBehavior(new QComboBox) , m_autoLongImageMode(new QCheckBox)
, m_hiDpiRoundingPolicyBehavior(new QComboBox) , m_doubleClickBehavior(new QComboBox)
{ , m_mouseWheelBehavior(new QComboBox)
this->setWindowTitle(tr("Settings")); , m_initWindowSizeBehavior(new QComboBox)
, m_hiDpiRoundingPolicyBehavior(new QComboBox)
QHBoxLayout * mainLayout = new QHBoxLayout(this); {
QTabWidget * settingsTabs = new QTabWidget(this); this->setWindowTitle(tr("Settings"));
mainLayout->addWidget(settingsTabs);
QHBoxLayout * mainLayout = new QHBoxLayout(this);
QWidget * settingsFormHolder = new QWidget; QTabWidget * settingsTabs = new QTabWidget(this);
QFormLayout * settingsForm = new QFormLayout(settingsFormHolder); mainLayout->addWidget(settingsTabs);
settingsTabs->addTab(settingsFormHolder, tr("Options"));
QWidget * settingsFormHolder = new QWidget;
QSplitter * shortcutEditorSplitter = new QSplitter; QFormLayout * settingsForm = new QFormLayout(settingsFormHolder);
shortcutEditorSplitter->setOrientation(Qt::Vertical); settingsTabs->addTab(settingsFormHolder, tr("Options"));
shortcutEditorSplitter->setChildrenCollapsible(false);
QScrollArea * shortcutScrollArea = new QScrollArea; QSplitter * shortcutEditorSplitter = new QSplitter;
shortcutEditorSplitter->addWidget(shortcutScrollArea); shortcutEditorSplitter->setOrientation(Qt::Vertical);
shortcutScrollArea->setWidgetResizable(true); shortcutEditorSplitter->setChildrenCollapsible(false);
shortcutScrollArea->setMinimumHeight(200); QScrollArea * shortcutScrollArea = new QScrollArea;
QWidget * shortcutsFormHolder = new QWidget; shortcutEditorSplitter->addWidget(shortcutScrollArea);
QFormLayout * shortcutsForm = new QFormLayout(shortcutsFormHolder); shortcutScrollArea->setWidgetResizable(true);
shortcutScrollArea->setWidget(shortcutsFormHolder); shortcutScrollArea->setMinimumHeight(200);
settingsTabs->addTab(shortcutEditorSplitter, tr("Shortcuts")); QWidget * shortcutsFormHolder = new QWidget;
QFormLayout * shortcutsForm = new QFormLayout(shortcutsFormHolder);
for (const QAction * action : parent->actions()) { shortcutScrollArea->setWidget(shortcutsFormHolder);
ShortcutEdit * shortcutEdit = new ShortcutEdit; settingsTabs->addTab(shortcutEditorSplitter, tr("Shortcuts"));
shortcutEdit->setObjectName(QLatin1String("shortcut_") + action->objectName());
shortcutEdit->setShortcuts(action->shortcuts()); for (const QAction * action : parent->actions()) {
shortcutsForm->addRow(action->text(), shortcutEdit); ShortcutEdit * shortcutEdit = new ShortcutEdit;
connect(shortcutEdit, &ShortcutEdit::editButtonClicked, this, [=](){ shortcutEdit->setObjectName(QLatin1String("shortcut_") + action->objectName());
if (shortcutEditorSplitter->count() == 1) shortcutEditorSplitter->addWidget(new QWidget); shortcutEdit->setShortcuts(action->shortcuts());
ShortcutEditor * shortcutEditor = new ShortcutEditor(shortcutEdit); shortcutsForm->addRow(action->text(), shortcutEdit);
shortcutEditor->setDescription(tr("Editing shortcuts for action \"%1\":").arg(action->text())); connect(shortcutEdit, &ShortcutEdit::editButtonClicked, this, [=](){
QWidget * oldEditor = shortcutEditorSplitter->replaceWidget(1, shortcutEditor); if (shortcutEditorSplitter->count() == 1) shortcutEditorSplitter->addWidget(new QWidget);
shortcutEditorSplitter->setSizes({shortcutEditorSplitter->height(), 1}); ShortcutEditor * shortcutEditor = new ShortcutEditor(shortcutEdit);
oldEditor->deleteLater(); shortcutEditor->setDescription(tr("Editing shortcuts for action \"%1\":").arg(action->text()));
}); QWidget * oldEditor = shortcutEditorSplitter->replaceWidget(1, shortcutEditor);
connect(shortcutEdit, &ShortcutEdit::applyShortcutsRequested, this, [=](QList<QKeySequence> newShortcuts){ shortcutEditorSplitter->setSizes({shortcutEditorSplitter->height(), 1});
bool succ = Settings::instance()->setShortcutsForAction(parent, shortcutEdit->objectName().mid(9), oldEditor->deleteLater();
newShortcuts); });
if (!succ) { connect(shortcutEdit, &ShortcutEdit::applyShortcutsRequested, this, [=](QList<QKeySequence> newShortcuts){
QMessageBox::warning(this, tr("Failed to set shortcuts"), bool succ = Settings::instance()->setShortcutsForAction(parent, shortcutEdit->objectName().mid(9),
tr("Please check if shortcuts are duplicated with existing shortcuts.")); newShortcuts);
} if (!succ) {
shortcutEdit->setShortcuts(action->shortcuts()); QMessageBox::warning(this, tr("Failed to set shortcuts"),
}); tr("Please check if shortcuts are duplicated with existing shortcuts."));
} }
shortcutEdit->setShortcuts(action->shortcuts());
static QList< QPair<Settings::DoubleClickBehavior, QString> > _dc_options { });
{ Settings::DoubleClickBehavior::Ignore, tr("Do nothing") }, }
{ Settings::DoubleClickBehavior::Close, tr("Close the window") },
{ Settings::DoubleClickBehavior::Maximize, tr("Toggle maximize") }, static QList< QPair<Settings::DoubleClickBehavior, QString> > _dc_options {
{ Settings::DoubleClickBehavior::FullScreen, tr("Toggle fullscreen") } { Settings::DoubleClickBehavior::Ignore, tr("Do nothing") },
}; { Settings::DoubleClickBehavior::Close, tr("Close the window") },
{ Settings::DoubleClickBehavior::Maximize, tr("Toggle maximize") },
static QList< QPair<Settings::MouseWheelBehavior, QString> > _mw_options { { Settings::DoubleClickBehavior::FullScreen, tr("Toggle fullscreen") }
{ Settings::MouseWheelBehavior::Zoom, tr("Zoom in and out") }, };
{ Settings::MouseWheelBehavior::Switch, tr("View next or previous item") }
}; static QList< QPair<Settings::MouseWheelBehavior, QString> > _mw_options {
{ Settings::MouseWheelBehavior::Zoom, tr("Zoom in and out") },
static QList< QPair<Settings::WindowSizeBehavior, QString> > _iws_options { { Settings::MouseWheelBehavior::Switch, tr("View next or previous item") }
{ Settings::WindowSizeBehavior::Auto, tr("Auto size") }, };
{ Settings::WindowSizeBehavior::Maximized, tr("Maximized") },
{ Settings::WindowSizeBehavior::Windowed, tr("Windowed") } static QList< QPair<Settings::WindowSizeBehavior, QString> > _iws_options {
}; { Settings::WindowSizeBehavior::Auto, tr("Auto size") },
{ Settings::WindowSizeBehavior::Maximized, tr("Maximized") },
static QList< QPair<Qt::HighDpiScaleFactorRoundingPolicy, QString> > _hidpi_options { { Settings::WindowSizeBehavior::Windowed, tr("Windowed") }
{ Qt::HighDpiScaleFactorRoundingPolicy::Round, tr("Round (Integer scaling)", "This option means round up for .5 and above") }, };
{ Qt::HighDpiScaleFactorRoundingPolicy::Ceil, tr("Ceil (Integer scaling)", "This option means always round up") },
{ Qt::HighDpiScaleFactorRoundingPolicy::Floor, tr("Floor (Integer scaling)", "This option means always round down") }, static QList< QPair<Qt::HighDpiScaleFactorRoundingPolicy, QString> > _hidpi_options {
{ Qt::HighDpiScaleFactorRoundingPolicy::PassThrough, tr("Follow system (Fractional scaling)", "This option means don't round") } { Qt::HighDpiScaleFactorRoundingPolicy::Round, tr("Round (Integer scaling)", "This option means round up for .5 and above") },
}; { Qt::HighDpiScaleFactorRoundingPolicy::Ceil, tr("Ceil (Integer scaling)", "This option means always round up") },
{ Qt::HighDpiScaleFactorRoundingPolicy::Floor, tr("Floor (Integer scaling)", "This option means always round down") },
QStringList dcbDropDown; { Qt::HighDpiScaleFactorRoundingPolicy::PassThrough, tr("Follow system (Fractional scaling)", "This option means don't round") }
for (const QPair<Settings::DoubleClickBehavior, QString> & dcOption : _dc_options) { };
dcbDropDown.append(dcOption.second);
} QStringList dcbDropDown;
for (const QPair<Settings::DoubleClickBehavior, QString> & dcOption : _dc_options) {
QStringList mwbDropDown; dcbDropDown.append(dcOption.second);
for (const QPair<Settings::MouseWheelBehavior, QString> & mwOption : _mw_options) { }
mwbDropDown.append(mwOption.second);
} QStringList mwbDropDown;
for (const QPair<Settings::MouseWheelBehavior, QString> & mwOption : _mw_options) {
QStringList iwsbDropDown; mwbDropDown.append(mwOption.second);
for (const QPair<Settings::WindowSizeBehavior, QString> & iwsOption : _iws_options) { }
iwsbDropDown.append(iwsOption.second);
} QStringList iwsbDropDown;
for (const QPair<Settings::WindowSizeBehavior, QString> & iwsOption : _iws_options) {
QStringList hidpiDropDown; iwsbDropDown.append(iwsOption.second);
for (const QPair<Qt::HighDpiScaleFactorRoundingPolicy, QString> & hidpiOption : _hidpi_options) { }
hidpiDropDown.append(hidpiOption.second);
} QStringList hidpiDropDown;
for (const QPair<Qt::HighDpiScaleFactorRoundingPolicy, QString> & hidpiOption : _hidpi_options) {
settingsForm->addRow(tr("Stay on top when start-up"), m_stayOnTop); hidpiDropDown.append(hidpiOption.second);
settingsForm->addRow(tr("Use light-color checkerboard"), m_useLightCheckerboard); }
settingsForm->addRow(tr("Double-click behavior"), m_doubleClickBehavior);
settingsForm->addRow(tr("Mouse wheel behavior"), m_mouseWheelBehavior); settingsForm->addRow(tr("Stay on top when start-up"), m_stayOnTop);
settingsForm->addRow(tr("Default window size"), m_initWindowSizeBehavior); settingsForm->addRow(tr("Use built-in close window animation"), m_useBuiltInCloseAnimation);
settingsForm->addRow(tr("HiDPI scale factor rounding policy"), m_hiDpiRoundingPolicyBehavior); settingsForm->addRow(tr("Use light-color checkerboard"), m_useLightCheckerboard);
settingsForm->addRow(tr("Loop the loaded gallery"), m_loopGallery);
m_stayOnTop->setChecked(Settings::instance()->stayOnTop()); settingsForm->addRow(tr("Auto long image mode"), m_autoLongImageMode);
m_useLightCheckerboard->setChecked(Settings::instance()->useLightCheckerboard()); settingsForm->addRow(tr("Double-click behavior"), m_doubleClickBehavior);
m_doubleClickBehavior->setModel(new QStringListModel(dcbDropDown)); settingsForm->addRow(tr("Mouse wheel behavior"), m_mouseWheelBehavior);
Settings::DoubleClickBehavior dcb = Settings::instance()->doubleClickBehavior(); settingsForm->addRow(tr("Default window size"), m_initWindowSizeBehavior);
m_doubleClickBehavior->setCurrentIndex(static_cast<int>(dcb)); settingsForm->addRow(tr("HiDPI scale factor rounding policy"), m_hiDpiRoundingPolicyBehavior);
m_mouseWheelBehavior->setModel(new QStringListModel(mwbDropDown));
Settings::MouseWheelBehavior mwb = Settings::instance()->mouseWheelBehavior(); m_stayOnTop->setChecked(Settings::instance()->stayOnTop());
m_mouseWheelBehavior->setCurrentIndex(static_cast<int>(mwb)); m_useBuiltInCloseAnimation->setChecked(Settings::instance()->useBuiltInCloseAnimation());
m_initWindowSizeBehavior->setModel(new QStringListModel(iwsbDropDown)); m_useLightCheckerboard->setChecked(Settings::instance()->useLightCheckerboard());
Settings::WindowSizeBehavior iwsb = Settings::instance()->initWindowSizeBehavior(); m_loopGallery->setChecked(Settings::instance()->loopGallery());
m_initWindowSizeBehavior->setCurrentIndex(static_cast<int>(iwsb)); m_autoLongImageMode->setChecked(Settings::instance()->autoLongImageMode());
m_hiDpiRoundingPolicyBehavior->setModel(new QStringListModel(hidpiDropDown)); m_doubleClickBehavior->setModel(new QStringListModel(dcbDropDown));
Qt::HighDpiScaleFactorRoundingPolicy hidpi = Settings::instance()->hiDpiScaleFactorBehavior(); Settings::DoubleClickBehavior dcb = Settings::instance()->doubleClickBehavior();
for (int i = 0; i < _hidpi_options.count(); i++) { m_doubleClickBehavior->setCurrentIndex(static_cast<int>(dcb));
if (_hidpi_options.at(i).first == hidpi) { m_mouseWheelBehavior->setModel(new QStringListModel(mwbDropDown));
m_hiDpiRoundingPolicyBehavior->setCurrentIndex(i); Settings::MouseWheelBehavior mwb = Settings::instance()->mouseWheelBehavior();
break; m_mouseWheelBehavior->setCurrentIndex(static_cast<int>(mwb));
} m_initWindowSizeBehavior->setModel(new QStringListModel(iwsbDropDown));
} Settings::WindowSizeBehavior iwsb = Settings::instance()->initWindowSizeBehavior();
m_initWindowSizeBehavior->setCurrentIndex(static_cast<int>(iwsb));
connect(m_stayOnTop, &QCheckBox::stateChanged, this, [ = ](int state){ m_hiDpiRoundingPolicyBehavior->setModel(new QStringListModel(hidpiDropDown));
Settings::instance()->setStayOnTop(state == Qt::Checked); Qt::HighDpiScaleFactorRoundingPolicy hidpi = Settings::instance()->hiDpiScaleFactorBehavior();
}); for (int i = 0; i < _hidpi_options.count(); i++) {
if (_hidpi_options.at(i).first == hidpi) {
connect(m_useLightCheckerboard, &QCheckBox::stateChanged, this, [ = ](int state){ m_hiDpiRoundingPolicyBehavior->setCurrentIndex(i);
Settings::instance()->setUseLightCheckerboard(state == Qt::Checked); break;
}); }
}
connect(m_doubleClickBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setDoubleClickBehavior(_dc_options.at(index).first); #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
}); # define QCHECKBOX_CHECKSTATECHANGED QCheckBox::checkStateChanged
# define QT_CHECKSTATE Qt::CheckState
connect(m_mouseWheelBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){ #else
Settings::instance()->setMouseWheelBehavior(_mw_options.at(index).first); # define QCHECKBOX_CHECKSTATECHANGED QCheckBox::stateChanged
}); # define QT_CHECKSTATE int
#endif // QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_initWindowSizeBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setInitWindowSizeBehavior(_iws_options.at(index).first); connect(m_stayOnTop, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
}); Settings::instance()->setStayOnTop(state == Qt::Checked);
});
connect(m_hiDpiRoundingPolicyBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setHiDpiScaleFactorBehavior(_hidpi_options.at(index).first); connect(m_useBuiltInCloseAnimation, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
}); Settings::instance()->setUseBuiltInCloseAnimation(state == Qt::Checked);
});
adjustSize();
setWindowFlag(Qt::WindowContextHelpButtonHint, false); connect(m_useLightCheckerboard, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
} Settings::instance()->setUseLightCheckerboard(state == Qt::Checked);
});
SettingsDialog::~SettingsDialog()
{ connect(m_loopGallery, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
Settings::instance()->setLoopGallery(state == Qt::Checked);
} });
connect(m_autoLongImageMode, &QCHECKBOX_CHECKSTATECHANGED, this, [ = ](QT_CHECKSTATE state){
Settings::instance()->setAutoLongImageMode(state == Qt::Checked);
});
connect(m_doubleClickBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setDoubleClickBehavior(_dc_options.at(index).first);
});
connect(m_mouseWheelBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setMouseWheelBehavior(_mw_options.at(index).first);
});
connect(m_initWindowSizeBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setInitWindowSizeBehavior(_iws_options.at(index).first);
});
connect(m_hiDpiRoundingPolicyBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
Settings::instance()->setHiDpiScaleFactorBehavior(_hidpi_options.at(index).first);
});
adjustSize();
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
}
SettingsDialog::~SettingsDialog()
{
}

View File

@ -1,33 +1,36 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef SETTINGSDIALOG_H #ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H #define SETTINGSDIALOG_H
#include <QObject> #include <QObject>
#include <QDialog> #include <QDialog>
class QCheckBox; class QCheckBox;
class QComboBox; class QComboBox;
class SettingsDialog : public QDialog class SettingsDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit SettingsDialog(QWidget *parent = nullptr); explicit SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog(); ~SettingsDialog();
signals: signals:
public slots: public slots:
private: private:
QCheckBox * m_stayOnTop = nullptr; QCheckBox * m_stayOnTop = nullptr;
QCheckBox * m_useLightCheckerboard = nullptr; QCheckBox * m_useBuiltInCloseAnimation = nullptr;
QComboBox * m_doubleClickBehavior = nullptr; QCheckBox * m_useLightCheckerboard = nullptr;
QComboBox * m_mouseWheelBehavior = nullptr; QCheckBox * m_loopGallery = nullptr;
QComboBox * m_initWindowSizeBehavior = nullptr; QCheckBox * m_autoLongImageMode = nullptr;
QComboBox * m_hiDpiRoundingPolicyBehavior = nullptr; QComboBox * m_doubleClickBehavior = nullptr;
}; QComboBox * m_mouseWheelBehavior = nullptr;
QComboBox * m_initWindowSizeBehavior = nullptr;
#endif // SETTINGSDIALOG_H QComboBox * m_hiDpiRoundingPolicyBehavior = nullptr;
};
#endif // SETTINGSDIALOG_H

View File

@ -40,11 +40,6 @@ ShortcutEditor::ShortcutEditor(ShortcutEdit * shortcutEdit, QWidget * parent)
reloadShortcuts(); reloadShortcuts();
} }
ShortcutEditor::~ShortcutEditor()
{
}
void ShortcutEditor::setDescription(const QString &desc) void ShortcutEditor::setDescription(const QString &desc)
{ {
m_descriptionLabel->setText(desc); m_descriptionLabel->setText(desc);
@ -63,9 +58,7 @@ void ShortcutEditor::reloadShortcuts()
shortcuts.append(QKeySequence()); shortcuts.append(QKeySequence());
for (const QKeySequence & shortcut : shortcuts) { for (const QKeySequence & shortcut : shortcuts) {
QKeySequenceEdit * keyseqEdit = new QKeySequenceEdit(this); QKeySequenceEdit * keyseqEdit = new QKeySequenceEdit(this);
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
keyseqEdit->setClearButtonEnabled(true); keyseqEdit->setClearButtonEnabled(true);
#endif // QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
keyseqEdit->setMaximumSequenceLength(1); keyseqEdit->setMaximumSequenceLength(1);
#endif // QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #endif // QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)

View File

@ -18,7 +18,7 @@ class ShortcutEditor : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ShortcutEditor(ShortcutEdit * shortcutEdit, QWidget * parent = nullptr); explicit ShortcutEditor(ShortcutEdit * shortcutEdit, QWidget * parent = nullptr);
~ShortcutEditor(); ~ShortcutEditor() = default;
void setDescription(const QString & desc); void setDescription(const QString & desc);

View File

@ -1,38 +1,38 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#include "toolbutton.h" #include "toolbutton.h"
#include "actionmanager.h" #include "actionmanager.h"
#include "opacityhelper.h" #include "opacityhelper.h"
#include <QPainter> #include <QPainter>
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#include <QPropertyAnimation> #include <QPropertyAnimation>
ToolButton::ToolButton(bool hoverColor, QWidget *parent) ToolButton::ToolButton(bool hoverColor, QWidget *parent)
: QPushButton(parent) : QPushButton(parent)
, m_opacityHelper(new OpacityHelper(this)) , m_opacityHelper(new OpacityHelper(this))
{ {
setFlat(true); setFlat(true);
QString qss = "QPushButton {" QString qss = "QPushButton {"
"background: transparent;" "background: transparent;"
"}"; "}";
if (hoverColor) { if (hoverColor) {
qss += "QPushButton:hover {" qss += "QPushButton:hover {"
"background: red;" "background: red;"
"}"; "}";
} }
setStyleSheet(qss); setStyleSheet(qss);
} }
void ToolButton::setIconResourcePath(const QString &iconp) void ToolButton::setIconResourcePath(const QString &iconp)
{ {
this->setIcon(ActionManager::loadHidpiIcon(iconp, this->iconSize())); this->setIcon(ActionManager::loadHidpiIcon(iconp, this->iconSize()));
} }
void ToolButton::setOpacity(qreal opacity, bool animated) void ToolButton::setOpacity(qreal opacity, bool animated)
{ {
m_opacityHelper->setOpacity(opacity, animated); m_opacityHelper->setOpacity(opacity, animated);
} }

View File

@ -1,25 +1,25 @@
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com> // SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#ifndef TOOLBUTTON_H #ifndef TOOLBUTTON_H
#define TOOLBUTTON_H #define TOOLBUTTON_H
#include <QPushButton> #include <QPushButton>
class OpacityHelper; class OpacityHelper;
class ToolButton : public QPushButton class ToolButton : public QPushButton
{ {
Q_OBJECT Q_OBJECT
public: public:
ToolButton(bool hoverColor = false, QWidget * parent = nullptr); ToolButton(bool hoverColor = false, QWidget * parent = nullptr);
void setIconResourcePath(const QString &iconp); void setIconResourcePath(const QString &iconp);
public slots: public slots:
void setOpacity(qreal opacity, bool animated = true); void setOpacity(qreal opacity, bool animated = true);
private: private:
OpacityHelper * m_opacityHelper; OpacityHelper * m_opacityHelper;
}; };
#endif // TOOLBUTTON_H #endif // TOOLBUTTON_H

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -12,18 +12,10 @@ environment:
QTDIR: C:\Qt\6.8\mingw_64 QTDIR: C:\Qt\6.8\mingw_64
MINGW64: C:\Qt\Tools\mingw1310_64 MINGW64: C:\Qt\Tools\mingw1310_64
KF_BRANCH: master KF_BRANCH: master
EXIV2_VERSION: "0.28.3" EXIV2_VERSION: "0.28.5"
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"
WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --skip-plugin-types tls,networkinformation" WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --skip-plugin-types tls,networkinformation"
- job_name: mingw81_64_qt5_15_2
QTDIR: C:\Qt\5.15.2\mingw81_64
MINGW64: C:\Qt\Tools\mingw810_64
KF_BRANCH: kf5
EXIV2_VERSION: "0.27.7"
EXIV2_CMAKE_OPTIONS: "-DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_WIN_UNICODE=ON -DEXIV2_BUILD_EXIV2_COMMAND=OFF"
PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=ON"
WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-angle --no-system-d3d-compiler"
install: install:
- mkdir %CMAKE_INSTALL_PREFIX% - mkdir %CMAKE_INSTALL_PREFIX%
@ -98,7 +90,7 @@ build_script:
- cd karchive - cd karchive
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -G "Ninja" -DWITH_LIBZSTD=OFF -DWITH_BZIP2=OFF -DWITH_LIBLZMA=OFF -DWITH_OPENSSL=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% - cmake .. -G "Ninja" -DBUILD_TESTING=OFF -DWITH_LIBZSTD=OFF -DWITH_BZIP2=OFF -DWITH_LIBLZMA=OFF -DWITH_OPENSSL=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX%
- cmake --build . --config Release - cmake --build . --config Release
- cmake --build . --config Release --target install/strip - cmake --build . --config Release --target install/strip
- cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%

View File

@ -1,17 +1,18 @@
IDI_ICON1 ICON DISCARDABLE "icons/app-icon.ico" IDI_ICON1 ICON DISCARDABLE "@CMAKE_CURRENT_SOURCE_DIR@/assets/icons/app-icon.ico"
1 VERSIONINFO 1 VERSIONINFO
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "FileDescription", "Pineapple Pictures - Image Viewer" VALUE "FileDescription", "Pineapple Pictures - Image Viewer"
VALUE "LegalCopyright", "MIT/Expat License - Copyright (C) 2024 Gary Wang" VALUE "LegalCopyright", "MIT/Expat License - Copyright (C) 2024 Gary Wang"
VALUE "ProductName", "Pineapple Pictures" VALUE "ProductName", "Pineapple Pictures"
END VALUE "ProductVersion", "@PROJECT_VERSION@"
END END
BLOCK "VarFileInfo" END
BEGIN BLOCK "VarFileInfo"
VALUE "Translation", 0x409, 1200 BEGIN
END VALUE "Translation", 0x409, 1200
END END
END

View File

@ -1,136 +1,136 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string> <string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string> <string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string> <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<!-- FIXME: this list can't be automatically generated by Qt's CMake API, don't know why. --> <!-- FIXME: this list can't be automatically generated by Qt's CMake API, don't know why. -->
<key>CFBundleLocalizations</key> <key>CFBundleLocalizations</key>
<array> <array>
<string>en</string> <string>en</string>
<string>ca</string> <string>ca</string>
<string>de</string> <string>de</string>
<string>es</string> <string>es</string>
<string>fr</string> <string>fr</string>
<string>id</string> <string>id</string>
<string>it</string> <string>it</string>
<string>ja</string> <string>ja</string>
<string>ko</string> <string>ko</string>
<string>nb_NO</string> <string>nb_NO</string>
<string>nl</string> <string>nl</string>
<string>pa_PK</string> <string>pa_PK</string>
<string>ru</string> <string>ru</string>
<string>si</string> <string>si</string>
<string>ta</string> <string>ta</string>
<string>tr</string> <string>tr</string>
<string>uk</string> <string>uk</string>
<string>zh_CN</string> <string>zh_CN</string>
</array> </array>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<!-- JPEG --> <!-- JPEG -->
<dict> <dict>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>JPEG Image</string> <string>JPEG Image</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>jpg</string> <string>jpg</string>
<string>jpeg</string> <string>jpeg</string>
<string>jfif</string> <string>jfif</string>
</array> </array>
<key>CFBundleTypeMIMETypes</key> <key>CFBundleTypeMIMETypes</key>
<array> <array>
<string>image/jpeg</string> <string>image/jpeg</string>
</array> </array>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
<!-- PNG --> <!-- PNG -->
<dict> <dict>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>PNG Image</string> <string>PNG Image</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>png</string> <string>png</string>
</array> </array>
<key>CFBundleTypeMIMETypes</key> <key>CFBundleTypeMIMETypes</key>
<array> <array>
<string>image/png</string> <string>image/png</string>
</array> </array>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
<!-- WebP --> <!-- WebP -->
<dict> <dict>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>WebP Image</string> <string>WebP Image</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>webp</string> <string>webp</string>
</array> </array>
<key>CFBundleTypeMIMETypes</key> <key>CFBundleTypeMIMETypes</key>
<array> <array>
<string>image/webp</string> <string>image/webp</string>
</array> </array>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
<!-- GIF --> <!-- GIF -->
<dict> <dict>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>GIF Image</string> <string>GIF Image</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>gif</string> <string>gif</string>
</array> </array>
<key>CFBundleTypeMIMETypes</key> <key>CFBundleTypeMIMETypes</key>
<array> <array>
<string>image/gif</string> <string>image/gif</string>
</array> </array>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
<!-- SVG --> <!-- SVG -->
<dict> <dict>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>SVG Image</string> <string>SVG Image</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>svg</string> <string>svg</string>
</array> </array>
<key>CFBundleTypeMIMETypes</key> <key>CFBundleTypeMIMETypes</key>
<array> <array>
<string>image/svg+xml</string> <string>image/svg+xml</string>
</array> </array>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
</array> </array>
</dict> </dict>
</plist> </plist>

View File

@ -80,16 +80,50 @@
</screenshot> </screenshot>
</screenshots> </screenshots>
<releases> <releases>
<release type="stable" version="1.1.1" date="2025-08-02T00:00:00Z">
<description>
<p>This release adds the following feature:</p>
<ul>
<li>Click dock icon should show window when it's hidden on macOS</li>
</ul>
<p>This release fixes the following bug:</p>
<ul>
<li>Ensure "Fit by Width" position the view to the beginning of the image</li>
</ul>
<p>This release includes the following changes:</p>
<ul>
<li>Update translations</li>
<li>Update Exiv2 version for Windows binary build</li>
</ul>
<p>With contributions from:</p>
<p>Heimen Stoffels, VenusGirl, தமிழ்நேரம்</p>
</description>
</release>
<release type="stable" version="1.1.0" date="2025-07-06T00:00:00Z">
<description>
<p>This release adds the following features:</p>
<ul>
<li>New option to disable built-in close window animation</li>
<li>New option to disable gallery looping</li>
<li>Support load m3u8 as image gallery playlist</li>
</ul>
<p>This release includes the following change:</p>
<ul>
<li>Drop Qt 5 support</li>
</ul>
<p>With contributions from:</p>
<p>Heimen Stoffels, albanobattistella, தமிழ்நேரம்</p>
</description>
</release>
<release type="stable" version="1.0.0" date="2025-05-03T00:00:00Z"> <release type="stable" version="1.0.0" date="2025-05-03T00:00:00Z">
<description> <description>
<p>This release adds the following features:</p> <p>This release adds the following features:</p>
<ul> <ul>
<li>Support enforce windowed mode on start-up</li> <li>Support enforces windowed mode on start-up</li>
<li>Reload image automatically when current image gets updated</li> <li>Reload image automatically when current image gets updated</li>
</ul> </ul>
<p>This release fixes the following bugs:</p> <p>This release fixes the following bug:</p>
<ul> <ul>
<li>Refer to the right exiv2 CMake module so it can be found on Linux</li>
<li>Display correct text language on macOS</li> <li>Display correct text language on macOS</li>
</ul> </ul>
<p>This release includes the following changes:</p> <p>This release includes the following changes:</p>

View File

@ -1,102 +1,101 @@
# SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net> # SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
# #
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
QT += core widgets gui svg QT += core widgets gui svg svgwidgets
greaterThan(QT_MAJOR_VERSION, 5): QT += svgwidgets
TARGET = ppic
TARGET = ppic TEMPLATE = app
TEMPLATE = app DEFINES += PPIC_VERSION_STRING=\\\"x.y.z\\\"
DEFINES += PPIC_VERSION_STRING=\\\"x.y.z\\\"
win32 {
win32 { DEFINES += FLAG_PORTABLE_MODE_SUPPORT=1
DEFINES += FLAG_PORTABLE_MODE_SUPPORT=1 }
}
# The following define makes your compiler emit warnings if you use
# The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings
# any feature of Qt which has been marked as deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the
# depend on your compiler). Please consult the documentation of the # deprecated API in order to know how to port your code away from it.
# deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if you use deprecated APIs.
# You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line.
# In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt.
# You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
CONFIG += c++17 lrelease embed_translations
CONFIG += c++17 lrelease embed_translations
SOURCES += \
SOURCES += \ app/aboutdialog.cpp \
app/aboutdialog.cpp \ app/main.cpp \
app/main.cpp \ app/framelesswindow.cpp \
app/framelesswindow.cpp \ app/mainwindow.cpp \
app/mainwindow.cpp \ app/graphicsview.cpp \
app/graphicsview.cpp \ app/bottombuttongroup.cpp \
app/bottombuttongroup.cpp \ app/graphicsscene.cpp \
app/graphicsscene.cpp \ app/navigatorview.cpp \
app/navigatorview.cpp \ app/opacityhelper.cpp \
app/opacityhelper.cpp \ app/toolbutton.cpp \
app/toolbutton.cpp \ app/settings.cpp \
app/settings.cpp \ app/settingsdialog.cpp \
app/settingsdialog.cpp \ app/metadatamodel.cpp \
app/metadatamodel.cpp \ app/metadatadialog.cpp \
app/metadatadialog.cpp \ app/exiv2wrapper.cpp \
app/exiv2wrapper.cpp \ app/actionmanager.cpp \
app/actionmanager.cpp \ app/playlistmanager.cpp \
app/playlistmanager.cpp \ app/shortcutedit.cpp \
app/shortcutedit.cpp \ app/fileopeneventhandler.cpp
app/fileopeneventhandler.cpp
HEADERS += \
HEADERS += \ app/aboutdialog.h \
app/aboutdialog.h \ app/framelesswindow.h \
app/framelesswindow.h \ app/mainwindow.h \
app/mainwindow.h \ app/graphicsview.h \
app/graphicsview.h \ app/bottombuttongroup.h \
app/bottombuttongroup.h \ app/graphicsscene.h \
app/graphicsscene.h \ app/navigatorview.h \
app/navigatorview.h \ app/opacityhelper.h \
app/opacityhelper.h \ app/toolbutton.h \
app/toolbutton.h \ app/settings.h \
app/settings.h \ app/settingsdialog.h \
app/settingsdialog.h \ app/metadatamodel.h \
app/metadatamodel.h \ app/metadatadialog.h \
app/metadatadialog.h \ app/exiv2wrapper.h \
app/exiv2wrapper.h \ app/actionmanager.h \
app/actionmanager.h \ app/playlistmanager.h \
app/playlistmanager.h \ app/shortcutedit.h \
app/shortcutedit.h \ app/fileopeneventhandler.h
app/fileopeneventhandler.h
TRANSLATIONS = \
TRANSLATIONS = \ app/translations/PineapplePictures_en.ts \
app/translations/PineapplePictures_en.ts \ app/translations/PineapplePictures_zh_CN.ts \
app/translations/PineapplePictures_zh_CN.ts \ app/translations/PineapplePictures_de.ts \
app/translations/PineapplePictures_de.ts \ app/translations/PineapplePictures_es.ts \
app/translations/PineapplePictures_es.ts \ app/translations/PineapplePictures_fr.ts \
app/translations/PineapplePictures_fr.ts \ app/translations/PineapplePictures_nb_NO.ts \
app/translations/PineapplePictures_nb_NO.ts \ app/translations/PineapplePictures_nl.ts \
app/translations/PineapplePictures_nl.ts \ app/translations/PineapplePictures_ru.ts \
app/translations/PineapplePictures_ru.ts \ app/translations/PineapplePictures_si.ts \
app/translations/PineapplePictures_si.ts \ app/translations/PineapplePictures_id.ts
app/translations/PineapplePictures_id.ts
# Default rules for deployment.
# Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin
qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target
!isEmpty(target.path): INSTALLS += target
RESOURCES += \
RESOURCES += \ assets/resources.qrc
assets/resources.qrc
# Generate from svg:
# Generate from svg: # magick convert -density 512x512 -background none app-icon.svg -define icon:auto-resize app-icon.ico
# magick convert -density 512x512 -background none app-icon.svg -define icon:auto-resize app-icon.ico RC_ICONS = assets/icons/app-icon.ico
RC_ICONS = assets/icons/app-icon.ico
# Windows only, for rc file (we're not going to use the .rc file in this repo)
# Windows only, for rc file (we're not going to use the .rc file in this repo) QMAKE_TARGET_PRODUCT = Pineapple Pictures
QMAKE_TARGET_PRODUCT = Pineapple Pictures QMAKE_TARGET_DESCRIPTION = Pineapple Pictures - Image Viewer
QMAKE_TARGET_DESCRIPTION = Pineapple Pictures - Image Viewer QMAKE_TARGET_COPYRIGHT = MIT/Expat License - Copyright (C) 2024 Gary Wang
QMAKE_TARGET_COPYRIGHT = MIT/Expat License - Copyright (C) 2024 Gary Wang
# MSVC only, since QMake doesn't have a CMAKE_CXX_STANDARD_LIBRARIES or cpp_winlibs similar thing
# MSVC only, since QMake doesn't have a CMAKE_CXX_STANDARD_LIBRARIES or cpp_winlibs similar thing win32-msvc* {
win32-msvc* { LIBS += -luser32
LIBS += -luser32 }
}