From 8a8b0525b41ac1108dde3afe46ff823e9757b0dd Mon Sep 17 00:00:00 2001 From: kramo Date: Wed, 18 Sep 2024 16:47:37 +0200 Subject: [PATCH] Use Adw.Spinner --- cartridges/details_dialog.py | 4 ++-- cartridges/game.py | 2 +- cartridges/preferences.py | 6 +++--- cartridges/window.py | 4 ++-- data/gtk/details-dialog.blp | 5 ++--- data/gtk/game.blp | 5 ++--- data/gtk/preferences.blp | 3 ++- data/gtk/window.blp | 5 ++--- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/cartridges/details_dialog.py b/cartridges/details_dialog.py index a31837b..a09ea0a 100644 --- a/cartridges/details_dialog.py +++ b/cartridges/details_dialog.py @@ -47,7 +47,7 @@ class DetailsDialog(Adw.Dialog): cover_button_edit: Gtk.Button = Gtk.Template.Child() cover_button_delete_revealer: Gtk.Revealer = Gtk.Template.Child() cover_button_delete: Gtk.Button = Gtk.Template.Child() - spinner: Gtk.Spinner = Gtk.Template.Child() + spinner: Adw.Spinner = Gtk.Template.Child() name: Adw.EntryRow = Gtk.Template.Child() developer: Adw.EntryRow = Gtk.Template.Child() @@ -285,7 +285,7 @@ class DetailsDialog(Adw.Dialog): def toggle_loading(self) -> None: self.apply_button.set_sensitive(not self.apply_button.get_sensitive()) - self.spinner.set_spinning(not self.spinner.get_spinning()) + self.spinner.set_visible(not self.spinner.get_spinning()) self.cover_overlay.set_opacity(not self.cover_overlay.get_opacity()) def set_cover(self, _source: Any, result: Gio.Task, *_args: Any) -> None: diff --git a/cartridges/game.py b/cartridges/game.py index dc48d32..43d4d94 100644 --- a/cartridges/game.py +++ b/cartridges/game.py @@ -157,7 +157,7 @@ class Game(Gtk.Box): loading = self.loading > 0 self.cover.set_opacity(int(not loading)) - self.spinner.set_spinning(loading) + self.spinner.set_visible(loading) def get_cover_path(self) -> Optional[Path]: cover_path = shared.covers_dir / f"{self.game_id}.gif" diff --git a/cartridges/preferences.py b/cartridges/preferences.py index 857efc6..3b23521 100644 --- a/cartridges/preferences.py +++ b/cartridges/preferences.py @@ -112,7 +112,7 @@ class CartridgesPreferences(Adw.PreferencesDialog): sgdb_animated_switch: Adw.SwitchRow = Gtk.Template.Child() sgdb_fetch_button: Gtk.Button = Gtk.Template.Child() sgdb_stack: Gtk.Stack = Gtk.Template.Child() - sgdb_spinner: Gtk.Spinner = Gtk.Template.Child() + sgdb_spinner: Adw.Spinner = Gtk.Template.Child() danger_zone_group = Gtk.Template.Child() remove_all_games_button_row = Gtk.Template.Child() @@ -196,7 +196,7 @@ class CartridgesPreferences(Adw.PreferencesDialog): sgdb_manager = shared.store.managers[SgdbManager] sgdb_manager.reset_cancellable() - self.sgdb_spinner.set_spinning(True) + self.sgdb_spinner.set_visible(True) self.sgdb_stack.set_visible_child(self.sgdb_spinner) self.add_toast(download_toast := Adw.Toast.new(_("Downloading covers…"))) @@ -223,7 +223,7 @@ class CartridgesPreferences(Adw.PreferencesDialog): download_toast.dismiss() self.add_toast(toast) - self.sgdb_spinner.set_spinning(False) + self.sgdb_spinner.set_visible(False) self.sgdb_stack.set_visible_child(self.sgdb_fetch_button) for game in shared.store: diff --git a/cartridges/window.py b/cartridges/window.py index 4adebc1..082b3d7 100644 --- a/cartridges/window.py +++ b/cartridges/window.py @@ -60,7 +60,7 @@ class CartridgesWindow(Adw.ApplicationWindow): details_page: Adw.NavigationPage = Gtk.Template.Child() details_view_toolbar_view: Adw.ToolbarView = Gtk.Template.Child() details_view_cover: Gtk.Picture = Gtk.Template.Child() - details_view_spinner: Gtk.Spinner = Gtk.Template.Child() + details_view_spinner: Adw.Spinner = Gtk.Template.Child() details_view_title: Gtk.Label = Gtk.Template.Child() details_view_blurred_cover: Gtk.Picture = Gtk.Template.Child() details_view_play_button: Gtk.Button = Gtk.Template.Child() @@ -351,7 +351,7 @@ class CartridgesWindow(Adw.ApplicationWindow): self.active_game = game self.details_view_cover.set_opacity(int(not game.loading)) - self.details_view_spinner.set_spinning(game.loading) + self.details_view_spinner.set_visible(game.loading) self.details_view_developer.set_label(game.developer or "") self.details_view_developer.set_visible(bool(game.developer)) diff --git a/data/gtk/details-dialog.blp b/data/gtk/details-dialog.blp index a5a5cc8..f99de2d 100644 --- a/data/gtk/details-dialog.blp +++ b/data/gtk/details-dialog.blp @@ -31,9 +31,8 @@ template $DetailsDialog: Adw.Dialog { Overlay { [overlay] - Spinner spinner { - margin-start: 72; - margin-end: 72; + Adw.Spinner spinner { + visible: false; } Overlay cover_overlay { diff --git a/data/gtk/game.blp b/data/gtk/game.blp index 204fb63..8aa2375 100644 --- a/data/gtk/game.blp +++ b/data/gtk/game.blp @@ -64,9 +64,8 @@ template $Game: Box { Overlay { [overlay] - Spinner spinner { - margin-start: 72; - margin-end: 72; + Adw.Spinner spinner { + visible: false; } Picture cover { diff --git a/data/gtk/preferences.blp b/data/gtk/preferences.blp index 27c03c1..ebc8309 100644 --- a/data/gtk/preferences.blp +++ b/data/gtk/preferences.blp @@ -386,7 +386,8 @@ template $CartridgesPreferences: Adw.PreferencesDialog { valign: center; } - Spinner sgdb_spinner { + Adw.Spinner sgdb_spinner { + visible: false; valign: center; } } diff --git a/data/gtk/window.blp b/data/gtk/window.blp index 47b66cd..93cc02b 100644 --- a/data/gtk/window.blp +++ b/data/gtk/window.blp @@ -341,9 +341,8 @@ Adw.NavigationPage details_page { Overlay { [overlay] - Spinner details_view_spinner { - margin-start: 72; - margin-end: 72; + Adw.Spinner details_view_spinner { + visible: false; } Picture details_view_cover {