toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move refresh

Browse Source
This commit is contained in:
Zander Brown 2018-05-19 22:11:44 +01:00
parent ac6ac42860
commit 095dd73c52
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hammond-gtk/resources/gtk/headerbar.ui
View File

@ -313,6 +313,7 @@ Tobias Bernard
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="text" translatable="yes">Check for new episodes</property> <property name="text" translatable="yes">Check for new episodes</property>
<property name="action-name">app.refresh</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

10
hammond-gtk/src/app.rs
View File

@ -81,6 +81,16 @@ impl App {
// Ideally a lot more than actions would happen in startup & window // Ideally a lot more than actions would happen in startup & window
// creation would be in activate // creation would be in activate
application.connect_startup(clone!(window, sender => move |app| { application.connect_startup(clone!(window, sender => move |app| {
let refresh = SimpleAction::new("refresh", None);
refresh.connect_activate(clone!(sender => move |_, _| {
gtk::idle_add(clone!(sender => move || {
let s: Option<Vec<_>> = None;
utils::refresh(s, sender.clone());
glib::Continue(false)
}));
}));
app.add_action(&refresh);
let import = SimpleAction::new("import", None); let import = SimpleAction::new("import", None);
import.connect_activate(clone!(window, sender => move |_, _| on_import_clicked(&window, &sender))); import.connect_activate(clone!(window, sender => move |_, _| on_import_clicked(&window, &sender)));
app.add_action(&import); app.add_action(&import);

12
hammond-gtk/src/headerbar.rs
View File

@ -23,7 +23,6 @@ pub struct Header {
back: gtk::Button, back: gtk::Button,
show_title: gtk::Label, show_title: gtk::Label,
export: gtk::ModelButton, export: gtk::ModelButton,
update_button: gtk::ModelButton,
update_box: gtk::Box, update_box: gtk::Box,
update_label: gtk::Label, update_label: gtk::Label,
update_spinner: gtk::Spinner, update_spinner: gtk::Spinner,
@ -39,7 +38,6 @@ impl Default for Header {
let back = builder.get_object("back").unwrap(); let back = builder.get_object("back").unwrap();
let show_title = builder.get_object("show_title").unwrap(); let show_title = builder.get_object("show_title").unwrap();
let export = builder.get_object("export").unwrap(); let export = builder.get_object("export").unwrap();
let update_button = builder.get_object("update_button").unwrap();
let update_box = builder.get_object("update_notification").unwrap(); let update_box = builder.get_object("update_notification").unwrap();
let update_label = builder.get_object("update_label").unwrap(); let update_label = builder.get_object("update_label").unwrap();
let update_spinner = builder.get_object("update_spinner").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap();
@ -51,7 +49,6 @@ impl Default for Header {
back, back,
show_title, show_title,
export, export,
update_button,
update_box, update_box,
update_label, update_label,
update_spinner, update_spinner,
@ -91,15 +88,6 @@ impl Header {
self.add_toggle.set_popover(&add_popover); self.add_toggle.set_popover(&add_popover);
self.update_button
.connect_clicked(clone!(sender => move |_| {
gtk::idle_add(clone!(sender => move || {
let s: Option<Vec<_>> = None;
refresh(s, sender.clone());
glib::Continue(false)
}));
}));
// Add the Headerbar to the window. // Add the Headerbar to the window.
window.set_titlebar(&self.container); window.set_titlebar(&self.container);