Revert "Improve UX for COSMIC"

This reverts commit 239420148a.

Please Stop Theming My App should be focused on distros or packagers theming the apps, shipping them broken, it's not user's fault as they don't know what is going on.
popOS is one of the most used distros, and most of their users are new users that saw them in YouTube, please don't break their experience.

.github/workflows/ci.yml

@@ -73,11 +73,11 @@ jobs:
       - name: Install Dependencies
         run: |
           brew install meson pygobject3 libadwaita adwaita-icon-theme desktop-file-utils pyinstaller pillow
-          pip3 install --break-system-packages requests PyYAML
+          pip3 install --break-system-packages requests PyYAML pyobjc
 
       - name: Meson Build
         run: |
-          meson setup _build
+          meson setup _build -Dtiff_compression=jpeg
           ninja install -C _build
 
       - name: PyInstaller

.github/workflows/publish-release.yml

@@ -38,7 +38,7 @@ jobs:
         run: echo tag_name=${GITHUB_REF#refs/tags/} >> $GITHUB_OUTPUT
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2.0.6
+        uses: softprops/action-gh-release@v2.0.8
         with:
           files: |
             Windows Installer/Cartridges Windows.exe

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/details_dialog.py

@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# pyright: reportAssignmentType=none
+
 import shlex
 from pathlib import Path
 from sys import platform
@@ -40,28 +42,35 @@ from cartridges.utils.save_cover import convert_cover, save_cover
 class DetailsDialog(Adw.Dialog):
     __gtype_name__ = "DetailsDialog"
 
-    cover_overlay = Gtk.Template.Child()
+    cover_overlay: Gtk.Overlay = Gtk.Template.Child()
-    cover = Gtk.Template.Child()
+    cover: Gtk.Picture = Gtk.Template.Child()
-    cover_button_edit = Gtk.Template.Child()
+    cover_button_edit: Gtk.Button = Gtk.Template.Child()
-    cover_button_delete_revealer = Gtk.Template.Child()
+    cover_button_delete_revealer: Gtk.Revealer = Gtk.Template.Child()
-    cover_button_delete = Gtk.Template.Child()
+    cover_button_delete: Gtk.Button = Gtk.Template.Child()
-    spinner = Gtk.Template.Child()
+    spinner: Gtk.Spinner = Gtk.Template.Child()
 
-    name = Gtk.Template.Child()
+    name: Adw.EntryRow = Gtk.Template.Child()
-    developer = Gtk.Template.Child()
+    developer: Adw.EntryRow = Gtk.Template.Child()
-    executable = Gtk.Template.Child()
+    executable: Adw.EntryRow = Gtk.Template.Child()
 
-    exec_info_label = Gtk.Template.Child()
+    exec_info_label: Gtk.Label = Gtk.Template.Child()
-    exec_info_popover = Gtk.Template.Child()
+    exec_info_popover: Gtk.Popover = Gtk.Template.Child()
-    file_chooser_button = Gtk.Template.Child()
+    file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    apply_button = Gtk.Template.Child()
+    apply_button: Gtk.Button = Gtk.Template.Child()
 
     cover_changed: bool = False
 
+    is_open: bool = False
+
     def __init__(self, game: Optional[Game] = None, **kwargs: Any):
         super().__init__(**kwargs)
-        self.game: Game = game
+
+        # 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: Optional[Game] = game
         self.game_cover: GameCover = GameCover({self.cover})
 
         if self.game:
@@ -325,3 +334,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/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
 
@@ -40,7 +41,7 @@ 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.importer import Importer
+from cartridges.importer.importer import Importer  # yo dawg
 from cartridges.importer.itch_source import ItchSource
 from cartridges.importer.legendary_source import LegendarySource
 from cartridges.importer.lutris_source import LutrisSource
@@ -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,8 +94,15 @@ class CartridgesApplication(Adw.Application):
 
         self.add_main_option_entries((search, launch))
 
-        if sys.platform == "darwin" and (settings := Gtk.Settings.get_default()):
+        if sys.platform == "darwin":
-            settings.props.gtk_decoration_layout = "close,minimize,maximize:"
+            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"""
@@ -287,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
 
@@ -310,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:
@@ -352,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=")
@@ -382,7 +399,11 @@ 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]}",
-                    tuple(s.replace("<primary>", "<meta>") for s in action[1]),
+                    (
+                        tuple(s.replace("<primary>", "<meta>") for s in action[1])
+                        if sys.platform == "darwin"
+                        else action[1]
+                    ),
                 )
 
             scope.add_action(simple_action)

cartridges/meson.build

@@ -15,6 +15,7 @@ install_subdir('logging', install_dir: moduledir)
 install_subdir('errors', install_dir: moduledir)
 install_data(
   [
+    'application_delegate.py',
     'main.py',
     'window.py',
     'preferences.py',

cartridges/preferences.py

@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# pyright: reportAssignmentType=none
+
 import logging
 import re
 from pathlib import Path
@@ -48,74 +50,74 @@ from cartridges.utils.create_dialog import create_dialog
 class CartridgesPreferences(Adw.PreferencesDialog):
     __gtype_name__ = "CartridgesPreferences"
 
-    general_page = Gtk.Template.Child()
+    general_page: Adw.PreferencesPage = Gtk.Template.Child()
-    import_page = Gtk.Template.Child()
+    import_page: Adw.PreferencesPage = Gtk.Template.Child()
-    sgdb_page = Gtk.Template.Child()
+    sgdb_page: Adw.PreferencesPage = Gtk.Template.Child()
 
-    sources_group = Gtk.Template.Child()
+    sources_group: Adw.PreferencesGroup = Gtk.Template.Child()
 
-    exit_after_launch_switch = Gtk.Template.Child()
+    exit_after_launch_switch: Adw.SwitchRow = Gtk.Template.Child()
-    cover_launches_game_switch = Gtk.Template.Child()
+    cover_launches_game_switch: Adw.SwitchRow = Gtk.Template.Child()
-    high_quality_images_switch = Gtk.Template.Child()
+    high_quality_images_switch: Adw.SwitchRow = Gtk.Template.Child()
 
-    remove_missing_switch = Gtk.Template.Child()
+    remove_missing_switch: Adw.SwitchRow = Gtk.Template.Child()
 
-    steam_expander_row = Gtk.Template.Child()
+    steam_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    steam_data_action_row = Gtk.Template.Child()
+    steam_data_action_row: Adw.ActionRow = Gtk.Template.Child()
-    steam_data_file_chooser_button = Gtk.Template.Child()
+    steam_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    lutris_expander_row = Gtk.Template.Child()
+    lutris_expander_row: Adw.ExpanderRowClass = Gtk.Template.Child()
-    lutris_data_action_row = Gtk.Template.Child()
+    lutris_data_action_row: Adw.ActionRow = Gtk.Template.Child()
-    lutris_data_file_chooser_button = Gtk.Template.Child()
+    lutris_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
-    lutris_import_steam_switch = Gtk.Template.Child()
+    lutris_import_steam_switch: Adw.SwitchRow = Gtk.Template.Child()
-    lutris_import_flatpak_switch = Gtk.Template.Child()
+    lutris_import_flatpak_switch: Adw.SwitchRow = Gtk.Template.Child()
 
-    heroic_expander_row = Gtk.Template.Child()
+    heroic_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    heroic_config_action_row = Gtk.Template.Child()
+    heroic_config_action_row: Adw.ActionRow = Gtk.Template.Child()
-    heroic_config_file_chooser_button = Gtk.Template.Child()
+    heroic_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
-    heroic_import_epic_switch = Gtk.Template.Child()
+    heroic_import_epic_switch: Adw.SwitchRow = Gtk.Template.Child()
-    heroic_import_gog_switch = Gtk.Template.Child()
+    heroic_import_gog_switch: Adw.SwitchRow = Gtk.Template.Child()
-    heroic_import_amazon_switch = Gtk.Template.Child()
+    heroic_import_amazon_switch: Adw.SwitchRow = Gtk.Template.Child()
-    heroic_import_sideload_switch = Gtk.Template.Child()
+    heroic_import_sideload_switch: Adw.SwitchRow = Gtk.Template.Child()
 
-    bottles_expander_row = Gtk.Template.Child()
+    bottles_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    bottles_data_action_row = Gtk.Template.Child()
+    bottles_data_action_row: Adw.ActionRow = Gtk.Template.Child()
-    bottles_data_file_chooser_button = Gtk.Template.Child()
+    bottles_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    itch_expander_row = Gtk.Template.Child()
+    itch_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    itch_config_action_row = Gtk.Template.Child()
+    itch_config_action_row: Adw.ActionRow = Gtk.Template.Child()
-    itch_config_file_chooser_button = Gtk.Template.Child()
+    itch_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    legendary_expander_row = Gtk.Template.Child()
+    legendary_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    legendary_config_action_row = Gtk.Template.Child()
+    legendary_config_action_row: Adw.ActionRow = Gtk.Template.Child()
-    legendary_config_file_chooser_button = Gtk.Template.Child()
+    legendary_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    retroarch_expander_row = Gtk.Template.Child()
+    retroarch_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    retroarch_config_action_row = Gtk.Template.Child()
+    retroarch_config_action_row: Adw.ActionRow = Gtk.Template.Child()
-    retroarch_config_file_chooser_button = Gtk.Template.Child()
+    retroarch_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    flatpak_expander_row = Gtk.Template.Child()
+    flatpak_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
-    flatpak_system_data_action_row = Gtk.Template.Child()
+    flatpak_system_data_action_row: Adw.ActionRow = Gtk.Template.Child()
-    flatpak_system_data_file_chooser_button = Gtk.Template.Child()
+    flatpak_system_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
-    flatpak_user_data_action_row = Gtk.Template.Child()
+    flatpak_user_data_action_row: Adw.ActionRow = Gtk.Template.Child()
-    flatpak_user_data_file_chooser_button = Gtk.Template.Child()
+    flatpak_user_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
-    flatpak_import_launchers_switch = Gtk.Template.Child()
+    flatpak_import_launchers_switch: Adw.SwitchRow = Gtk.Template.Child()
 
-    desktop_switch = Gtk.Template.Child()
+    desktop_switch: Adw.SwitchRow = Gtk.Template.Child()
 
-    sgdb_key_group = Gtk.Template.Child()
+    sgdb_key_group: Adw.PreferencesGroup = Gtk.Template.Child()
-    sgdb_key_entry_row = Gtk.Template.Child()
+    sgdb_key_entry_row: Adw.EntryRow = Gtk.Template.Child()
-    sgdb_switch = Gtk.Template.Child()
+    sgdb_switch: Adw.SwitchRow = Gtk.Template.Child()
-    sgdb_prefer_switch = Gtk.Template.Child()
+    sgdb_prefer_switch: Adw.SwitchRow = Gtk.Template.Child()
-    sgdb_animated_switch = Gtk.Template.Child()
+    sgdb_animated_switch: Adw.SwitchRow = Gtk.Template.Child()
-    sgdb_fetch_button = Gtk.Template.Child()
+    sgdb_fetch_button: Gtk.Button = Gtk.Template.Child()
-    sgdb_stack = Gtk.Template.Child()
+    sgdb_stack: Gtk.Stack = Gtk.Template.Child()
-    sgdb_spinner = Gtk.Template.Child()
+    sgdb_spinner: Gtk.Spinner = Gtk.Template.Child()
 
-    danger_zone_group = Gtk.Template.Child()
+    danger_zone_group: Adw.PreferencesGroup = Gtk.Template.Child()
-    remove_all_games_list_box = Gtk.Template.Child()
+    remove_all_games_list_box: Gtk.ListBox = Gtk.Template.Child()
-    reset_list_box = Gtk.Template.Child()
+    reset_list_box: Gtk.ListBox = Gtk.Template.Child()
-    reset_group = Gtk.Template.Child()
+    reset_group: Adw.PreferencesGroup = Gtk.Template.Child()
 
     removed_games: set[Game] = set()
     warning_menu_buttons: dict = {}
@@ -280,7 +282,7 @@ class CartridgesPreferences(Adw.PreferencesDialog):
     ) -> None:
         self.file_chooser.select_folder(shared.win, None, callback, callback_data)
 
-    def undo_remove_all(self, *_args: Any) -> None:
+    def undo_remove_all(self, *_args: Any) -> bool:
         shared.win.get_application().state = shared.AppState.UNDO_REMOVE_ALL_GAMES
         for game in self.removed_games:
             game.removed = False
@@ -292,6 +294,8 @@ class CartridgesPreferences(Adw.PreferencesDialog):
         shared.win.get_application().state = shared.AppState.DEFAULT
         shared.win.create_source_rows()
 
+        return True
+
     def remove_all_games(self, *_args: Any) -> None:
         shared.win.get_application().state = shared.AppState.REMOVE_ALL_GAMES
         shared.win.row_selected(None, shared.win.all_games_row_box.get_parent())

cartridges/shared.pyi

@@ -0,0 +1,78 @@
+# shared.pyi
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from pathlib import Path
+from typing import Optional
+
+from gi.repository import Gio
+
+from cartridges.importer.importer import Importer
+from cartridges.store.store import Store
+from cartridges.window import CartridgesWindow
+
+
+class AppState:
+    DEFAULT: int
+    LOAD_FROM_DISK: int
+    IMPORT: int
+    REMOVE_ALL_GAMES: int
+    UNDO_REMOVE_ALL_GAMES: int
+
+
+APP_ID: str
+VERSION: str
+PREFIX: str
+PROFILE: str
+TIFF_COMPRESSION: str
+SPEC_VERSION: float
+
+schema: Gio.Settings
+state_schema: Gio.Settings
+
+home: Path
+
+data_dir: Path
+host_data_dir: Path
+
+config_dir: Path
+host_config_dir: Path
+
+cache_dir: Path
+host_cache_dir: Path
+
+flatpak_dir: Path
+
+games_dir: Path
+covers_dir: Path
+
+appdata_dir: Path
+local_appdata_dir: Path
+programfiles32_dir: Path
+
+app_support_dir: Path
+
+
+scale_factor: int
+image_size: int
+
+win: Optional[CartridgesWindow]
+importer: Optional[Importer]
+import_time: Optional[int]
+store = Optional[Store]
+log_files: list[Path]

cartridges/utils/create_dialog.py

@@ -33,7 +33,7 @@ def create_dialog(
     dialog.add_response("dismiss", _("Dismiss"))
 
     if extra_option:
-        dialog.add_response(extra_option, _(extra_label))
+        dialog.add_response(extra_option, extra_label or "")
 
     dialog.choose(win)
     return dialog

cartridges/window.py

@@ -17,8 +17,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Any, Optional
+# pyright: reportAssignmentType=none
+
 from sys import platform
+from typing import Any, Optional
 
 from gi.repository import Adw, Gio, GLib, Gtk, Pango
 
@@ -32,52 +34,52 @@ from cartridges.utils.relative_date import relative_date
 class CartridgesWindow(Adw.ApplicationWindow):
     __gtype_name__ = "CartridgesWindow"
 
-    overlay_split_view = Gtk.Template.Child()
+    overlay_split_view: Adw.OverlaySplitView = Gtk.Template.Child()
-    navigation_view = Gtk.Template.Child()
+    navigation_view: Adw.NavigationView = Gtk.Template.Child()
-    sidebar_navigation_page = Gtk.Template.Child()
+    sidebar_navigation_page: Adw.NavigationPage = Gtk.Template.Child()
-    sidebar = Gtk.Template.Child()
+    sidebar: Gtk.ListBox = Gtk.Template.Child()
-    all_games_row_box = Gtk.Template.Child()
+    all_games_row_box: Gtk.Box = Gtk.Template.Child()
-    all_games_no_label = Gtk.Template.Child()
+    all_games_no_label: Gtk.Label = Gtk.Template.Child()
-    added_row_box = Gtk.Template.Child()
+    added_row_box: Gtk.Box = Gtk.Template.Child()
-    added_games_no_label = Gtk.Template.Child()
+    added_games_no_label: Gtk.Label = Gtk.Template.Child()
-    toast_overlay = Gtk.Template.Child()
+    toast_overlay: Adw.ToastOverlay = Gtk.Template.Child()
-    primary_menu_button = Gtk.Template.Child()
+    primary_menu_button: Gtk.MenuButton = Gtk.Template.Child()
-    show_sidebar_button = Gtk.Template.Child()
+    show_sidebar_button: Gtk.Button = Gtk.Template.Child()
-    details_view = Gtk.Template.Child()
+    details_view: Gtk.Overlay = Gtk.Template.Child()
-    library_page = Gtk.Template.Child()
+    library_page: Adw.NavigationPage = Gtk.Template.Child()
-    library_view = Gtk.Template.Child()
+    library_view: Adw.ToolbarView = Gtk.Template.Child()
-    library = Gtk.Template.Child()
+    library: Gtk.FlowBox = Gtk.Template.Child()
-    scrolledwindow = Gtk.Template.Child()
+    scrolledwindow: Gtk.ScrolledWindow = Gtk.Template.Child()
-    library_overlay = Gtk.Template.Child()
+    library_overlay: Gtk.Overlay = Gtk.Template.Child()
-    notice_empty = Gtk.Template.Child()
+    notice_empty: Adw.StatusPage = Gtk.Template.Child()
-    notice_no_results = Gtk.Template.Child()
+    notice_no_results: Adw.StatusPage = Gtk.Template.Child()
-    search_bar = Gtk.Template.Child()
+    search_bar: Gtk.SearchBar = Gtk.Template.Child()
-    search_entry = Gtk.Template.Child()
+    search_entry: Gtk.SearchEntry = Gtk.Template.Child()
-    search_button = Gtk.Template.Child()
+    search_button: Gtk.ToggleButton = Gtk.Template.Child()
 
-    details_page = Gtk.Template.Child()
+    details_page: Adw.NavigationPage = Gtk.Template.Child()
-    details_view_toolbar_view = Gtk.Template.Child()
+    details_view_toolbar_view: Adw.ToolbarView = Gtk.Template.Child()
-    details_view_cover = Gtk.Template.Child()
+    details_view_cover: Gtk.Picture = Gtk.Template.Child()
-    details_view_spinner = Gtk.Template.Child()
+    details_view_spinner: Gtk.Spinner = Gtk.Template.Child()
-    details_view_title = Gtk.Template.Child()
+    details_view_title: Gtk.Label = Gtk.Template.Child()
-    details_view_blurred_cover = Gtk.Template.Child()
+    details_view_blurred_cover: Gtk.Picture = Gtk.Template.Child()
-    details_view_play_button = Gtk.Template.Child()
+    details_view_play_button: Gtk.Button = Gtk.Template.Child()
-    details_view_developer = Gtk.Template.Child()
+    details_view_developer: Gtk.Label = Gtk.Template.Child()
-    details_view_added = Gtk.Template.Child()
+    details_view_added: Gtk.ShortcutLabel = Gtk.Template.Child()
-    details_view_last_played = Gtk.Template.Child()
+    details_view_last_played: Gtk.Label = Gtk.Template.Child()
-    details_view_hide_button = Gtk.Template.Child()
+    details_view_hide_button: Gtk.Button = Gtk.Template.Child()
 
-    hidden_library_page = Gtk.Template.Child()
+    hidden_library_page: Adw.NavigationPage = Gtk.Template.Child()
-    hidden_primary_menu_button = Gtk.Template.Child()
+    hidden_primary_menu_button: Gtk.MenuButton = Gtk.Template.Child()
-    hidden_library = Gtk.Template.Child()
+    hidden_library: Gtk.FlowBox = Gtk.Template.Child()
-    hidden_library_view = Gtk.Template.Child()
+    hidden_library_view: Adw.ToolbarView = Gtk.Template.Child()
-    hidden_scrolledwindow = Gtk.Template.Child()
+    hidden_scrolledwindow: Gtk.ScrolledWindow = Gtk.Template.Child()
-    hidden_library_overlay = Gtk.Template.Child()
+    hidden_library_overlay: Gtk.Overlay = Gtk.Template.Child()
-    hidden_notice_empty = Gtk.Template.Child()
+    hidden_notice_empty: Adw.StatusPage = Gtk.Template.Child()
-    hidden_notice_no_results = Gtk.Template.Child()
+    hidden_notice_no_results: Adw.StatusPage = Gtk.Template.Child()
-    hidden_search_bar = Gtk.Template.Child()
+    hidden_search_bar: Gtk.SearchBar = Gtk.Template.Child()
-    hidden_search_entry = Gtk.Template.Child()
+    hidden_search_entry: Gtk.SearchEntry = Gtk.Template.Child()
-    hidden_search_button = Gtk.Template.Child()
+    hidden_search_button: Gtk.ToggleButton = Gtk.Template.Child()
 
     game_covers: dict = {}
     toasts: dict = {}
@@ -450,6 +452,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/page.kramo.Cartridges.metainfo.xml.in

@@ -54,6 +54,13 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="2.9.3" date="2024-07-18">
+      <description translate="no">
+        <ul>
+          <li>Fixed incorrect modifiers being used for keyboard shortcuts</li>
+        </ul>
+      </description>
+    </release>
     <release version="2.9" date="2024-07-10">
       <description translate="no">
         <ul>
@@ -62,13 +69,6 @@
         </ul>
       </description>
     </release>
-    <release version="2.8.5" date="2024-05-25">
-      <description translate="no">
-        <ul>
-          <li>Steam runtimes and Proton should stop being imported again</li>
-        </ul>
-      </description>
-    </release>
     <release version="2.8" date="2024-03-20">
       <description translate="no">
         <ul>

meson.build

@@ -1,6 +1,6 @@
 project(
   'cartridges',
-  version: '2.9',
+  version: '2.9.3',
   meson_version: '>= 0.59.0',
   default_options: [
     'warning_level=2',

po/fa.po

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Cartridges package.
 # سید حسین موسوی فرد <shmf1385@protonmail.com>, 2023.
 # Danial Behzadi <dani.behzi@ubuntu.com>, 2023.
+# آوید <avds+git@disroot.org>, 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-07-14 20:09+0000\n"
-"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
+"Last-Translator: آوید <avds+git@disroot.org>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/cartridges/"
 "cartridges/fa/>\n"
 "Language: fa\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.1-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: data/page.kramo.Cartridges.desktop.in:3
 #: data/page.kramo.Cartridges.metainfo.xml.in:9
@@ -74,7 +75,7 @@ msgstr "لغو"
 
 #: data/gtk/details-dialog.blp:46
 msgid "New Cover"
-msgstr "طرج جلد جدید"
+msgstr "طرح جلد جدید"
 
 #: data/gtk/details-dialog.blp:65
 msgid "Delete Cover"
@@ -98,7 +99,7 @@ msgstr "گزینش پرونده"
 
 #: data/gtk/details-dialog.blp:120
 msgid "More Info"
-msgstr "اطّلاعات بیش‌تر"
+msgstr "اطلاعات بیشتر"
 
 #: data/gtk/game.blp:102 data/gtk/game.blp:110 data/gtk/window.blp:443
 msgid "Edit"
@@ -127,7 +128,7 @@ msgstr "جست‌وجو"
 
 #: data/gtk/help-overlay.blp:24 data/gtk/window.blp:543
 msgid "Keyboard Shortcuts"
-msgstr "میان‌برهیا صفحه‌کلید"
+msgstr "میان‌برهای صفحه‌کلید"
 
 #: data/gtk/help-overlay.blp:29 cartridges/game.py:103
 #: cartridges/preferences.py:134 cartridges/importer/importer.py:394
@@ -182,7 +183,7 @@ msgstr "طرح جلد بازی را اجرا می‌کند"
 
 #: data/gtk/preferences.blp:21
 msgid "Swaps the behavior of the cover image and the play button"
-msgstr "تعویض رفتار تصویر جلد و دکمهٔ بازی کردن"
+msgstr "تغییر رفتار تصویر جلد و دکمهٔ بازی کردن"
 
 #: data/gtk/preferences.blp:26 cartridges/details_dialog.py:82
 msgid "Images"
@@ -194,7 +195,7 @@ msgstr "عکس‌های با کیفیت بالا"
 
 #: data/gtk/preferences.blp:30
 msgid "Save game covers losslessly at the cost of storage"
-msgstr "ذخیرهٔ طرح جلدهای بدون اتلاف به فیمت ذخیره‌سازی"
+msgstr "ذخیرهٔ طرح جلدهای بدون اتلاف به قیمت ذخیره‌سازی"
 
 #: data/gtk/preferences.blp:35
 msgid "Danger Zone"
@@ -206,7 +207,7 @@ msgstr "حذف کردن همهٔ بازی‌ها"
 
 #: data/gtk/preferences.blp:120
 msgid "Remove Uninstalled Games"
-msgstr "برداشن بازی‌های نصب نشده"
+msgstr "برداشتن بازی‌های نصب‌نشده"
 
 #: data/gtk/preferences.blp:125
 msgid "Sources"
@@ -254,7 +255,7 @@ msgstr "درون‌ریزی بازی‌های آمازون"
 
 #: data/gtk/preferences.blp:228
 msgid "Import Sideloaded Games"
-msgstr "درون‌ریزی بازی‌های نصب شده"
+msgstr "درون‌ریزی بازی‌های نصب‌شده"
 
 #: data/gtk/preferences.blp:233 cartridges/importer/bottles_source.py:86
 msgid "Bottles"
@@ -278,15 +279,13 @@ msgstr "فلت‌پک"
 
 #. The location of the system-wide data directory
 #: data/gtk/preferences.blp:351
-#, fuzzy
 msgid "System Location"
-msgstr "تنظیم مکان"
+msgstr "مکان سامانه"
 
 #. The location of the user-specific data directory
 #: data/gtk/preferences.blp:369
-#, fuzzy
 msgid "User Location"
-msgstr "تنظیم مکان"
+msgstr "مکان کاربر"
 
 #: data/gtk/preferences.blp:386
 msgid "Import Game Launchers"
@@ -322,20 +321,19 @@ msgstr "ترجیح به تصویرهای رسمی"
 
 #: data/gtk/preferences.blp:427
 msgid "Prefer Animated Images"
-msgstr "ترچیح تصویرهای پویا"
+msgstr "ترجیح تصویرهای پویا"
 
 #: data/gtk/preferences.blp:433
-#, fuzzy
 msgid "Update Covers"
-msgstr "حذف طرح جلد"
+msgstr "به‌روزرسانی طرح جلد"
 
 #: data/gtk/preferences.blp:434
 msgid "Fetch covers for games already in your library"
-msgstr ""
+msgstr "دریافت طرح جلد بازی‌های کنونی کتاب‌خانه‌تان"
 
 #: data/gtk/preferences.blp:439
 msgid "Update"
-msgstr ""
+msgstr "به‌روزرسانی"
 
 #: data/gtk/window.blp:6 data/gtk/window.blp:14
 msgid "No Games Found"
@@ -359,7 +357,7 @@ msgstr "بدون بازی نهفته"
 
 #: data/gtk/window.blp:41
 msgid "Games you hide will appear here"
-msgstr "بازی‌هایی که پنهان می‌کنید، این‌جا ظاهر خواهند شد"
+msgstr "بازی‌هایی که پنهان می‌کنید، این‌جا نمایان خواهند شد"
 
 #: data/gtk/window.blp:76 data/gtk/window.blp:111 cartridges/main.py:228
 msgid "All Games"
@@ -407,7 +405,7 @@ msgstr "قدیمی‌ترین"
 
 #: data/gtk/window.blp:528
 msgid "Last Played"
-msgstr "آخرین بازی شده"
+msgstr "آخرین بازی‌شده"
 
 #: data/gtk/window.blp:535
 msgid "Show Hidden"
@@ -419,15 +417,15 @@ msgstr "دربارهٔ کارتریج‌ها"
 
 #: 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
@@ -451,7 +449,7 @@ msgstr "هرگز"
 #. The variable is the date when the game was last played
 #: cartridges/window.py:380
 msgid "Last played: {}"
-msgstr "آخرین بازی شده: {}"
+msgstr "آخرین بازی‌شده: {}"
 
 #: cartridges/details_dialog.py:73
 msgid "Apply"
@@ -505,7 +503,7 @@ msgstr ""
 "\n"
 "<tt>\"{}\"</tt>\n"
 "\n"
-"برای گشودن پروندهٔ {}‌با برنامهٔ پیش‌گزیده:\n"
+"برای گشودن پروندهٔ {}‌ با برنامهٔ پیش‌گزیده:\n"
 "\n"
 "<tt>{} \"{}\"</tt>\n"
 "\n"
@@ -530,7 +528,7 @@ msgstr "نتوانست ترجیحات را اعمال کند"
 #. The variable is the title of the game
 #: cartridges/game.py:139
 msgid "{} hidden"
-msgstr "{}‌نهفته"
+msgstr "{}‌ نهفته"
 
 #: cartridges/game.py:139
 msgid "{} unhidden"
@@ -555,11 +553,11 @@ msgstr ""
 
 #: cartridges/preferences.py:196
 msgid "Downloading covers…"
-msgstr ""
+msgstr "در حال دریافت طرح‌های جلد…"
 
 #: cartridges/preferences.py:215
 msgid "Covers updated"
-msgstr ""
+msgstr "طرح‌های جلد به‌روزرسانی شد"
 
 #: cartridges/preferences.py:360
 msgid "Installation Not Found"
@@ -599,7 +597,7 @@ msgstr "هیچ بازی جدیدی پیدا نشد"
 
 #: cartridges/importer/importer.py:379
 msgid "1 game imported"
-msgstr "۱ بازی درون‌ریخته شد"
+msgstr "یک بازی درون‌ریخته شد"
 
 #. The variable is the number of games
 #: cartridges/importer/importer.py:383

pyrightconfig.json

@@ -0,0 +1,4 @@
+{
+  "reportRedeclaration": "none",
+  "reportMissingModuleSource": "none"
+}