Port to libadwaita 1.5 widgets

cartridges/details_dialog.py

@@ -36,9 +36,9 @@ from cartridges.utils.create_dialog import create_dialog
 from cartridges.utils.save_cover import convert_cover, save_cover
 
 
-@Gtk.Template(resource_path=shared.PREFIX + "/gtk/details-window.ui")
+@Gtk.Template(resource_path=shared.PREFIX + "/gtk/details-dialog.ui")
-class DetailsWindow(Adw.Window):
+class DetailsDialog(Adw.Dialog):
-    __gtype_name__ = "DetailsWindow"
+    __gtype_name__ = "DetailsDialog"
 
     cover_overlay = Gtk.Template.Child()
     cover = Gtk.Template.Child()
@@ -61,12 +61,9 @@ class DetailsWindow(Adw.Window):
 
     def __init__(self, game: Optional[Game] = None, **kwargs: Any):
         super().__init__(**kwargs)
-
         self.game: Game = game
         self.game_cover: GameCover = GameCover({self.cover})
 
-        self.set_transient_for(shared.win)
-
         if self.game:
             self.set_title(_("Game Details"))
             self.name.set_text(self.game.name)
@@ -152,7 +149,6 @@ class DetailsWindow(Adw.Window):
         self.executable.connect("entry-activated", self.apply_preferences)
 
         self.set_focus(self.name)
-        self.present()
 
     def delete_pixbuf(self, *_args: Any) -> None:
         self.game_cover.new_cover()

cartridges/importer/importer.py

@@ -407,7 +407,7 @@ class Importer(ErrorProducer):
         self,
         page_name: Optional[str] = None,
         expander_row: Optional[Adw.ExpanderRow] = None,
-    ) -> Adw.PreferencesWindow:
+    ) -> Adw.PreferencesDialog:
         return shared.win.get_application().on_preferences_action(
             page_name=page_name, expander_row=expander_row
         )

cartridges/main.py

@@ -34,7 +34,7 @@ gi.require_version("Adw", "1")
 from gi.repository import Adw, Gio, GLib, Gtk
 
 from cartridges import shared
-from cartridges.details_window import DetailsWindow
+from cartridges.details_dialog import DetailsDialog
 from cartridges.game import Game
 from cartridges.importer.bottles_source import BottlesSource
 from cartridges.importer.desktop_source import DesktopSource
@@ -47,7 +47,7 @@ from cartridges.importer.lutris_source import LutrisSource
 from cartridges.importer.retroarch_source import RetroarchSource
 from cartridges.importer.steam_source import SteamSource
 from cartridges.logging.setup import log_system_info, setup_logging
-from cartridges.preferences import PreferencesWindow
+from cartridges.preferences import CartridgesPreferences
 from cartridges.store.managers.cover_manager import CoverManager
 from cartridges.store.managers.display_manager import DisplayManager
 from cartridges.store.managers.file_manager import FileManager
@@ -246,10 +246,9 @@ class CartridgesApplication(Adw.Application):
             debug_str += log_file.read()
             log_file.close()
 
-        about = Adw.AboutWindow.new_from_appdata(
+        about = Adw.AboutDialog.new_from_appdata(
             shared.PREFIX + "/" + shared.APP_ID + ".metainfo.xml", shared.VERSION
         )
-        about.set_transient_for(shared.win)
         about.set_developers(
             (
                 "kramo https://kramo.hu",
@@ -275,7 +274,7 @@ class CartridgesApplication(Adw.Application):
             Gtk.License.CUSTOM,
             "Steam and the Steam logo are trademarks and/or registered trademarks of Valve Corporation in the U.S. and/or other countries.",  # pylint: disable=line-too-long
         )
-        about.present()
+        about.present(shared.win)
 
     def on_preferences_action(
         self,
@@ -284,12 +283,12 @@ class CartridgesApplication(Adw.Application):
         page_name: Optional[str] = None,
         expander_row: Optional[str] = None,
     ) -> CartridgesWindow:
-        win = PreferencesWindow()
+        win = CartridgesPreferences()
         if page_name:
             win.set_visible_page_name(page_name)
         if expander_row:
             getattr(win, expander_row).set_expanded(True)
-        win.present()
+        win.present(shared.win)
 
         return win
 
@@ -300,10 +299,10 @@ class CartridgesApplication(Adw.Application):
         shared.win.active_game.toggle_hidden()
 
     def on_edit_game_action(self, *_args: Any) -> None:
-        DetailsWindow(shared.win.active_game)
+        DetailsDialog(shared.win.active_game).present(shared.win)
 
     def on_add_game_action(self, *_args: Any) -> None:
-        DetailsWindow()
+        DetailsDialog().present(shared.win)
 
     def on_import_action(self, *_args: Any) -> None:
         shared.importer = Importer()

cartridges/meson.build

@@ -18,7 +18,7 @@ install_data(
     'main.py',
     'window.py',
     'preferences.py',
-    'details_window.py',
+    'details_dialog.py',
     'game.py',
     'game_cover.py',
     configure_file(
@@ -28,4 +28,4 @@ install_data(
     )
   ],
   install_dir: moduledir
-)
+)

cartridges/preferences.py

@@ -43,8 +43,8 @@ from cartridges.utils.create_dialog import create_dialog
 
 
 @Gtk.Template(resource_path=shared.PREFIX + "/gtk/preferences.ui")
-class PreferencesWindow(Adw.PreferencesWindow):
+class CartridgesPreferences(Adw.PreferencesDialog):
-    __gtype_name__ = "PreferencesWindow"
+    __gtype_name__ = "CartridgesPreferences"
 
     general_page = Gtk.Template.Child()
     import_page = Gtk.Template.Child()
@@ -123,7 +123,6 @@ class PreferencesWindow(Adw.PreferencesWindow):
     def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.file_chooser = Gtk.FileDialog()
-        self.set_transient_for(shared.win)
 
         self.toast = Adw.Toast.new(_("All games removed"))
         self.toast.set_button_label(_("Undo"))

data/cartridges.gresource.xml.in

@@ -6,7 +6,7 @@
     <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
     <file preprocess="xml-stripblanks">gtk/game.ui</file>
     <file preprocess="xml-stripblanks">gtk/preferences.ui</file>
-    <file preprocess="xml-stripblanks">gtk/details-window.ui</file>
+    <file preprocess="xml-stripblanks">gtk/details-dialog.ui</file>
     <file alias="style.css">gtk/style.css</file>
     <file alias="style-dark.css">gtk/style-dark.css</file>
     <file>library_placeholder.svg</file>

data/gtk/details-dialog.blp

@@ -1,17 +1,8 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $DetailsWindow : Adw.Window {
+template $DetailsDialog : Adw.Dialog {
-    default-width: 480; // Same as Nautilus' properties window
+    content-width: 480;
-    default-height: -1;
-    modal: true;
-
-    ShortcutController {
-        Shortcut {
-            trigger: "Escape";
-            action: "action(window.close)";
-        }
-    }
 
     Adw.ToolbarView {
 
@@ -85,7 +76,7 @@ template $DetailsWindow : Adw.Window {
                             Picture cover {
                                 width-request: 200;
                                 height-request: 300;
-                                
+
                                 styles [
                                     "card"
                                 ]
@@ -149,4 +140,4 @@ template $DetailsWindow : Adw.Window {
             }
         }
     }
-}
+}

data/gtk/preferences.blp

@@ -1,7 +1,8 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $PreferencesWindow : Adw.PreferencesWindow {
+template $CartridgesPreferences : Adw.PreferencesDialog {
+  search-enabled: true;
 
   Adw.PreferencesPage general_page {
     name: "general";

data/gtk/window.blp

@@ -45,7 +45,7 @@ Adw.StatusPage hidden_notice_empty {
 
 template $CartridgesWindow : Adw.ApplicationWindow {
   title: _("Cartridges");
-  width-request: 281;
+  width-request: 360;
   height-request: 100;
 
   Adw.Breakpoint {
@@ -75,6 +75,8 @@ template $CartridgesWindow : Adw.ApplicationWindow {
           title: _("All Games");
 
           Adw.OverlaySplitView overlay_split_view {
+            sidebar-width-fraction: .2;
+
             [sidebar]
             Adw.NavigationPage {
               title: _("Cartridges");

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

@@ -28,7 +28,7 @@
     <control>touch</control>
   </supports>
   <recommends>
-    <display_length compare="gt">280</display_length>
+    <display_length compare="ge">360</display_length>
   </recommends>
   <screenshots>
     <screenshot type="default">

data/meson.build

@@ -4,7 +4,7 @@ blueprints = custom_target('blueprints',
     'gtk/window.blp',
     'gtk/game.blp',
     'gtk/preferences.blp',
-    'gtk/details-window.blp'
+    'gtk/details-dialog.blp'
   ),
   output: '.',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],

flatpak/hu.kramo.Cartridges.Devel.json

@@ -1,7 +1,7 @@
 {
     "id" : "hu.kramo.Cartridges.Devel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "45",
+    "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "command" : "cartridges",
     "finish-args" : [