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

Refactored create_flowbox_child constructor to use Podcast struct instead of raw strings/pixbuf.

Browse Source
This commit is contained in:
Jordan Petridis 2017-11-02 10:10:02 +02:00
parent 4da1ee8f10
commit 300fe86dc5
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hammond-gtk/src/views/podcasts_view.rs
View File

@ -42,10 +42,7 @@ fn populate_flowbox(db: &Database, stack: &gtk::Stack, flowbox: &gtk::FlowBox) {
if let Ok(pds) = podcasts { if let Ok(pds) = podcasts {
pds.iter().for_each(|parent| { pds.iter().for_each(|parent| {
let title = parent.title(); let f = create_flowbox_child(db, &parent);
let img = parent.image_uri();
let pixbuf = get_pixbuf_from_path(img, title);
let f = create_flowbox_child(title, pixbuf);
f.connect_activate(clone!(db, stack, parent => move |_| { f.connect_activate(clone!(db, stack, parent => move |_| {
on_flowbox_child_activate(&db, &stack, &parent); on_flowbox_child_activate(&db, &stack, &parent);

11
hammond-gtk/src/widgets/podcast.rs
View File

@ -123,7 +123,11 @@ fn show_played_button(db: &Database, pd: &Podcast, played_button: &gtk::Button)
} }
} }
pub fn create_flowbox_child(title: &str, cover: Option<Pixbuf>) -> gtk::FlowBoxChild { // TODO: Add something that displays the amount of unplayed episodes on each Podcast.
// Look into the vocal implementation.
// https://github.com/needle-and-thread/\
// vocal/blob/bced2e23cedb25b5edd0626e5f9361ceace683c9/src/Widgets/CoverArt.vala#L50
pub fn create_flowbox_child(_db: &Database, pd: &Podcast) -> gtk::FlowBoxChild {
let build_src = include_str!("../../gtk/podcasts_child.ui"); let build_src = include_str!("../../gtk/podcasts_child.ui");
let builder = gtk::Builder::new_from_string(build_src); let builder = gtk::Builder::new_from_string(build_src);
@ -131,7 +135,6 @@ pub fn create_flowbox_child(title: &str, cover: Option<Pixbuf>) -> gtk::FlowBoxC
let box_: gtk::Box = builder.get_object("fb_child").unwrap(); let box_: gtk::Box = builder.get_object("fb_child").unwrap();
let pd_title: gtk::Label = builder.get_object("pd_title").unwrap(); let pd_title: gtk::Label = builder.get_object("pd_title").unwrap();
let pd_cover: gtk::Image = builder.get_object("pd_cover").unwrap(); let pd_cover: gtk::Image = builder.get_object("pd_cover").unwrap();
let events: gtk::EventBox = builder.get_object("events").unwrap(); let events: gtk::EventBox = builder.get_object("events").unwrap();
// GDK.TOUCH_MASK // GDK.TOUCH_MASK
@ -139,7 +142,9 @@ pub fn create_flowbox_child(title: &str, cover: Option<Pixbuf>) -> gtk::FlowBoxC
// http://gtk-rs.org/docs/gdk/constant.TOUCH_MASK.html // http://gtk-rs.org/docs/gdk/constant.TOUCH_MASK.html
events.add_events(4_194_304); events.add_events(4_194_304);
pd_title.set_text(title); pd_title.set_text(pd.title());
let cover = get_pixbuf_from_path(pd.image_uri(), pd.title());
if let Some(img) = cover { if let Some(img) = cover {
pd_cover.set_from_pixbuf(&img); pd_cover.set_from_pixbuf(&img);