v2.8.1

Port to Libadwaita 1.5 widgets

.github/workflows/ci.yml

@@ -22,39 +22,39 @@ jobs:
         bundle: hu.kramo.Cartridges.Devel.flatpak
         manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
 
-  windows:
+  # windows:
-    name: Windows
+  #   name: Windows
-    runs-on: windows-latest
+  #   runs-on: windows-latest
-    steps:
+  #   steps:
-      - name: Checkout
+  #     - name: Checkout
-        uses: actions/checkout@v4
+  #       uses: actions/checkout@v4
 
-      - name: Setup MSYS2
+  #     - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+  #       uses: msys2/setup-msys2@v2
-        with:
+  #       with:
-          msystem: UCRT64
+  #         msystem: UCRT64
-          update: true
+  #         update: true
-          install: mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-python-gobject mingw-w64-ucrt-x86_64-python-yaml mingw-w64-ucrt-x86_64-python-requests mingw-w64-ucrt-x86_64-python-pillow mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-meson git
+  #         install: mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-python-gobject mingw-w64-ucrt-x86_64-python-yaml mingw-w64-ucrt-x86_64-python-requests mingw-w64-ucrt-x86_64-python-pillow mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-meson git
 
-      - name: Compile
+  #     - name: Compile
-        shell: msys2 {0}
+  #       shell: msys2 {0}
-        run: |
+  #       run: |
-          meson setup _build
+  #         meson setup _build
-          ninja -C _build install
+  #         ninja -C _build install
-          pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
+  #         pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
-          find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
+  #         find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
 
-      - name: Test
+  #     - name: Test
-        shell: msys2 {0}
+  #       shell: msys2 {0}
-        run: |
+  #       run: |
-          set +e
+  #         set +e
-          timeout 2 cartridges; [ "$?" -eq "124" ]
+  #         timeout 2 cartridges; [ "$?" -eq "124" ]
 
-      - name: Inno Setup
+  #     - name: Inno Setup
-        run: iscc ".\_build\windows\Cartridges.iss"
+  #       run: iscc ".\_build\windows\Cartridges.iss"
 
-      - name: Upload Artifact
+  #     - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+  #       uses: actions/upload-artifact@v3
-        with:
+  #       with:
-          name: Windows Installer
+  #         name: Windows Installer
-          path: _build/windows/Output/Cartridges Setup.exe
+  #         path: _build/windows/Output/Cartridges Setup.exe

.github/workflows/publish-release.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Publish release
         uses: softprops/action-gh-release@v0.1.15
         with:
-          files: Windows Installer/Cartridges Setup.exe
+          # files: Windows Installer/Cartridges Setup.exe
-          fail_on_unmatched_files: true
+          # fail_on_unmatched_files: true
           tag_name: ${{ steps.get_tag_name.outputs.tag_name }}
-          body_path: release_notes
+          body_path: release_notes

cartridges/details_dialog.py

@@ -1,6 +1,6 @@
 # details_window.py
 #
-# 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
@@ -321,7 +321,7 @@ class DetailsDialog(Adw.Dialog):
         self.executable.set_text(shlex.quote(path))
 
     def choose_executable(self, *_args: Any) -> None:
-        self.exec_file_dialog.open(self, None, self.set_executable)
+        self.exec_file_dialog.open(self.get_root(), None, self.set_executable)
 
     def choose_cover(self, *_args: Any) -> None:
-        self.image_file_dialog.open(self, None, self.set_cover)
+        self.image_file_dialog.open(self.get_root(), None, self.set_cover)

cartridges/importer/lutris_source.py

@@ -1,6 +1,6 @@
 # lutris_source.py
 #
-# Copyright 2022-2023 kramo
+# Copyright 2022-2024 kramo
 # Copyright 2023 Geoffrey Coulaud
 #
 # This program is free software: you can redistribute it and/or modify
@@ -54,6 +54,9 @@ class LutrisSourceIterable(SourceIterable):
         db_path = copy_db(self.source.locations.data["pga.db"])
         connection = connect(db_path)
         cursor = connection.execute(request, params)
+        coverart_is_dir = (
+            coverart_path := self.source.locations.data.root / "coverart"
+        ).is_dir()
 
         # Create games from the DB results
         for row in cursor:
@@ -69,10 +72,12 @@ class LutrisSourceIterable(SourceIterable):
                 "executable": self.source.make_executable(game_id=row[0]),
             }
             game = Game(values)
+            additional_data = {}
 
             # Get official image path
-            image_path = self.source.locations.data["coverart"] / f"{row[2]}.jpg"
+            if coverart_is_dir:
-            additional_data = {"local_image_path": image_path}
+                image_path = coverart_path / f"{row[2]}.jpg"
+                additional_data["local_image_path"] = image_path
 
             yield (game, additional_data)
 
@@ -111,7 +116,6 @@ class LutrisSource(URLExecutableSource):
                 ),
                 paths={
                     "pga.db": LocationSubPath("pga.db"),
-                    "coverart": LocationSubPath("coverart", True),
                 },
                 invalid_subtitle=Location.DATA_INVALID_SUBTITLE,
             )

cartridges/main.py

@@ -1,6 +1,6 @@
 # main.py
 #
-# 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
@@ -262,7 +262,7 @@ class CartridgesApplication(Adw.Application):
             )
         )
         about.set_designers(("kramo https://kramo.page",))
-        about.set_copyright("© 2022-2023 kramo")
+        about.set_copyright("© 2022-2024 kramo")
         # Translators: Replace this with your name for it to show up in the about window
         about.set_translator_credits = (_("translator_credits"),)
         about.set_debug_info(debug_str)

data/gtk/window.blp

@@ -268,11 +268,6 @@ Adw.NavigationPage hidden_library_page {
         SearchEntry hidden_search_entry {
           placeholder-text: _("Search");
           hexpand: true;
-
-          Shortcut {
-            trigger: "Escape";
-            action: "action(win.toggle_search)";
-          }
         }
       }
     }

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

@@ -53,10 +53,18 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="2.7.4" date="2024-03-06">
+    <release version="2.8.1" date="2024-03-23">
       <description translatable="no">
         <ul>
-          <li>Updated the app's metadata</li>
+          <li>Fixes an issue with Lutris games not importing</li>
+          <li>Fixes an issue with file chooser buttons being unresponsive</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.8" date="2024-03-20">
+      <description translatable="no">
+        <ul>
+          <li>The app features new adaptive widgets taking advantage of developments in GNOME 46</li>
         </ul>
       </description>
     </release>

meson.build

@@ -1,5 +1,5 @@
 project('cartridges',
-          version: '2.7.4',
+          version: '2.8.1',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )