Compare commits
8 Commits
2de9ff810d
...
0.9.1
Author | SHA1 | Date | |
---|---|---|---|
088066197f | |||
3a8e907f28 | |||
eb04ac362b | |||
6d7d0e4e1d | |||
ff4f71c1e6 | |||
101f111209 | |||
c227c74e23 | |||
32ff813609 |
20
.github/workflows/macos.yml
vendored
20
.github/workflows/macos.yml
vendored
@ -14,15 +14,25 @@ jobs:
|
||||
with:
|
||||
version: '6.8.1'
|
||||
modules: 'qtimageformats'
|
||||
- name: Run a qt project
|
||||
- name: Install Conan and Dependencies
|
||||
id: conan
|
||||
working-directory: ./
|
||||
shell: bash
|
||||
run: |
|
||||
cmake . -Bbuild -DTRANSLATION_RESOURCE_EMBEDDING=ON
|
||||
cmake --build build
|
||||
pip3 install wheel setuptools
|
||||
pip3 install conan --upgrade
|
||||
conan --version
|
||||
conan profile detect
|
||||
conan install --requires=exiv2/0.28.3 --generator CMakeDeps --generator CMakeToolchain --build=missing
|
||||
- name: Build
|
||||
run: |
|
||||
cmake . -DTRANSLATION_RESOURCE_EMBEDDING=ON --preset conan-release
|
||||
cmake --build --preset conan-release
|
||||
- name: Deploy
|
||||
run: |
|
||||
macdeployqt ./build/ppic.app -dmg
|
||||
macdeployqt ./ppic.app -dmg
|
||||
ls
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: "macos-bundle"
|
||||
path: build/*.dmg
|
||||
path: "*.dmg"
|
||||
|
@ -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)
|
||||
@ -68,6 +68,7 @@ set (PPIC_CPP_FILES
|
||||
app/exiv2wrapper.cpp
|
||||
app/playlistmanager.cpp
|
||||
app/shortcutedit.cpp
|
||||
app/fileopeneventhandler.cpp
|
||||
)
|
||||
|
||||
set (PPIC_HEADER_FILES
|
||||
@ -88,6 +89,7 @@ set (PPIC_HEADER_FILES
|
||||
app/exiv2wrapper.h
|
||||
app/playlistmanager.h
|
||||
app/shortcutedit.h
|
||||
app/fileopeneventhandler.h
|
||||
)
|
||||
|
||||
set (PPIC_QRC_FILES
|
||||
|
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2020 BLumia
|
||||
Copyright (c) 2025 BLumia
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
19
NEWS
19
NEWS
@ -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
|
||||
|
@ -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)
|
||||
|
@ -59,7 +59,7 @@ AboutDialog::AboutDialog(QWidget *parent)
|
||||
)),
|
||||
QStringLiteral("<hr/>"),
|
||||
tr("Copyright (c) %1 %2", "%1 is year, %2 is the name of copyright holder(s)")
|
||||
.arg(QStringLiteral("2024"), QStringLiteral("<a href='https://github.com/BLumia'>@BLumia</a>")),
|
||||
.arg(QStringLiteral("2025"), QStringLiteral("<a href='https://github.com/BLumia'>@BLumia</a>")),
|
||||
QStringLiteral("<br/>"),
|
||||
tr("Logo designed by %1").arg(QStringLiteral("<a href='https://github.com/Lovelyblack'>@Lovelyblack</a>")),
|
||||
QStringLiteral("<hr/>"),
|
||||
@ -103,7 +103,7 @@ AboutDialog::AboutDialog(QWidget *parent)
|
||||
|
||||
const QString mitLicense(QStringLiteral(R"(Expat/MIT License
|
||||
|
||||
Copyright (c) 2024 BLumia
|
||||
Copyright (c) 2025 BLumia
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
22
app/fileopeneventhandler.cpp
Normal file
22
app/fileopeneventhandler.cpp
Normal file
@ -0,0 +1,22 @@
|
||||
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
|
||||
//
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
#include "fileopeneventhandler.h"
|
||||
|
||||
#include <QFileOpenEvent>
|
||||
|
||||
FileOpenEventHandler::FileOpenEventHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
}
|
||||
|
||||
bool FileOpenEventHandler::eventFilter(QObject *obj, QEvent *event)
|
||||
{
|
||||
if (event->type() == QEvent::FileOpen) {
|
||||
QFileOpenEvent *fileOpenEvent = static_cast<QFileOpenEvent *>(event);
|
||||
emit fileOpen(fileOpenEvent->url());
|
||||
return true;
|
||||
}
|
||||
return QObject::eventFilter(obj, event);
|
||||
}
|
21
app/fileopeneventhandler.h
Normal file
21
app/fileopeneventhandler.h
Normal file
@ -0,0 +1,21 @@
|
||||
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
|
||||
//
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
|
||||
class FileOpenEventHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit FileOpenEventHandler(QObject *parent = nullptr);
|
||||
|
||||
protected:
|
||||
bool eventFilter(QObject *obj, QEvent *event) override;
|
||||
|
||||
signals:
|
||||
void fileOpen(const QUrl &url);
|
||||
};
|
19
app/main.cpp
19
app/main.cpp
@ -7,6 +7,10 @@
|
||||
#include "playlistmanager.h"
|
||||
#include "settings.h"
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
#include "fileopeneventhandler.h"
|
||||
#endif // Q_OS_MACOS
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCommandLineParser>
|
||||
#include <QDir>
|
||||
@ -55,6 +59,21 @@ int main(int argc, char *argv[])
|
||||
MainWindow w;
|
||||
w.show();
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
FileOpenEventHandler * fileOpenEventHandler = new FileOpenEventHandler(&a);
|
||||
a.installEventFilter(fileOpenEventHandler);
|
||||
a.connect(fileOpenEventHandler, &FileOpenEventHandler::fileOpen, [&w](const QUrl & url){
|
||||
if (w.isHidden()) {
|
||||
w.setWindowOpacity(1);
|
||||
w.showNormal();
|
||||
} else {
|
||||
w.activateWindow();
|
||||
}
|
||||
w.showUrls({url});
|
||||
w.initWindowSize();
|
||||
});
|
||||
#endif // Q_OS_MACOS
|
||||
|
||||
QStringList urlStrList = parser.positionalArguments();
|
||||
QList<QUrl> && urlList = PlaylistManager::convertToUrlList(urlStrList);
|
||||
|
||||
|
@ -71,7 +71,11 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
m_exitAnimationGroup->addAnimation(m_fadeOutAnimation);
|
||||
m_exitAnimationGroup->addAnimation(m_floatUpAnimation);
|
||||
connect(m_exitAnimationGroup, &QParallelAnimationGroup::finished,
|
||||
#ifdef Q_OS_MAC
|
||||
this, &QWidget::hide);
|
||||
#else
|
||||
this, &QWidget::close);
|
||||
#endif
|
||||
|
||||
GraphicsScene * scene = new GraphicsScene(this);
|
||||
|
||||
@ -160,10 +164,6 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
installResizeCapture(m_graphicsView->viewport());
|
||||
installResizeCapture(m_gv);
|
||||
installResizeCapture(m_gv->viewport());
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
qApp->installEventFilter(this);
|
||||
#endif // Q_OS_MACOS
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
@ -563,7 +563,7 @@ void MainWindow::centerWindow()
|
||||
Qt::LeftToRight,
|
||||
Qt::AlignCenter,
|
||||
this->size(),
|
||||
qApp->screenAt(QCursor::pos())->geometry()
|
||||
qApp->screenAt(QCursor::pos())->availableGeometry()
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -661,20 +661,6 @@ QSize MainWindow::sizeHint() const
|
||||
return QSize(710, 530);
|
||||
}
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
bool MainWindow::eventFilter(QObject *obj, QEvent *event)
|
||||
{
|
||||
Q_UNUSED(obj);
|
||||
if (event->type() == QEvent::FileOpen) {
|
||||
QFileOpenEvent *fileOpenEvent = static_cast<QFileOpenEvent *>(event);
|
||||
showUrls({fileOpenEvent->url()});
|
||||
initWindowSize();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif // Q_OS_MACOS
|
||||
|
||||
void MainWindow::on_actionOpen_triggered()
|
||||
{
|
||||
QStringList picturesLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
|
||||
|
@ -77,9 +77,6 @@ protected slots:
|
||||
|
||||
protected:
|
||||
QSize sizeHint() const override;
|
||||
#ifdef Q_OS_MACOS
|
||||
bool eventFilter(QObject *obj, QEvent *event) override;
|
||||
#endif // Q_OS_MACOS
|
||||
|
||||
private slots:
|
||||
void on_actionOpen_triggered();
|
||||
|
@ -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"/>
|
||||
|
@ -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ı aç/kapat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../settingsdialog.cpp" line="83"/>
|
||||
|
@ -8,9 +8,9 @@ environment:
|
||||
LIBEXIV2: C:\projects\exiv2
|
||||
PPKG: C:\projects\ppkg
|
||||
matrix:
|
||||
- job_name: mingw_64_qt6_7
|
||||
QTDIR: C:\Qt\6.7\mingw_64
|
||||
MINGW64: C:\Qt\Tools\mingw1120_64
|
||||
- job_name: mingw_64_qt6_8
|
||||
QTDIR: C:\Qt\6.8\mingw_64
|
||||
MINGW64: C:\Qt\Tools\mingw1310_64
|
||||
KF_BRANCH: master
|
||||
EXIV2_VERSION: "0.28.3"
|
||||
EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF"
|
||||
@ -125,7 +125,7 @@ build_script:
|
||||
- cd kimageformats
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_QTPLUGINDIR=%QTDIR%\plugins
|
||||
- cmake .. -G "Ninja" -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_QTPLUGINDIR=%QTDIR%\plugins
|
||||
- cmake --build . --config Release
|
||||
- cmake --build . --config Release --target install/strip
|
||||
- cd %APPVEYOR_BUILD_FOLDER%
|
||||
|
@ -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>
|
||||
|
@ -40,7 +40,8 @@ SOURCES += \
|
||||
app/exiv2wrapper.cpp \
|
||||
app/actionmanager.cpp \
|
||||
app/playlistmanager.cpp \
|
||||
app/shortcutedit.cpp
|
||||
app/shortcutedit.cpp \
|
||||
app/fileopeneventhandler.cpp
|
||||
|
||||
HEADERS += \
|
||||
app/aboutdialog.h \
|
||||
@ -59,7 +60,8 @@ HEADERS += \
|
||||
app/exiv2wrapper.h \
|
||||
app/actionmanager.h \
|
||||
app/playlistmanager.h \
|
||||
app/shortcutedit.h
|
||||
app/shortcutedit.h \
|
||||
app/fileopeneventhandler.h
|
||||
|
||||
TRANSLATIONS = \
|
||||
app/translations/PineapplePictures.ts \
|
||||
|
Reference in New Issue
Block a user