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

BtSender: Provide feedback when transfer blocked #182

Merged
merged 6 commits into from
Oct 27, 2022
Merged

BtSender: Provide feedback when transfer blocked #182

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8313c69
Update BtSender.vala
torikulhabib Oct 25, 2022
c82c489
Update BtSender.vala
torikulhabib Oct 25, 2022
485aa98
Update BtSender.vala
torikulhabib Oct 25, 2022
7a9baf0
Merge branch 'master' into No-feedback
Oct 25, 2022
ff0809a
Merge branch 'master' into No-feedback
Oct 26, 2022
5b2b940
Update BtSender.vala
torikulhabib Oct 27, 2022
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
36 changes: 36 additions & 0 deletions ebt/Dialog/BtSender.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ public class BtSender : Granite.Dialog {
"/org/bluez/obex",
"org.bluez.obex.Client1"
);
path_label.set_markup (GLib.Markup.printf_escaped (_("<b>From</b>: %s"), file_path.get_parent ().get_path ()));
device_label.set_markup (GLib.Markup.printf_escaped (_("<b>To</b>: %s"), device.name));
icon_label.set_from_gicon (new ThemedIcon (device.icon == null? "bluetooth" : device.icon), Gtk.IconSize.LARGE_TOOLBAR);
progress_label.label = _("Try connecting to %s…").printf (device.name);
torikulhabib marked this conversation as resolved.
Show resolved Hide resolved
VariantBuilder builder = new VariantBuilder (VariantType.DICTIONARY);
builder.add ("{sv}", "Target", new Variant.string ("opp"));
Variant parameters = new Variant ("(sa{sv})", device.address, builder);
Expand All @@ -237,6 +241,36 @@ public class BtSender : Granite.Dialog {
);
send_file.begin ();
} catch (Error e) {
hide_on_delete ();
var bt_retry = new Granite.MessageDialog (
_("Connecting to '%s' failed.").printf (device.name),
"%s\n%s".printf (
_("The transfer of '%s' failed.").printf (
file_path.get_basename ()
),
_("The file has not been transferred")
),
new ThemedIcon ("bluetooth"),
Gtk.ButtonsType.NONE
) {
badge_icon = new ThemedIcon ("process-error")
};
bt_retry.add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
var suggested_button = bt_retry.add_button (_("Retry"), Gtk.ResponseType.ACCEPT);
suggested_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);

bt_retry.response.connect ((response_id) => {
if (response_id == Gtk.ResponseType.ACCEPT) {
create_session.begin ();
present ();
} else if (response_id == Gtk.ResponseType.CANCEL) {
torikulhabib marked this conversation as resolved.
Show resolved Hide resolved
destroy ();
}

bt_retry.destroy ();
});
bt_retry.show_all ();
progress_label.label = e.message.split ("org.bluez.obex.Error.Failed:")[1];
GLib.warning (e.message);
}
}
Expand Down Expand Up @@ -293,6 +327,8 @@ public class BtSender : Granite.Dialog {
if (response_id == Gtk.ResponseType.ACCEPT) {
create_session.begin ();
present ();
} else if (response_id == Gtk.ResponseType.CANCEL) {
destroy (); //if canceled should destroy the main dialog
}

bt_retry.destroy ();
Expand Down