v2.9.2

Currently translated at 100.0% (140 of 140 strings)


Translate-URL: https://hosted.weblate.org/projects/cartridges/cartridges/cs/
Translation: Cartridges/Cartridges

Co-authored-by: foo expert <deferred_water346@simplelogin.com>

.github/workflows/ci.yml

@@ -14,14 +14,14 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:gnome-46
       options: --privileged
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Flatpak Builder
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
-      with:
-        bundle: page.kramo.Cartridges.Devel.flatpak
-        manifest-path: flatpak/page.kramo.Cartridges.Devel.json
+      - name: Flatpak Builder
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+        with:
+          bundle: page.kramo.Cartridges.Devel.flatpak
+          manifest-path: build-aux/flatpak/page.kramo.Cartridges.Devel.json
 
   windows:
     name: Windows
@@ -51,10 +51,49 @@ jobs:
           timeout 2 cartridges; [ "$?" -eq "124" ]
 
       - name: Inno Setup
-        run: iscc ".\_build\windows\Cartridges.iss"
+        run: iscc ".\_build\build-aux\windows\Cartridges.iss"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: Windows Installer
-          path: _build/windows/Output/Cartridges Setup.exe
+          path: _build/build-aux/windows/Output/Cartridges Windows.exe
+
+  macos:
+    name: macOS
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
+      - name: Install Dependencies
+        run: |
+          brew install meson pygobject3 libadwaita adwaita-icon-theme desktop-file-utils pyinstaller pillow
+          pip3 install --break-system-packages requests PyYAML pyobjc
+
+      - name: Meson Build
+        run: |
+          meson setup _build -Dtiff_compression=jpeg
+          ninja install -C _build
+
+      - name: PyInstaller
+        env:
+          PYTHONPATH: /opt/homebrew/opt/homebrew/lib/python3.12/site-packages
+        run: |
+          cd build-aux/macos
+          pyinstaller ./cartridges.spec
+
+      - name: Zip
+        run: |
+          cd build-aux/macos/dist
+          zip -yr Cartridges\ macOS.zip Cartridges.app
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: build-aux/macos/dist/Cartridges macOS.zip
+          name: macOS Application

.github/workflows/publish-release.yml

@@ -1,8 +1,7 @@
 name: Publish Release
 on:
   push:
-    tags:
-      "*"
+    tags: "*"
 
 concurrency:
   group: release-${{ github.sha }}
@@ -16,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@v3.1.4
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: ci.yml
           commit: ${{ github.sha }}
@@ -39,9 +38,11 @@ jobs:
         run: echo tag_name=${GITHUB_REF#refs/tags/} >> $GITHUB_OUTPUT
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2.0.5
+        uses: softprops/action-gh-release@v2.0.6
         with:
-          files: Windows Installer/Cartridges Setup.exe
+          files: |
+            Windows Installer/Cartridges Windows.exe
+            macOS Application/Cartridges macOS.zip
           fail_on_unmatched_files: true
           tag_name: ${{ steps.get_tag_name.outputs.tag_name }}
           body_path: release_notes

.gitignore

@@ -1,4 +1,7 @@
 /subprojects/blueprint-compiler
+/build-aux/macos/build
+/build-aux/macos/dist
 /.flatpak
 /.flatpak-builder
-/.vscode
+/.vscode
+.DS_Store

CONTRIBUTING.md

@@ -33,6 +33,11 @@ The project can be translated on [Weblate](https://hosted.weblate.org/engage/car
 2. From the MSYS2 shell, install the required dependencies listed [here](https://github.com/kra-mo/cartridges/blob/main/.github/workflows/ci.yml).
 3. Build it via Meson.
 
+## For macOS
+1. Install [Homebrew](https://brew.sh/).
+2. Using `brew` and `pip3`, install the required dependencies listed [here](https://github.com/kra-mo/cartridges/blob/main/.github/workflows/ci.yml).
+3. Build it via Meson.
+
 ## Meson
 ```bash
 git clone https://github.com/kra-mo/cartridges.git

README.md

@@ -65,11 +65,9 @@ Thank you for your generosity! 💜
 
 ## Linux
 
-### Flathub
-
 The app is available on Flathub.
 
-<a href=https://flathub.org/apps/page.kramo.Cartridges><img width='240' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
+<a href=https://flathub.org/apps/page.kramo.Cartridges><img alt='Download on Flathub' src='https://flathub.org/api/badge?svg&locale=en'/></a>
 
 ## Windows
 
@@ -84,6 +82,13 @@ Note: Windows might present you with a warning when trying to install the app. T
 
 Install the latest release with the command: `winget install cartridges`.
 
+## macOS
+
+1. Download the latest release from [Releases](https://github.com/kra-mo/cartridges/releases).
+2. Move the app into your Applications folder.
+
+Note: macOS might tell you that the application could not be checked for malicious software or something similar. In this case, open System Settings > Privacy & Security, scroll down, find the warning about Cartridges and click "Open Anyway". More information can be found [here](https://support.apple.com/en-us/102445).
+
 ## Building manually
 
 See [Building](https://github.com/kra-mo/cartridges/blob/main/CONTRIBUTING.md#building).

build-aux/flatpak/page.kramo.Cartridges.Devel.json

@@ -130,7 +130,7 @@
             "sources" : [
                 {
                     "type" : "dir",
-                    "path" : ".."
+                    "path" : "../.."
                 }
             ]
         }

build-aux/macos/cartridges.spec

@@ -0,0 +1,59 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ["../../_build/cartridges/cartridges"],
+    pathex=[],
+    binaries=[],
+    datas=[("../../_build/data/cartridges.gresource", "Resources")],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={
+        "gi": {
+            "module-versions": {
+                "Gtk": "4.0",
+            },
+        },
+    },
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name="Cartridges",
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name="Cartridges",
+)
+app = BUNDLE(
+    coll,
+    name="Cartridges.app",
+    icon="./icon.icns",
+    bundle_identifier="page.kramo.Cartridges",
+    info_plist={
+        "LSApplicationCategoryType": "public.app-category.games",
+    },
+)

build-aux/windows/Cartridges.iss.in

@@ -15,10 +15,10 @@ AppSupportURL=https://github.com/kra-mo/cartridges/issues
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={autopf64}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=..\..\LICENSE
+LicenseFile=..\..\..\LICENSE
 PrivilegesRequiredOverridesAllowed=dialog
-OutputBaseFilename=Cartridges Setup
-SetupIconFile=..\..\windows\icon.ico
+OutputBaseFilename=Cartridges Windows
+SetupIconFile=..\..\..\build-aux\windows\icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -49,7 +49,7 @@ Source: "D:\a\_temp\msys64\ucrt64\share\icons\*"; DestDir: "{app}\share\icons";
 Source: "D:\a\_temp\msys64\ucrt64\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs ignoreversion
 Source: "D:\a\_temp\msys64\ucrt64\share\gtk-4.0\*"; DestDir: "{app}\share\gtk-4.0"; Flags: recursesubdirs ignoreversion
 
-Source: "..\..\windows\icon.ico"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion
+Source: "..\..\..\build-aux\windows\icon.ico"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\bin\{#MyAppExeName}"; Parameters: """{app}\bin\cartridges"""; IconFilename: "{app}\icon.ico"

build-aux/windows/meson.build

@@ -3,5 +3,5 @@ configure_file(
   output: 'Cartridges.iss',
   configuration: conf,
   install: true,
-  install_dir: '.'
-)
+  install_dir: '.',
+)

cartridges/application_delegate.py

@@ -0,0 +1,121 @@
+# application_delegate.py
+#
+# Copyright 2024 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""A set of methods that manage your app’s life cycle and its interaction
+with common system services."""
+
+from typing import Any
+
+from AppKit import NSApp, NSApplication, NSMenu, NSMenuItem  # type: ignore
+from Foundation import NSObject  # type: ignore
+from gi.repository import Gio  # type: ignore
+
+from cartridges import shared
+
+
+class ApplicationDelegate(NSObject):  # type: ignore
+    """A set of methods that manage your app’s life cycle and its interaction
+    with common system services."""
+
+    def applicationDidFinishLaunching_(self, *_args: Any) -> None:
+        main_menu = NSApp.mainMenu()
+
+        add_game_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "Add Game", "add:", "n"
+        )
+
+        import_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "Import", "import:", "i"
+        )
+
+        file_menu = NSMenu.alloc().init()
+        file_menu.addItem_(add_game_menu_item)
+        file_menu.addItem_(import_menu_item)
+
+        file_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "File", None, ""
+        )
+        file_menu_item.setSubmenu_(file_menu)
+        main_menu.addItem_(file_menu_item)
+
+        show_hidden_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "Show Hidden", "hidden:", "h"
+        )
+
+        windows_menu = NSMenu.alloc().init()
+
+        view_menu = NSMenu.alloc().init()
+        view_menu.addItem_(show_hidden_menu_item)
+
+        view_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "View", None, ""
+        )
+        view_menu_item.setSubmenu_(view_menu)
+        main_menu.addItem_(view_menu_item)
+
+        windows_menu = NSMenu.alloc().init()
+
+        windows_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "Window", None, ""
+        )
+        windows_menu_item.setSubmenu_(windows_menu)
+        main_menu.addItem_(windows_menu_item)
+
+        NSApp.setWindowsMenu_(windows_menu)
+
+        keyboard_shortcuts_menu_item = (
+            NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+                "Keyboard Shortcuts", "shortcuts:", "?"
+            )
+        )
+
+        help_menu = NSMenu.alloc().init()
+        help_menu.addItem_(keyboard_shortcuts_menu_item)
+
+        help_menu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+            "Help", None, ""
+        )
+        help_menu_item.setSubmenu_(help_menu)
+        main_menu.addItem_(help_menu_item)
+
+        NSApp.setHelpMenu_(help_menu)
+
+    def add_(self, *_args: Any) -> None:
+        if (not shared.win) or (not (app := shared.win.get_application())):
+            return
+
+        app.lookup_action("add_game").activate()
+
+    def import_(self, *_args: Any) -> None:
+        if (not shared.win) or (not (app := shared.win.get_application())):
+            return
+
+        app.lookup_action("import").activate()
+
+    def hidden_(self, *_args: Any) -> None:
+        if not shared.win:
+            return
+
+        shared.win.lookup_action("show_hidden").activate()
+
+    def shortcuts_(self, *_args: Any) -> None:
+        if (not shared.win) or (not (overlay := shared.win.get_help_overlay())):
+            return
+
+        overlay.present()

cartridges/cartridges.in

@@ -2,7 +2,7 @@
 
 # cartridges.in
 #
-# Copyright 2022-2023 kramo
+# Copyright 2022-2024 kramo
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@ import locale
 import os
 import signal
 import sys
+from pathlib import Path
+from platform import system
 
 VERSION = "@VERSION@"
 
@@ -36,7 +38,7 @@ else:
 sys.path.insert(1, PKGDATADIR)
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-if os.name != "nt":
+if system() == "Linux":
     locale.bindtextdomain("cartridges", LOCALEDIR)
     locale.textdomain("cartridges")
     gettext.install("cartridges", LOCALEDIR)
@@ -44,9 +46,15 @@ else:
     gettext.install("cartridges")
 
 if __name__ == "__main__":
-    from gi.repository import Gio
+    from gi.repository import Gio, GLib
 
-    resource = Gio.Resource.load(os.path.join(PKGDATADIR, "cartridges.gresource"))
+    try:
+        # For a macOS application bundle
+        resource = Gio.Resource.load(
+            str(Path(__file__).parent / "Resources" / "cartridges.gresource")
+        )
+    except GLib.GError:
+        resource = Gio.Resource.load(os.path.join(PKGDATADIR, "cartridges.gresource"))
     resource._register()  # pylint: disable=protected-access
 
     from cartridges import main

cartridges/details_dialog.py

@@ -17,9 +17,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import os
 import shlex
 from pathlib import Path
+from sys import platform
 from time import time
 from typing import Any, Optional
 
@@ -59,8 +59,15 @@ class DetailsDialog(Adw.Dialog):
 
     cover_changed: bool = False
 
+    is_open = False
+
     def __init__(self, game: Optional[Game] = None, **kwargs: Any):
         super().__init__(**kwargs)
+
+        # Make it so only one dialog can be open at a time
+        self.__class__.is_open = True
+        self.connect("closed", lambda *_: self.set_is_open(False))
+
         self.game: Game = game
         self.game_cover: GameCover = GameCover({self.cover})
 
@@ -106,7 +113,7 @@ class DetailsDialog(Adw.Dialog):
         # As in software
         exe_name = _("program")
 
-        if os.name == "nt":
+        if platform == "win32":
             exe_name += ".exe"
             # Translate this string as you would translate "path to {}"
             exe_path = _("C:\\path\\to\\{}").format(exe_name)
@@ -118,7 +125,7 @@ class DetailsDialog(Adw.Dialog):
             exe_path = _("/path/to/{}").format(exe_name)
             # Translate this string as you would translate "path to {}"
             file_path = _("/path/to/{}").format(file_name)
-            command = "xdg-open"
+            command = "open" if platform == "darwin" else "xdg-open"
 
         # pylint: disable=line-too-long
         exec_info_text = _(
@@ -325,3 +332,6 @@ class DetailsDialog(Adw.Dialog):
 
     def choose_cover(self, *_args: Any) -> None:
         self.image_file_dialog.open(self.get_root(), None, self.set_cover)
+
+    def set_is_open(self, is_open: bool) -> None:
+        self.__class__.is_open = is_open

cartridges/importer/heroic_source.py

@@ -355,7 +355,7 @@ class HeroicSource(URLExecutableSource):
     name = _("Heroic")
     iterable_class = HeroicSourceIterable
     url_format = "heroic://launch/{runner}/{app_name}"
-    available_on = {"linux", "win32"}
+    available_on = {"linux", "win32", "darwin"}
 
     locations: HeroicLocations
 
@@ -377,6 +377,7 @@ class HeroicSource(URLExecutableSource):
                     / "config"
                     / "heroic",
                     shared.appdata_dir / "heroic",
+                    shared.app_support_dir / "heroic",
                 ),
                 paths={
                     "config.json": LocationSubPath("config.json"),

cartridges/importer/itch_source.py

@@ -81,7 +81,7 @@ class ItchSource(URLExecutableSource):
     name = _("itch")
     iterable_class = ItchSourceIterable
     url_format = "itch://caves/{cave_id}/launch"
-    available_on = {"linux", "win32"}
+    available_on = {"linux", "win32", "darwin"}
 
     locations: ItchLocations
 
@@ -95,6 +95,7 @@ class ItchSource(URLExecutableSource):
                     shared.config_dir / "itch",
                     shared.host_config_dir / "itch",
                     shared.appdata_dir / "itch",
+                    shared.app_support_dir / "itch",
                 ),
                 paths={
                     "butler.db": LocationSubPath("db/butler.db"),

cartridges/importer/source.py

@@ -125,6 +125,8 @@ class URLExecutableSource(ExecutableFormatSource):
                 return "start " + self.url_format
             case "linux":
                 return "xdg-open " + self.url_format
+            case "darwin":
+                return "open " + self.url_format
             case other:
                 raise NotImplementedError(
                     f"No URL handler command available for {other}"

cartridges/importer/steam_source.py

@@ -112,7 +112,7 @@ class SteamLocations(NamedTuple):
 class SteamSource(URLExecutableSource):
     source_id = "steam"
     name = _("Steam")
-    available_on = {"linux", "win32"}
+    available_on = {"linux", "win32", "darwin"}
     iterable_class = SteamSourceIterable
     url_format = "steam://rungameid/{game_id}"
 
@@ -128,6 +128,7 @@ class SteamSource(URLExecutableSource):
                     shared.data_dir / "Steam",
                     shared.flatpak_dir / "com.valvesoftware.Steam" / "data" / "Steam",
                     shared.programfiles32_dir / "Steam",
+                    shared.app_support_dir / "Steam",
                 ),
                 paths={
                     "libraryfolders.vdf": LocationSubPath(

cartridges/main.py

@@ -24,6 +24,7 @@ import shlex
 import sys
 from time import time
 from typing import Any, Optional
+from urllib.parse import quote
 
 import gi
 
@@ -57,6 +58,12 @@ from cartridges.store.store import Store
 from cartridges.utils.run_executable import run_executable
 from cartridges.window import CartridgesWindow
 
+if sys.platform == "darwin":
+    from AppKit import NSApp  # type: ignore
+    from PyObjCTools import AppHelper
+
+    from cartridges.application_delegate import ApplicationDelegate
+
 
 class CartridgesApplication(Adw.Application):
     state = shared.AppState.DEFAULT
@@ -87,10 +94,24 @@ class CartridgesApplication(Adw.Application):
 
         self.add_main_option_entries((search, launch))
 
+        if sys.platform == "darwin":
+            if settings := Gtk.Settings.get_default():
+                settings.props.gtk_decoration_layout = "close,minimize,maximize:"
+
+            def setup_app_delegate() -> None:
+                NSApp.setDelegate_(ApplicationDelegate.alloc().init())  # type: ignore
+                AppHelper.runEventLoop()  # type: ignore
+
+            GLib.Thread.new(None, setup_app_delegate)
+
     def do_activate(self) -> None:  # pylint: disable=arguments-differ
         """Called on app creation"""
 
-        setup_logging()
+        try:
+            setup_logging()
+        except ValueError:
+            pass
+
         log_system_info()
 
         # Set fallback icon-name
@@ -280,7 +301,7 @@ class CartridgesApplication(Adw.Application):
         _parameter: Any = None,
         page_name: Optional[str] = None,
         expander_row: Optional[str] = None,
-    ) -> CartridgesWindow:
+    ) -> Optional[CartridgesPreferences]:
         if CartridgesPreferences.is_open:
             return
 
@@ -303,6 +324,9 @@ class CartridgesApplication(Adw.Application):
         DetailsDialog(shared.win.active_game).present(shared.win)
 
     def on_add_game_action(self, *_args: Any) -> None:
+        if DetailsDialog.is_open:
+            return
+
         DetailsDialog().present(shared.win)
 
     def on_import_action(self, *_args: Any) -> None:
@@ -345,7 +369,7 @@ class CartridgesApplication(Adw.Application):
             self.on_remove_game_action()
 
     def search(self, uri: str) -> None:
-        Gio.AppInfo.launch_default_for_uri(f"{uri}{shared.win.active_game.name}")
+        Gio.AppInfo.launch_default_for_uri(f"{uri}{quote(shared.win.active_game.name)}")
 
     def on_igdb_search_action(self, *_args: Any) -> None:
         self.search("https://www.igdb.com/search?type=1&q=")
@@ -375,7 +399,7 @@ class CartridgesApplication(Adw.Application):
             if action[1:2]:
                 self.set_accels_for_action(
                     f"app.{action[0]}" if scope == self else f"win.{action[0]}",
-                    action[1],
+                    tuple(s.replace("<primary>", "<meta>") for s in action[1]),
                 )
 
             scope.add_action(simple_action)

cartridges/meson.build

@@ -1,11 +1,11 @@
-moduledir = join_paths(python_dir, 'cartridges')
+moduledir = python_dir / 'cartridges'
 
 configure_file(
   input: 'cartridges.in',
   output: 'cartridges',
   configuration: conf,
   install: true,
-  install_dir: get_option('bindir')
+  install_dir: get_option('bindir'),
 )
 
 install_subdir('importer', install_dir: moduledir)
@@ -15,17 +15,14 @@ install_subdir('logging', install_dir: moduledir)
 install_subdir('errors', install_dir: moduledir)
 install_data(
   [
+    'application_delegate.py',
     'main.py',
     'window.py',
     'preferences.py',
     'details_dialog.py',
     'game.py',
     'game_cover.py',
-    configure_file(
-      input: 'shared.py.in',
-      output: 'shared.py',
-      configuration: conf
-    )
+    configure_file(input: 'shared.py.in', output: 'shared.py', configuration: conf),
   ],
-  install_dir: moduledir
+  install_dir: moduledir,
 )

cartridges/preferences.py

@@ -30,6 +30,7 @@ from cartridges import shared
 from cartridges.errors.friendly_error import FriendlyError
 from cartridges.game import Game
 from cartridges.importer.bottles_source import BottlesSource
+from cartridges.importer.desktop_source import DesktopSource
 from cartridges.importer.flatpak_source import FlatpakSource
 from cartridges.importer.heroic_source import HeroicSource
 from cartridges.importer.itch_source import ItchSource
@@ -169,6 +170,10 @@ class CartridgesPreferences(Adw.PreferencesDialog):
             else:
                 self.init_source_row(source)
 
+        # Special case for the desktop source
+        if not DesktopSource().is_available:
+            self.desktop_switch.set_visible(False)
+
         # SteamGridDB
         def sgdb_key_changed(*_args: Any) -> None:
             shared.schema.set_string("sgdb-key", self.sgdb_key_entry_row.get_text())

cartridges/shared.py.in

@@ -64,6 +64,8 @@ local_appdata_dir = Path(
 )
 programfiles32_dir = Path(getenv("programfiles(x86)") or r"C:\Program Files (x86)")
 
+app_support_dir = home / "Library" / "Application Support"
+
 try:
     scale_factor = max(
         monitor.get_scale_factor()
@@ -79,4 +81,4 @@ win = None
 importer = None
 import_time = None
 store = None
-log_files = None
+log_files = []

cartridges/window.py

@@ -18,8 +18,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from typing import Any, Optional
+from sys import platform
 
-from gi.repository import Adw, Gio, GLib, Gtk
+from gi.repository import Adw, Gio, GLib, Gtk, Pango
 
 from cartridges import shared
 from cartridges.game import Game
@@ -33,6 +34,7 @@ class CartridgesWindow(Adw.ApplicationWindow):
 
     overlay_split_view = Gtk.Template.Child()
     navigation_view = Gtk.Template.Child()
+    sidebar_navigation_page = Gtk.Template.Child()
     sidebar = Gtk.Template.Child()
     all_games_row_box = Gtk.Template.Child()
     all_games_no_label = Gtk.Template.Child()
@@ -152,6 +154,8 @@ class CartridgesWindow(Adw.ApplicationWindow):
                 Gtk.Label(
                     label=self.get_application().get_source_name(source_id),
                     halign=Gtk.Align.START,
+                    wrap=True,
+                    wrap_mode=Pango.WrapMode.CHAR,
                 )
             )
 
@@ -213,6 +217,9 @@ class CartridgesWindow(Adw.ApplicationWindow):
     def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
 
+        if platform == "darwin":
+            self.sidebar_navigation_page.set_title("")
+
         self.details_view.set_measure_overlay(self.details_view_toolbar_view, True)
         self.details_view.set_clip_overlay(self.details_view_toolbar_view, False)
 
@@ -443,6 +450,9 @@ class CartridgesWindow(Adw.ApplicationWindow):
         self.navigation_view.pop_to_page(self.library_page)
 
     def on_show_hidden_action(self, *_args: Any) -> None:
+        if self.navigation_view.get_visible_page() == self.hidden_library_page:
+            return
+
         self.navigation_view.push(self.hidden_library_page)
 
     def on_sort_action(self, action: Gio.SimpleAction, state: GLib.Variant) -> None:

data/gtk/window.blp

@@ -79,7 +79,7 @@ template $CartridgesWindow: Adw.ApplicationWindow {
           sidebar-width-fraction: .2;
 
           [sidebar]
-          Adw.NavigationPage {
+          Adw.NavigationPage sidebar_navigation_page {
             title: _("Cartridges");
 
             Adw.ToolbarView {
@@ -94,6 +94,8 @@ template $CartridgesWindow: Adw.ApplicationWindow {
               }
 
               ScrolledWindow {
+                hscrollbar-policy: never;
+
                 ListBox sidebar {
                   Box all_games_row_box {
                     margin-top: 12;
@@ -109,6 +111,8 @@ template $CartridgesWindow: Adw.ApplicationWindow {
                     Label {
                       halign: start;
                       label: _("All Games");
+                      wrap: true;
+                      wrap-mode: char;
                     }
 
                     Label all_games_no_label {
@@ -135,6 +139,8 @@ template $CartridgesWindow: Adw.ApplicationWindow {
                       halign: start;
                       label: _("Added");
                       margin-end: 6;
+                      wrap: true;
+                      wrap-mode: char;
                     }
 
                     Label added_games_no_label {
@@ -175,15 +181,11 @@ template $CartridgesWindow: Adw.ApplicationWindow {
             [top]
             Adw.HeaderBar header_bar {
               [start]
-              Revealer {
-                transition-type: slide_right;
-                reveal-child: bind overlay_split_view.show-sidebar inverted;
-
-                Button show_sidebar_button {
-                  icon-name: "sidebar-show-symbolic";
-                  action-name: "win.show_sidebar";
-                  tooltip-text: _("Toggle Sidebar");
-                }
+              Button show_sidebar_button {
+                icon-name: "sidebar-show-symbolic";
+                action-name: "win.show_sidebar";
+                tooltip-text: _("Toggle Sidebar");
+                visible: bind overlay_split_view.show-sidebar inverted;
               }
 
               [start]

data/icons/meson.build

@@ -1,11 +1,11 @@
 scalable_dir = join_paths('hicolor', 'scalable', 'apps')
 install_data(
   join_paths(scalable_dir, ('@0@.svg').format(app_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
+  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir),
 )
 
 symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
 install_data(
   join_paths(symbolic_dir, ('@0@-symbolic.svg').format(app_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir)
+  install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir),
 )

data/meson.build

@@ -1,20 +1,28 @@
-blueprints = custom_target('blueprints',
+blueprints = custom_target(
+  'blueprints',
   input: files(
-    'gtk/help-overlay.blp',
-    'gtk/window.blp',
+    'gtk/details-dialog.blp',
     'gtk/game.blp',
+    'gtk/help-overlay.blp',
     'gtk/preferences.blp',
-    'gtk/details-dialog.blp'
+    'gtk/window.blp',
   ),
   output: '.',
-  command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
+  command: [
+    find_program('blueprint-compiler'),
+    'batch-compile',
+    '@OUTPUT@',
+    '@CURRENT_SOURCE_DIR@',
+    '@INPUT@',
+  ],
 )
 
-gnome.compile_resources('cartridges',
+gnome.compile_resources(
+  'cartridges',
   configure_file(
     input: 'cartridges.gresource.xml.in',
     output: 'cartridges.gresource.xml',
-    configuration: conf
+    configuration: conf,
   ),
   gresource_bundle: true,
   install: true,
@@ -22,27 +30,26 @@ gnome.compile_resources('cartridges',
   dependencies: blueprints,
 )
 
-
 if host_machine.system() == 'windows'
   desktop_file = configure_file(
     input: 'page.kramo.Cartridges.desktop.in',
     output: app_id + '.desktop.in',
     configuration: conf,
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'applications')
+    install_dir: join_paths(get_option('datadir'), 'applications'),
   )
 else
   desktop_file = i18n.merge_file(
     input: configure_file(
       input: 'page.kramo.Cartridges.desktop.in',
       output: app_id + '.desktop.in',
-      configuration: conf
+      configuration: conf,
     ),
     output: app_id + '.desktop',
     type: 'desktop',
     po_dir: '../po',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'applications')
+    install_dir: join_paths(get_option('datadir'), 'applications'),
   )
 endif
 
@@ -59,29 +66,30 @@ if host_machine.system() == 'windows'
     output: app_id + '.metainfo.xml',
     configuration: conf,
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo')
+    install_dir: join_paths(get_option('datadir'), 'metainfo'),
   )
 else
   appstream_file = i18n.merge_file(
     input: configure_file(
       input: 'page.kramo.Cartridges.metainfo.xml.in',
       output: app_id + '.metainfo.xml.in',
-      configuration: conf
+      configuration: conf,
     ),
     output: app_id + '.metainfo.xml',
     po_dir: '../po',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo')
+    install_dir: join_paths(get_option('datadir'), 'metainfo'),
   )
 endif
 
 if host_machine.system() != 'windows'
   appstreamcli = find_program('appstreamcli', required: false)
   if appstreamcli.found()
-    test('Validate appstream file',
+    test(
+      'Validate appstream file',
       appstreamcli,
       args: ['validate', '--no-net', '--explain', appstream_file],
-      workdir: meson.current_build_dir()
+      workdir: meson.current_build_dir(),
     )
   endif
 endif
@@ -90,16 +98,18 @@ install_data(
   configure_file(
     input: 'page.kramo.Cartridges.gschema.xml.in',
     output: app_id + '.gschema.xml',
-    configuration: conf
+    configuration: conf,
   ),
-  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas'),
 )
 
 compile_schemas = find_program('glib-compile-schemas', required: false)
 if compile_schemas.found()
-  test('Validate schema file',
-       compile_schemas,
-       args: ['--strict', '--dry-run', meson.current_source_dir()])
+  test(
+    'Validate schema file',
+    compile_schemas,
+    args: ['--strict', '--dry-run', meson.current_source_dir()],
+  )
 endif
 
 subdir('icons')

data/page.kramo.Cartridges.metainfo.xml.in

@@ -54,10 +54,19 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="2.8.5" date="2024-05-25">
+    <release version="2.9.2" date="2024-07-11">
       <description translate="no">
         <ul>
-          <li>Steam runtimes and Proton should stop being imported again</li>
+          <li>Cartridges now utilizes the menu bar on macOS</li>
+          <li>Various bug fixes</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.9" date="2024-07-10">
+      <description translate="no">
+        <ul>
+          <li>Cartridges is now available on macOS! You can download it from GitHub.</li>
+          <li>Updated translations</li>
         </ul>
       </description>
     </release>

docs/game_id.json.md

@@ -35,7 +35,7 @@ Stored as a Unix time stamp.
 
 The executable to run when launching a game.
 
-If the source has a URL handler, using that is preferred. In that case, the value should be `"xdg-open url://example/url"` for Linux and `"start url://example/url"` for Windows.
+If the source has a URL handler, using that is preferred. In that case, the value should be `"xdg-open url://example/url"` for Linux, `"start url://example/url"` for Windows and `"open url://example/url"` for macOS.
 
 Stored as either a string (preferred) or an argument vector to be passed to the shell through [subprocess.Popen](https://docs.python.org/3/library/subprocess.html#popen-constructor).
 
@@ -113,4 +113,4 @@ The version number of the [game_id].json specification.
 
 Cartridges will set the value for itself. Don't touch it.
 
-Stored as a number.
+Stored as a number.

meson.build

@@ -1,7 +1,11 @@
-project('cartridges',
-          version: '2.8.5',
-    meson_version: '>= 0.59.0',
-  default_options: [ 'warning_level=2', 'werror=false', ],
+project(
+  'cartridges',
+  version: '2.9.2',
+  meson_version: '>= 0.59.0',
+  default_options: [
+    'warning_level=2',
+    'werror=false',
+  ],
 )
 
 # Translations are broken on Windows for multiple reasons
@@ -23,7 +27,7 @@ profile = get_option('profile')
 if profile == 'development'
   app_id = 'page.kramo.Cartridges.Devel'
   prefix = '/page/kramo/Cartridges/Devel'
-elif profile ==  'release'
+elif profile == 'release'
   app_id = 'page.kramo.Cartridges'
   prefix = '/page/kramo/Cartridges'
 endif
@@ -44,14 +48,14 @@ subdir('data')
 subdir('cartridges')
 
 if host_machine.system() == 'windows'
-  subdir('windows')
+  subdir('build-aux/windows')
 else
   subdir('search-provider')
   subdir('po')
 endif
 
 gnome.post_install(
-     glib_compile_schemas: true,
-    gtk_update_icon_cache: true,
+  glib_compile_schemas: true,
+  gtk_update_icon_cache: true,
   update_desktop_database: true,
 )

po/cs.po

@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR kramo
 # This file is distributed under the same license as the Cartridges package.
-# foo expert <deferred_water346@simplelogin.com>, 2023.
+# foo expert <deferred_water346@simplelogin.com>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: Cartridges\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-04-14 12:48+0200\n"
-"PO-Revision-Date: 2023-09-24 16:04+0000\n"
+"PO-Revision-Date: 2024-06-28 07:09+0000\n"
 "Last-Translator: foo expert <deferred_water346@simplelogin.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/cartridges/"
 "cartridges/cs/>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 5.1-dev\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: data/page.kramo.Cartridges.desktop.in:3
 #: data/page.kramo.Cartridges.metainfo.xml.in:9
@@ -276,15 +276,13 @@ msgstr "Flatpak"
 
 #. The location of the system-wide data directory
 #: data/gtk/preferences.blp:351
-#, fuzzy
 msgid "System Location"
-msgstr "Nastavit umístění"
+msgstr "Systémové umístění"
 
 #. The location of the user-specific data directory
 #: data/gtk/preferences.blp:369
-#, fuzzy
 msgid "User Location"
-msgstr "Nastavit umístění"
+msgstr "Uživatelské umístění"
 
 #: data/gtk/preferences.blp:386
 msgid "Import Game Launchers"
@@ -323,17 +321,16 @@ msgid "Prefer Animated Images"
 msgstr "Upřednostnit animované obrázky"
 
 #: data/gtk/preferences.blp:433
-#, fuzzy
 msgid "Update Covers"
-msgstr "Odstranit obal"
+msgstr "Aktualizovat obálky"
 
 #: data/gtk/preferences.blp:434
 msgid "Fetch covers for games already in your library"
-msgstr ""
+msgstr "Najít obálky pro hry ve vaší knihovně"
 
 #: data/gtk/preferences.blp:439
 msgid "Update"
-msgstr ""
+msgstr "Aktualizovat"
 
 #: data/gtk/window.blp:6 data/gtk/window.blp:14
 msgid "No Games Found"
@@ -417,15 +414,15 @@ msgstr "O Kazetách"
 
 #: data/gtk/window.blp:561
 msgid "IGDB"
-msgstr ""
+msgstr "IGDB"
 
 #: data/gtk/window.blp:563
 msgid "ProtonDB"
-msgstr ""
+msgstr "ProtonDB"
 
 #: data/gtk/window.blp:565
 msgid "HowLongToBeat"
-msgstr ""
+msgstr "HowLongToBeat"
 
 #. The variable is the title of the game
 #: cartridges/main.py:205 cartridges/game.py:125
@@ -553,11 +550,11 @@ msgstr ""
 
 #: cartridges/preferences.py:196
 msgid "Downloading covers…"
-msgstr ""
+msgstr "Stahování obálek…"
 
 #: cartridges/preferences.py:215
 msgid "Covers updated"
-msgstr ""
+msgstr "Obálky aktualizovány"
 
 #: cartridges/preferences.py:360
 msgid "Installation Not Found"

search-provider/meson.build

@@ -7,19 +7,19 @@ configure_file(
   input: 'cartridges-search-provider.in',
   output: 'cartridges-search-provider',
   configuration: conf,
-  install_dir: libexecdir
+  install_dir: libexecdir,
 )
 
 configure_file(
   input: 'page.kramo.Cartridges.SearchProvider.service.in',
   output: app_id + '.SearchProvider.service',
   configuration: conf,
-  install_dir: service_dir
+  install_dir: service_dir,
 )
 
 configure_file(
   input: 'page.kramo.Cartridges.SearchProvider.ini',
   output: app_id + '.SearchProvider.ini',
   configuration: conf,
-  install_dir: serarch_provider_dir
+  install_dir: serarch_provider_dir,
 )