Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port to AdwSpinner #214

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port to AdwSpinner #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/ui/welcome_page.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ template $WelcomePage : Adw.NavigationPage {
// }

[start]
Spinner spinner {
spinning: false;
Adw.Spinner spinner {
visible: false;
}

[end]
Expand Down
2 changes: 1 addition & 1 deletion flatpak/com.github.tenderowl.frog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id" : "com.github.tenderowl.frog",
"runtime" : "org.gnome.Platform",
"runtime-version" : "46",
"runtime-version" : "47",
"sdk" : "org.gnome.Sdk",
"command" : "frog",
"finish-args" : [
Expand Down
2 changes: 1 addition & 1 deletion frog/widgets/welcome_page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
class WelcomePage(Adw.NavigationPage):
__gtype_name__ = "WelcomePage"

spinner: Gtk.Spinner = Gtk.Template.Child()
spinner: Adw.Spinner = Gtk.Template.Child()
welcome: Adw.StatusPage = Gtk.Template.Child()
lang_combo: Gtk.MenuButton = Gtk.Template.Child()
language_popover: LanguagePopover = Gtk.Template.Child()
Expand Down
11 changes: 5 additions & 6 deletions frog/window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ def on_language_change(self, widget: Gtk.ListBox, row: Gtk.ListBoxRow) -> None:
def get_screenshot(self, copy: bool = False) -> None:
self.extracted_page.listen_cancel()
lang = self.get_language()
# self.welcome_page.spinner.start()
self.hide()
self.backend.capture(lang, copy)

Expand Down Expand Up @@ -178,11 +177,11 @@ def on_shot_done(self, sender, text: str, copy: bool) -> None:

finally:
self.present()
self.welcome_page.spinner.stop()
self.welcome_page.spinner.set_visible(False)

def on_shot_error(self, sender, message: str) -> None:
self.present()
self.welcome_page.spinner.stop()
self.welcome_page.spinner.set_visible(False)
if message:
self.show_toast(message)
# self.display_error(self, message)
Expand All @@ -207,7 +206,7 @@ def on_open_image(self, dialog: Gtk.FileDialog, result: Gio.AsyncResult) -> None
try:
item = dialog.open_finish(result)
lang = self.get_language()
self.welcome_page.spinner.start()
self.welcome_page.spinner.set_visible(True)
GObjectWorker.call(self.backend.decode_image, (lang, item.get_path()))
except GLib.Error as e:
if not e.matches(Gio.io_error_quark(), Gio.IOErrorEnum.CANCELLED):
Expand All @@ -219,7 +218,7 @@ def _on_paste_from_clipboard(
pngbytes = BytesIO(texture.save_to_png_bytes().get_data())
try:
lang = self.get_language()
self.welcome_page.spinner.start()
self.welcome_page.spinner.set_visible(True)
GObjectWorker.call(self.backend.decode_image, (lang, pngbytes))
except GLib.Error as e:
if not e.matches(Gio.io_error_quark(), Gio.IOErrorEnum.CANCELLED):
Expand Down Expand Up @@ -261,7 +260,7 @@ def on_dnd_drop(self, drop_target, value: Gdk.FileList, x: int, y: int) -> None:
return self.show_toast(_("Only images can be processed that way."))

lang = self.get_language()
self.welcome_page.spinner.start()
self.welcome_page.spinner.set_visible(True)
GObjectWorker.call(self.backend.decode_image, (lang, item.get_path()))

def on_configure_event(self, window, event):
Expand Down
Loading