Moved banner.png from assets into hammond-gtk/gtk

hammond-gtk/src/headerbar.rs

@@ -8,8 +8,7 @@ use podcasts_view::update_podcasts_view;
 use utils;
 
 pub fn get_headerbar(db: &Database, stack: &gtk::Stack) -> gtk::HeaderBar {
-    let builder = include_str!("../gtk/headerbar.ui");
-    let builder = gtk::Builder::new_from_string(builder);
+    let builder = gtk::Builder::new_from_string(include_str!("../gtk/headerbar.ui"));
 
     let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap();
     let home_button: gtk::Button = builder.get_object("homebutton").unwrap();

hammond-gtk/src/views/podcasts_view.rs

@@ -7,8 +7,7 @@ use hammond_data::index_feed::Database;
 use widgets::podcast::*;
 
 fn show_empty_view(stack: &gtk::Stack) {
-    let builder = include_str!("../../gtk/empty_view.ui");
-    let builder = gtk::Builder::new_from_string(builder);
+    let builder = gtk::Builder::new_from_string(include_str!("../../gtk/empty_view.ui"));
     let view: gtk::Box = builder.get_object("empty_view").unwrap();
     stack.add_named(&view, "empty");
     stack.set_visible_child_name("empty");
@@ -38,16 +37,14 @@ fn populate_flowbox(db: &Database, stack: &gtk::Stack, flowbox: &gtk::FlowBox) {
 }
 
 fn setup_podcast_widget(stack: &gtk::Stack) {
-    let pd_widget_source = include_str!("../../gtk/podcast_widget.ui");
-    let pd_widget_buidler = gtk::Builder::new_from_string(pd_widget_source);
-    let pd_widget: gtk::Box = pd_widget_buidler.get_object("podcast_widget").unwrap();
+    let buidler = gtk::Builder::new_from_string(include_str!("../../gtk/podcast_widget.ui"));
+    let pd_widget: gtk::Box = buidler.get_object("podcast_widget").unwrap();
 
     stack.add_named(&pd_widget, "pdw");
 }
 
 fn setup_podcasts_grid(db: &Database, stack: &gtk::Stack) {
-    let builder = include_str!("../../gtk/podcasts_view.ui");
-    let builder = gtk::Builder::new_from_string(builder);
+    let builder = gtk::Builder::new_from_string(include_str!("../../gtk/podcasts_view.ui"));
     let grid: gtk::Grid = builder.get_object("grid").unwrap();
     stack.add_named(&grid, "pd_grid");
     stack.set_visible_child(&grid);
@@ -67,8 +64,7 @@ pub fn setup_stack(db: &Database) -> gtk::Stack {
 }
 
 pub fn update_podcasts_view(db: &Database, stack: &gtk::Stack) {
-    let builder = include_str!("../../gtk/podcasts_view.ui");
-    let builder = gtk::Builder::new_from_string(builder);
+    let builder = gtk::Builder::new_from_string(include_str!("../../gtk/podcasts_view.ui"));
     let grid: gtk::Grid = builder.get_object("grid").unwrap();
 
     let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap();

hammond-gtk/src/widgets/episode.rs

@@ -26,8 +26,7 @@ thread_local!(
 
 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 = include_str!("../../gtk/episode_widget.ui");
-    let builder = gtk::Builder::new_from_string(builder);
+    let builder = gtk::Builder::new_from_string(include_str!("../../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

@@ -14,19 +14,15 @@ use podcasts_view::update_podcasts_view;
 
 fn podcast_widget(db: &Database, stack: &gtk::Stack, pd: &Podcast) -> gtk::Box {
     // Adapted from gnome-music AlbumWidget
-    let pd_widget_source = include_str!("../../gtk/podcast_widget.ui");
-    let pd_widget_buidler = gtk::Builder::new_from_string(pd_widget_source);
-    let pd_widget: gtk::Box = pd_widget_buidler.get_object("podcast_widget").unwrap();
+    let builder = gtk::Builder::new_from_string(include_str!("../../gtk/podcast_widget.ui"));
+    let pd_widget: gtk::Box = builder.get_object("podcast_widget").unwrap();
 
-    let cover: gtk::Image = pd_widget_buidler.get_object("cover").unwrap();
-    let title_label: gtk::Label = pd_widget_buidler.get_object("title_label").unwrap();
-    // let desc_label: gtk::Label = pd_widget_buidler.get_object("description_label").unwrap();
-    let desc_text_view: gtk::TextView = pd_widget_buidler.get_object("desc_text_view").unwrap();
-    let view: gtk::Viewport = pd_widget_buidler.get_object("view").unwrap();
-    let unsub_button: gtk::Button = pd_widget_buidler.get_object("unsub_button").unwrap();
-    let played_button: gtk::Button = pd_widget_buidler
-        .get_object("mark_all_played_button")
-        .unwrap();
+    let cover: gtk::Image = builder.get_object("cover").unwrap();
+    let title_label: gtk::Label = builder.get_object("title_label").unwrap();
+    let desc_text_view: gtk::TextView = builder.get_object("desc_text_view").unwrap();
+    let view: gtk::Viewport = builder.get_object("view").unwrap();
+    let unsub_button: gtk::Button = builder.get_object("unsub_button").unwrap();
+    let played_button: gtk::Button = builder.get_object("mark_all_played_button").unwrap();
 
     // TODO: should spawn a thread to avoid locking the UI probably.
     unsub_button.connect_clicked(clone!(db, stack, pd => move |bttn| {
@@ -106,8 +102,7 @@ fn show_played_button(db: &Database, pd: &Podcast, played_button: &gtk::Button)
 }
 
 pub fn create_flowbox_child(db: &Database, pd: &Podcast) -> gtk::FlowBoxChild {
-    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(include_str!("../../gtk/podcasts_child.ui"));
 
     // Copy of gnome-music AlbumWidget
     let box_: gtk::Box = builder.get_object("fb_child").unwrap();
@@ -132,7 +127,8 @@ pub fn create_flowbox_child(db: &Database, pd: &Podcast) -> gtk::FlowBoxChild {
 }
 
 fn configure_banner(db: &Database, pd: &Podcast, banner: &gtk::Image, banner_title: &gtk::Label) {
-    let bann = Pixbuf::new_from_file_at_scale("assets/banner.png", 256, 256, true);
+    // TODO: use GResource instead.
+    let bann = Pixbuf::new_from_file_at_scale("hammond-gtk/gtk/banner.png", 256, 256, true);
     if let Ok(b) = bann {
         banner.set_from_pixbuf(&b);