From 191cf445ef4e2d955de9bbce451997986cd7829d Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 8 Aug 2018 22:38:36 +0300 Subject: [PATCH] ShowWidget: Do not hardcode the episode listbox in the glade file --- podcasts-gtk/resources/gtk/show_widget.ui | 8 ++------ podcasts-gtk/src/widgets/show.rs | 7 ++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/podcasts-gtk/resources/gtk/show_widget.ui b/podcasts-gtk/resources/gtk/show_widget.ui index e27aaae..46fa22d 100644 --- a/podcasts-gtk/resources/gtk/show_widget.ui +++ b/podcasts-gtk/resources/gtk/show_widget.ui @@ -142,17 +142,13 @@ Sorry, we could not find a description for this show. - + True False 0 in - - True - False - none - + diff --git a/podcasts-gtk/src/widgets/show.rs b/podcasts-gtk/src/widgets/show.rs index 68e6191..6040cce 100644 --- a/podcasts-gtk/src/widgets/show.rs +++ b/podcasts-gtk/src/widgets/show.rs @@ -29,6 +29,7 @@ pub(crate) struct ShowWidget { scrolled_window: gtk::ScrolledWindow, cover: gtk::Image, description: gtk::Label, + frame: gtk::Frame, episodes: gtk::ListBox, show_id: Option, } @@ -38,7 +39,10 @@ impl Default for ShowWidget { let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/show_widget.ui"); let container: gtk::Box = builder.get_object("container").unwrap(); let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap(); - let episodes = builder.get_object("episodes").unwrap(); + let frame: gtk::Frame = builder.get_object("frame").unwrap(); + let episodes = gtk::ListBox::new(); + episodes.show(); + frame.add(&episodes); let cover: gtk::Image = builder.get_object("cover").unwrap(); let description: gtk::Label = builder.get_object("description").unwrap(); @@ -48,6 +52,7 @@ impl Default for ShowWidget { scrolled_window, cover, description, + frame, episodes, show_id: None, }