From fee3e320abfb46bee02ce8569e5c3c06bb6ee4ab Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Fri, 10 Aug 2018 15:43:19 +0300
Subject: [PATCH] ShowWidget: Move the listbox back to the glade file

---
 podcasts-gtk/resources/gtk/show_widget.ui | 29 ++++++++++++++++++++++-
 podcasts-gtk/src/widgets/show.rs          |  9 ++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/podcasts-gtk/resources/gtk/show_widget.ui b/podcasts-gtk/resources/gtk/show_widget.ui
index c3610a9..ab44499 100644
--- a/podcasts-gtk/resources/gtk/show_widget.ui
+++ b/podcasts-gtk/resources/gtk/show_widget.ui
@@ -100,7 +100,34 @@ Sorry, we could not find a description for this Show.</property>
       </packing>
     </child>
     <child>
-      <placeholder/>
+      <object class="GtkFrame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkAlignment">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkListBox" id="episodes">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="selection_mode">none</property>
+                <property name="activate_on_single_click">False</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
     </child>
   </object>
 </interface>
diff --git a/podcasts-gtk/src/widgets/show.rs b/podcasts-gtk/src/widgets/show.rs
index f4c985c..acdd588 100644
--- a/podcasts-gtk/src/widgets/show.rs
+++ b/podcasts-gtk/src/widgets/show.rs
@@ -1,5 +1,5 @@
 use glib;
-use gtk::{self, prelude::*, Adjustment, SelectionMode};
+use gtk::{self, prelude::*, Adjustment};
 
 use crossbeam_channel::Sender;
 use failure::Error;
@@ -33,12 +33,9 @@ impl Default for ShowWidget {
         let sub_cont: gtk::Box = builder.get_object("sub_container").unwrap();
         let cover: gtk::Image = builder.get_object("cover").unwrap();
         let description: gtk::Label = builder.get_object("description").unwrap();
+        let episodes = builder.get_object("episodes").unwrap();
         let view = BaseView::default();
 
-        let frame = gtk::Frame::new(None);
-        let episodes = gtk::ListBox::new();
-        episodes.set_selection_mode(SelectionMode::None);
-
         let column = Column::new();
         column.set_maximum_width(700);
         // For some reason the Column is not seen as a gtk::container
@@ -46,8 +43,6 @@ impl Default for ShowWidget {
         let column = column.upcast::<gtk::Widget>();
         let column = column.downcast::<gtk::Container>().unwrap();
 
-        frame.add(&episodes);
-        sub_cont.add(&frame);
         column.add(&sub_cont);
         view.add(&column);
         column.show_all();