5 Commits

Author SHA1 Message Date
a33381557b chore: sync playlistmanager changes from other project 2025-02-16 00:50:14 +08:00
6d8ec6a54a chore(CI): bump msvc windows CI Qt version to 6.8.2 2025-02-06 12:48:21 +08:00
dd3209e3ff chore(REUSE): convert from DEP5 to REUSE.toml 2025-02-02 12:50:44 +08:00
088066197f chore: update release info to 0.9.1 2025-01-20 20:06:59 +08:00
3a8e907f28 i18n: Translations update from Hosted Weblate (#138)
* Translated using Weblate (Italian)

Currently translated at 100.0% (162 of 162 strings)

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

* Translated using Weblate (Turkish)

Currently translated at 99.3% (161 of 162 strings)

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

---------

Co-authored-by: albanobattistella <albano_battistella@hotmail.com>
Co-authored-by: Sabri Ünal <yakushabb@gmail.com>
2025-01-20 19:55:55 +08:00
14 changed files with 96 additions and 63 deletions

View File

@ -7,9 +7,11 @@ name: REUSE Compliance Check
on: [push, pull_request]
jobs:
test:
reuse-compliance-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v2
uses: fsfe/reuse-action@v5

View File

@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
include:
- qt_ver: '6.8.1'
- qt_ver: '6.8.2'
vs: '2022'
aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64'
@ -44,7 +44,7 @@ jobs:
strategy:
matrix:
include:
- qt_ver: '6.8.1'
- qt_ver: '6.8.2'
vs: '2022'
aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64'

View File

@ -1,28 +0,0 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Pineapple Pictures
Source: https://github.com/BLumia/pineapple-pictures
# Config files
Files: .gitignore appveyor.yml .github/*
Copyright: None
License: CC0-1.0
# README, resource files and Metadata files
Files: README*.md NEWS assets/*.rc assets/*.qrc dist/*
Copyright: None
License: CC0-1.0
# Translation files
# See assets/plain/translators.html for a list of translators
Files: app/translations/*.ts assets/plain/translators.html
Copyright: Translators from hosted.weblate.org
License: MIT
# Assets
Files: assets/icons/*.svg
Copyright: 2022 Gary Wang
License: MIT
Files: assets/icons/app-icon.*
Copyright: 2020 Lovelyblack
License: MIT

View File

@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.16)
project(pineapple-pictures VERSION 0.9.0) # don't forget to update NEWS file and AppStream metadata.
project(pineapple-pictures VERSION 0.9.1) # don't forget to update NEWS file and AppStream metadata.
include (GNUInstallDirs)
include (FeatureSummary)

19
NEWS
View File

@ -1,3 +1,22 @@
Version 0.9.1
~~~~~~~~~~~~~
Released: 2025-01-25
Features:
* Option to double-click to fullscreen
* Build-time option to embed translation resources
Bugfixes:
* Fix window size not adjusted when open file on macOS
* Should center window according to available screen geometry
Miscellaneous:
* Change close window bahavior on macOS
* Update translations
Contributors:
albanobattistella, Sabri Ünal
Version 0.9.0
~~~~~~~~~~~~~
Released: 2024-12-08

View File

@ -21,7 +21,7 @@ Pineapple Pictures is a lightweight image viewer that allows you view JPEG, PNG,
- Archlinux AUR: [pineapple-pictures](https://aur.archlinux.org/packages/pineapple-pictures/) | [pineapple-pictures-git](https://aur.archlinux.org/packages/pineapple-pictures-git/)
- [Itch.io Store](https://blumia.itch.io/pineapple-pictures)
### Maintained by contributors / curtain 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`
- 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)

33
REUSE.toml Normal file
View File

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

View File

@ -83,8 +83,6 @@ void ActionManager::setupAction(MainWindow *mainWindow)
#undef CREATE_NEW_ACTION
#undef CREATE_NEW_THEMEICON_ACTION
actionSettings->setMenuRole(QAction::PreferencesRole);
retranslateUi(mainWindow);
QMetaObject::connectSlotsByName(mainWindow);

View File

@ -37,8 +37,6 @@
#include <QProcess>
#include <QDesktopServices>
#include <QMessageBox>
#include <QMenuBar>
#include <QLayout>
#ifdef HAVE_QTDBUS
#include <QDBusInterface>
@ -128,14 +126,6 @@ MainWindow::MainWindow(QWidget *parent)
m_am->setupAction(this);
QMenuBar * menuBar = new QMenuBar(this);
QMenu* fileMenu = menuBar->addMenu("File");
fileMenu->addAction(m_am->actionOpen);
fileMenu->addAction(m_am->actionSettings);
QMenu* helpMenu = menuBar->addMenu("Help");
helpMenu->addAction(m_am->actionHelp);
layout()->setMenuBar(menuBar);
m_bottomButtonGroup = new BottomButtonGroup({
m_am->actionActualSize,
m_am->actionToggleMaximize,

View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
@ -16,9 +16,7 @@ PlaylistModel::PlaylistModel(QObject *parent)
}
PlaylistModel::~PlaylistModel()
{
}
= default;
void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
{
@ -29,7 +27,7 @@ void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
QModelIndex PlaylistModel::loadPlaylist(const QList<QUrl> & urls)
{
if (urls.isEmpty()) return QModelIndex();
if (urls.isEmpty()) return {};
if (urls.count() == 1) {
return loadPlaylist(urls.constFirst());
} else {
@ -128,7 +126,7 @@ int PlaylistModel::rowCount(const QModelIndex &parent) const
QVariant PlaylistModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) return QVariant();
if (!index.isValid()) return {};
switch (role) {
case Qt::DisplayRole:
@ -137,7 +135,7 @@ QVariant PlaylistModel::data(const QModelIndex &index, int role) const
return m_playlist.at(index.row());
}
return QVariant();
return {};
}
PlaylistManager::PlaylistManager(QObject *parent)
@ -196,7 +194,7 @@ int PlaylistManager::totalCount() const
QModelIndex PlaylistManager::previousIndex() const
{
int count = totalCount();
if (count == 0) return QModelIndex();
if (count == 0) return {};
return m_model.index(m_currentIndex - 1 < 0 ? count - 1 : m_currentIndex - 1);
}
@ -204,7 +202,7 @@ QModelIndex PlaylistManager::previousIndex() const
QModelIndex PlaylistManager::nextIndex() const
{
int count = totalCount();
if (count == 0) return QModelIndex();
if (count == 0) return {};
return m_model.index(m_currentIndex + 1 == count ? 0 : m_currentIndex + 1);
}

View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
@ -18,7 +18,7 @@ public:
Q_PROPERTY(QStringList autoLoadFilterSuffixes MEMBER m_autoLoadSuffixes NOTIFY autoLoadFilterSuffixesChanged)
explicit PlaylistModel(QObject *parent = nullptr);
~PlaylistModel();
~PlaylistModel() override;
void setPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QList<QUrl> & urls);

View File

@ -764,7 +764,7 @@
<message>
<location filename="../settingsdialog.cpp" line="79"/>
<source>Toggle fullscreen</source>
<translation type="unfinished"></translation>
<translation>Attiva schermo intero</translation>
</message>
<message>
<location filename="../settingsdialog.cpp" line="83"/>

View File

@ -295,12 +295,12 @@
<message>
<location filename="../actionmanager.cpp" line="108"/>
<source>Pause/Resume Animation</source>
<translation type="unfinished"></translation>
<translation>Canlandırmayı Duraklat/Sürdür</translation>
</message>
<message>
<location filename="../actionmanager.cpp" line="109"/>
<source>Animation Go to Next Frame</source>
<translation type="unfinished"></translation>
<translation>Canlandırma Sonraki Kareye Git</translation>
</message>
<message>
<location filename="../actionmanager.cpp" line="111"/>
@ -743,7 +743,7 @@
<message>
<location filename="../settingsdialog.cpp" line="68"/>
<source>Failed to set shortcuts</source>
<translation type="unfinished"></translation>
<translation>Kısayollar ayarlanamadı</translation>
</message>
<message>
<location filename="../settingsdialog.cpp" line="69"/>
@ -768,7 +768,7 @@
<message>
<location filename="../settingsdialog.cpp" line="79"/>
<source>Toggle fullscreen</source>
<translation type="unfinished"></translation>
<translation>Tam ekranı /kapat</translation>
</message>
<message>
<location filename="../settingsdialog.cpp" line="83"/>

View File

@ -74,6 +74,27 @@
</screenshot>
</screenshots>
<releases>
<release type="stable" version="0.9.1" date="2025-01-25T00:00:00Z">
<description>
<p>This release adds the following features:</p>
<ul>
<li>Option to double-click to fullscreen</li>
<li>Build-time option to embed translation resources</li>
</ul>
<p>This release fixes the following bugs:</p>
<ul>
<li>Fix window size not adjusted when open file on macOS</li>
<li>Should center window according to available screen geometry</li>
</ul>
<p>This release includes the following changes:</p>
<ul>
<li>Change close window bahavior on macOS</li>
<li>Update translations</li>
</ul>
<p>With contributions from:</p>
<p>albanobattistella, Sabri Ünal</p>
</description>
</release>
<release type="stable" version="0.9.0" date="2024-12-08T00:00:00Z">
<description>
<p>This release adds the following features:</p>