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

Completed #6, switch to gresource instead of include_str! macro.

Browse Source
This commit is contained in:
Jordan Petridis
2017-11-06 17:17:55 +02:00
parent 944156d6fe
commit 8d17d30c82
13 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hammond-gtk/src/widgets/episode.rs
+1 -1
View File
@@ -25,7 +25,7 @@ thread_local!(static GLOBAL: Foo = RefCell::new(None));
fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::Box {
// This is just a prototype and will be reworked probably.
let builder = gtk::Builder::new_from_string(include_str!("../../gtk/episode_widget.ui"));
let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/episode_widget.ui");
let ep: gtk::Box = builder.get_object("episode_box").unwrap();
let download_button: gtk::Button = builder.get_object("download_button").unwrap();
hammond-gtk/src/widgets/podcast.rs
+4 -3
View File
@@ -14,7 +14,7 @@ use podcasts_view::update_podcasts_view;
pub fn podcast_widget(db: &Database, stack: &gtk::Stack, pd: &Podcast) -> gtk::Box {
// Adapted from gnome-music AlbumWidget
let builder = gtk::Builder::new_from_string(include_str!("../../gtk/podcast_widget.ui"));
let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/podcast_widget.ui");
let pd_widget: gtk::Box = builder.get_object("podcast_widget").unwrap();
let cover: gtk::Image = builder.get_object("cover").unwrap();
@@ -111,8 +111,8 @@ pub fn get_pixbuf_from_path(img_path: Option<&str>, pd_title: &str) -> Option<Pi
}
pub fn setup_podcast_widget(stack: &gtk::Stack) {
let buidler = gtk::Builder::new_from_string(include_str!("../../gtk/podcast_widget.ui"));
let pd_widget: gtk::Box = buidler.get_object("podcast_widget").unwrap();
let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/podcast_widget.ui");
let pd_widget: gtk::Box = builder.get_object("podcast_widget").unwrap();
stack.add_named(&pd_widget, "pdw");
}
@@ -125,4 +125,5 @@ pub fn update_podcast_widget(db: &Database, stack: &gtk::Stack, pd: &Podcast) {
stack.remove(&old);
stack.add_named(&pdw, "pdw");
stack.set_visible_child_name(&vis);
old.destroy();
}