mac menu

.github/workflows/reuse-check.yml

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

.github/workflows/windows.yml

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

.reuse/dep5

@@ -0,0 +1,28 @@
+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

CMakeLists.txt

@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(pineapple-pictures VERSION 0.9.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)

NEWS

@@ -1,22 +1,3 @@
-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

README.md

@@ -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 / certain distro's package maintainers
+### Maintained by contributors / curtain 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)

REUSE.toml

@@ -1,33 +0,0 @@
-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"

app/actionmanager.cpp

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

app/mainwindow.cpp

@@ -37,6 +37,8 @@
 #include <QProcess>
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QMenuBar>
+#include <QLayout>
 
 #ifdef HAVE_QTDBUS
 #include <QDBusInterface>
@@ -126,6 +128,14 @@ 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,

app/playlistmanager.cpp

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

app/playlistmanager.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
+// SPDX-FileCopyrightText: 2024 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() override;
+    ~PlaylistModel();
 
     void setPlaylist(const QList<QUrl> & urls);
     QModelIndex loadPlaylist(const QList<QUrl> & urls);

app/translations/PineapplePictures_it.ts

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

app/translations/PineapplePictures_tr.ts

@@ -295,12 +295,12 @@
     <message>
         <location filename="../actionmanager.cpp" line="108"/>
         <source>Pause/Resume Animation</source>
-        <translation>Canlandırmayı Duraklat/Sürdür</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../actionmanager.cpp" line="109"/>
         <source>Animation Go to Next Frame</source>
-        <translation>Canlandırma Sonraki Kareye Git</translation>
+        <translation type="unfinished"></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>Kısayollar ayarlanamadı</translation>
+        <translation type="unfinished"></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>Tam ekranı aç/kapat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="83"/>

dist/appstream/net.blumia.pineapple-pictures.metainfo.xml

@@ -74,27 +74,6 @@
     </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>