From b01601085bcfcb687030493f7986c02c71a9cd92 Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Wed, 4 Dec 2024 20:07:15 +0800 Subject: [PATCH] chore: update README and related docs --- CMakeLists.txt | 2 +- NEWS | 16 ++++++++++++ README.md | 26 +++---------------- README.zh_CN.md | 26 +++---------------- app/graphicsscene.cpp | 4 +-- ...net.blumia.pineapple-pictures.metainfo.xml | 17 ++++++++++++ 6 files changed, 42 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1d956d7..cca4167c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) -project(pineapple-pictures VERSION 0.8.2.1) # don't forget to update NEWS file and AppStream metadata. +project(pineapple-pictures VERSION 0.9.0) # don't forget to update NEWS file and AppStream metadata. include (GNUInstallDirs) include (FeatureSummary) diff --git a/NEWS b/NEWS index c3028ba6..6732af23 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +Version 0.9.0 +~~~~~~~~~~~~~ +Released: 2024-12-08 + +Features: + * Support custom shortcuts for existing actions + * Actions for frame-by-frame animated image playback support + +Miscellaneous: + * Initial macOS bundle support + * bump minimum required CMake version to 3.16 + * Update translations + +Contributors: + albanobattistella, VenusGirl, gallegonovato, Sabri Ünal + Version 0.8.2.1 ~~~~~~~~~~~~~ Released: 2024-10-27 diff --git a/README.md b/README.md index 59a981b5..df5a0b8d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Yet another image viewer. |CI|Build Status| |---|---| -|Windows Build|[![Windows build status](https://ci.appveyor.com/api/projects/status/dbd8clww3cit6oa0/branch/master?svg=true)](https://ci.appveyor.com/project/BLumia/pineapplepictures/branch/master)| +|Windows Build|[![Windows CI](https://github.com/BLumia/pineapple-pictures/actions/workflows/windows.yml/badge.svg)](https://github.com/BLumia/pineapple-pictures/actions/workflows/windows.yml)| |macOS Build|[![macOS CI](https://github.com/BLumia/pineapple-pictures/actions/workflows/macos.yml/badge.svg)](https://github.com/BLumia/pineapple-pictures/actions/workflows/macos.yml)| |Ubuntu Build|[![Ubuntu CI](https://github.com/BLumia/pineapple-pictures/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/BLumia/pineapple-pictures/actions/workflows/ubuntu.yml)| @@ -54,31 +54,11 @@ The project will try to build with `exiv2` when it's available at build time, if Image formats supports rely on Qt's imageformats plugins, just get the plugins you need from your distro's package manager will be fine. For Windows user, you may need build and install the imageformats plugin manually, read the content below. +It's possible to build it under Windows, Linux, macOS, and maybe other desktop platforms that Qt is ported to. For platform specific build instructions, please read the [related wiki page](https://github.com/BLumia/pineapple-pictures/wiki/Platform-Specific-Build-Instructions). + > [!NOTE] > Although there is a `pineapple-pictures.pro` file which can be used for QMake build, it's only for testing purpose and it doesn't have `exiv2` support included. Using QMake to build this project is NOT supported, please use CMake if possible. -### Linux - -Just normal build process as other program will be fine. Nothing special ;) - -For Archlinux there are also a [PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pineapple-pictures-git) you can use. - -For packaging to debian-based distro, the `CMakeLists.txt` provides some cpack configurations for generating a `.deb` package. After the build process, use `cpack -G DEB` to generate the package. You can also take `.github/workflows/ubuntu.yml` as a reference. - -For this project, `DEB` is the only supported cpack generator in current state, feel free to submit a PR if you like improving `cpack` support for this project. - -### Windows - -The normal build steps for Linux is also applied to Windows, but since Windows doesn't have a decent package manager, so if you need any other image formats support other than the supported formats which Qt provided, you need to get and build these imageformats plugins manually and vendor it. It's optional and can be skipped if you don't need extra image formats support. - -For the Windows binary I provided, kimageformats plugin is used (for formats like kra, xcf, psd and etc.). You can take `appveyor.yml` as a reference to learn what I did when building the Windows binary. - -[KDE Craft](https://community.kde.org/Craft) environment also can be used to build and package this program. I did also created a blueprint for building this project that you can found it at [here](https://github.com/BearKidsTeam/craft-shmooprint-bkt). It's not the way I used to create the release binary, but still worth trying. - -### macOS - -I don't have a mac, so no support at all. There is also a GitHub Action (see `.github/workflows/macos.yml`) running macOS build though so at least it can build. Feel free to submit a PR if you would like to give some love to the macOS build ;P - ## License Pineapple Pictures as a whole is licensed under MIT license. Individual files may have a different, but compatible license. diff --git a/README.zh_CN.md b/README.zh_CN.md index d3e56a1a..0810f095 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -2,7 +2,7 @@ |CI|构建状态| |---|---| -|Windows Build|[![Windows build status](https://ci.appveyor.com/api/projects/status/dbd8clww3cit6oa0/branch/master?svg=true)](https://ci.appveyor.com/project/BLumia/pineapplepictures/branch/master)| +|Windows Build|[![Windows CI](https://github.com/BLumia/pineapple-pictures/actions/workflows/windows.yml/badge.svg)](https://github.com/BLumia/pineapple-pictures/actions/workflows/windows.yml)| |macOS Build|[![macOS CI](https://github.com/BLumia/pineapple-pictures/actions/workflows/macos.yml/badge.svg)](https://github.com/BLumia/pineapple-pictures/actions/workflows/macos.yml)| |Ubuntu Build|[![Ubuntu CI](https://github.com/BLumia/pineapple-pictures/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/BLumia/pineapple-pictures/actions/workflows/ubuntu.yml)| @@ -55,31 +55,11 @@ $ cmake --build . # 如果你使用 Makefile 作为 CMake 生成器，也可以 此应用的图片格式支持依赖于 Qt 的 imageformats 插件，直接从您所用的发行版获取对应的图像格式插件即可。对于 Windows 用户，您可能需要手动构建和使用图像格式插件。下方给出了进一步的说明。 +在 Windows、Linux 以及 macOS 系统均可构建此应用，其它有移植 Qt 支持的平台也可能可以进行构建。若要了解一些平台相关的构建指引，请参阅[相关的 Wiki 页面](https://github.com/BLumia/pineapple-pictures/wiki/Platform-Specific-Build-Instructions)。 + > [!NOTE] > 尽管存在一个可用于 QMake 构建的 `pineapple-pictures.pro` 文件，但其仅供简单测试所用且其并不包含 `exiv2` 支持。使用 QMake 构建此项目是 **不受支持** 的，请尽可能考虑使用 CMake。 -### Linux - -常规的构建步骤即可完成构建，不需要额外的处理步骤 ;) - -对于 Archlinux 发行版的用户，这里还有一个 [PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pineapple-pictures-git) 可供使用和参考。 - -对于在基于 debian 的发行版中进行打包的需求， `CMakeLists.txt` 已经提供了一些基本的 cpack 配置以便生成一个有效的 `.deb` 软件包。在构建步骤完毕后，使用 `cpack -G DEB` 即可生成 DEB 软件包。您也可以参考 `.github/workflows/ubuntu.yml` 来查看当前正在使用的 CI 配置是如何进行打包的。 - -目前，`DEB` 是当前唯一受到直接支持的 cpack 生成目标。若希望为此项目添加其它的 cpack 目标支持，欢迎发起合并请求。 - -### Windows - -上述的构建步骤在 Windows 中也适用，但由于 Windows 中不具备类如大多 Linux 发行版中所提供的方便的软件包管理机制，故如果您需要任何 Qt 官方支持之外的图像格式例如 psd，xcf，kra 等格式的支持，你就可能需要自行获取并构建对应的 imageformats 插件，并在您最终生成的可执行文件中一并提供这些插件。若您不需要这些额外的图像格式支持，这个步骤也可以直接跳过。 - -我们所提供的预编译好的 Windows 程序包含了 kimageformats 插件来提供额外（kra, xcf, psd 等）格式的支持。您可以参考 `appveyor.yml` 来查看我们是如何构建并打包 Windows 可执行程序的。 - -[KDE Craft](https://community.kde.org/Craft) 环境也可以被用来构建此应用程序。我也创建了一个蓝图来进行此项目的构建和打包，可参见[这里](https://github.com/BearKidsTeam/craft-shmooprint-bkt)。尽管这不是我用于构建发布二进制所使用的方案，但仍值得一试。 - -### macOS - -由于我没有 mac 设备，故 macOS 暂时不受任何支持。不过我们目前有一个 GitHub Action 来执行 macOS 环境下的构建（见 `.github/workflows/macos.yml`）所以至少 macOS 下是可以顺利进行构建的。如果您想完善对 macOS 的支持，也欢迎您创建合并请求 ;P - ## 许可协议 菠萝看图整体使用 MIT 协议进行发布。项目所随的部分源文件可能具备不同但与之兼容的许可协议。 diff --git a/app/graphicsscene.cpp b/app/graphicsscene.cpp index 39d8ae57..101e2a7f 100644 --- a/app/graphicsscene.cpp +++ b/app/graphicsscene.cpp @@ -131,8 +131,8 @@ void GraphicsScene::showSvg(const QString &filepath) QSvgRenderer * render = new QSvgRenderer(svgItem); #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) // Qt 6.7.0's SVG support is terrible caused by huge memory usage, see QTBUG-124287 - // Qt 6.7.1's is somewhat better, memory issue seems fixed, but still laggy when zoom in - // Anyway let's disable it for now. + // Qt 6.7.1's is somewhat better, memory issue seems fixed, but still laggy when zoom in, + // see QTBUG-126771. Anyway let's disable it for now. render->setOptions(QtSvg::Tiny12FeaturesOnly); #endif // QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) render->load(filepath); diff --git a/dist/appstream/net.blumia.pineapple-pictures.metainfo.xml b/dist/appstream/net.blumia.pineapple-pictures.metainfo.xml index 8d9d0bae..cfdef9cb 100644 --- a/dist/appstream/net.blumia.pineapple-pictures.metainfo.xml +++ b/dist/appstream/net.blumia.pineapple-pictures.metainfo.xml @@ -74,6 +74,23 @@ + + +

This release adds the following features:

+
    +
  • Support custom shortcuts for existing actions
    • +
  • Actions for frame-by-frame animated image playback support
    • +
+

This release includes the following changes:

+
    +
  • Initial macOS bundle support
    • +
  • bump minimum required CMake version to 3.16
    • +
  • Update translations
    • +
+

With contributions from:

+

albanobattistella, VenusGirl, gallegonovato, Sabri Ünal

+ +

This release fixes the following bug: