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

hammond-gtk: Create Application wide actions.

Browse Source
This commit is contained in:
Jordan Petridis 2017-12-29 16:05:10 +02:00
parent ca06a16bd9
commit fdd63afdfe
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,6 +249,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">app.update</property>
<property name="text" translatable="yes">Check for new episodes</property>
</object>
<packing>

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

@ -2,8 +2,7 @@ use gtk;
use glib;
use gio;
use gtk::prelude::*;
use gio::ApplicationExtManual;
use gio::ApplicationExt;
use gio::{ActionMapExt, ApplicationExt, ApplicationExtManual, SimpleActionExt};
use hammond_data::utils::checkup;
@ -64,13 +63,23 @@ impl App {
}
}
pub fn run(&self) {
let window = self.window.clone();
let app = self.app_instance.clone();
self.app_instance.connect_startup(move |_| {
build_ui(&window, &app);
pub fn setup_actions(&self) {
let update = gio::SimpleAction::new("update", None);
let content = self.content.clone();
update.connect_activate(move |_, _| {
utils::refresh_feed(content.clone(), None);
});
self.app_instance.add_action(&update);
let refresh = gio::SimpleAction::new("refresh", None);
let content = self.content.clone();
update.connect_activate(move |_, _| {
content.update();
});
self.app_instance.add_action(&refresh);
}
pub fn setup_timed_callbacks(&self) {
let content = self.content.clone();
// Update 30 seconds after the Application is initialized.
gtk::timeout_add_seconds(
@ -98,6 +107,16 @@ impl App {
let _ = checkup();
glib::Continue(false)
});
}
pub fn run(&self) {
let window = self.window.clone();
let app = self.app_instance.clone();
self.app_instance.connect_startup(move |_| {
build_ui(&window, &app);
});
self.setup_timed_callbacks();
self.setup_actions();
ApplicationExtManual::run(&self.app_instance, &[]);
}

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

@ -56,7 +56,6 @@ impl Header {
let menu_popover: gtk::PopoverMenu = builder.get_object("menu_popover").unwrap();
let new_url: gtk::Entry = builder.get_object("new_url").unwrap();
let add_button: gtk::Button = builder.get_object("add_button").unwrap();
let refresh_button: gtk::Button = builder.get_object("refresh_button").unwrap();
self.switch.set_stack(&content.get_stack());
new_url.connect_changed(move |url| {
@ -71,10 +70,6 @@ impl Header {
add_popover.hide();
}));
refresh_button.connect_clicked(clone!(content => move |_| {
utils::refresh_feed(content.clone(), None);
}));
self.add_toggle.set_popover(&add_popover);
self.menu_toggle.set_popover(&menu_popover);

4
hammond-gtk/src/utils.rs
View File

@ -45,11 +45,11 @@ pub fn refresh_feed(content: Rc<Content>, source: Option<Vec<Source>>) {
};
sender.send(true).expect("Couldn't send data to channel");;
glib::idle_add(refresh_podcasts_view);
glib::idle_add(refresh_everything);
});
}
fn refresh_podcasts_view() -> glib::Continue {
fn refresh_everything() -> glib::Continue {
GLOBAL.with(|global| {
if let Some((ref content, ref reciever)) = *global.borrow() {
if reciever.try_recv().is_ok() {