From 0a52f87f3a852e08804a6632bf94e9d30900ee51 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Wed, 13 Dec 2017 12:21:34 +0200
Subject: [PATCH] Rename glade files.

---
 .../resources/gtk/{podcast_widget.ui => show_widget.ui}    | 0
 .../resources/gtk/{podcasts_child.ui => shows_child.ui}    | 0
 .../resources/gtk/{podcasts_view.ui => shows_view.ui}      | 0
 hammond-gtk/resources/resources.xml                        | 6 +++---
 hammond-gtk/src/views/shows.rs                             | 7 ++-----
 hammond-gtk/src/widgets/show.rs                            | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)
 rename hammond-gtk/resources/gtk/{podcast_widget.ui => show_widget.ui} (100%)
 rename hammond-gtk/resources/gtk/{podcasts_child.ui => shows_child.ui} (100%)
 rename hammond-gtk/resources/gtk/{podcasts_view.ui => shows_view.ui} (100%)

diff --git a/hammond-gtk/resources/gtk/podcast_widget.ui b/hammond-gtk/resources/gtk/show_widget.ui
similarity index 100%
rename from hammond-gtk/resources/gtk/podcast_widget.ui
rename to hammond-gtk/resources/gtk/show_widget.ui
diff --git a/hammond-gtk/resources/gtk/podcasts_child.ui b/hammond-gtk/resources/gtk/shows_child.ui
similarity index 100%
rename from hammond-gtk/resources/gtk/podcasts_child.ui
rename to hammond-gtk/resources/gtk/shows_child.ui
diff --git a/hammond-gtk/resources/gtk/podcasts_view.ui b/hammond-gtk/resources/gtk/shows_view.ui
similarity index 100%
rename from hammond-gtk/resources/gtk/podcasts_view.ui
rename to hammond-gtk/resources/gtk/shows_view.ui
diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml
index df3f3cd..e8bdc73 100644
--- a/hammond-gtk/resources/resources.xml
+++ b/hammond-gtk/resources/resources.xml
@@ -3,10 +3,10 @@
   <gresource prefix="/org/gnome/hammond/">
       <file>banner.png</file>
       <file preprocess="xml-stripblanks">gtk/episode_widget.ui</file>
-      <file preprocess="xml-stripblanks">gtk/podcast_widget.ui</file>
+      <file preprocess="xml-stripblanks">gtk/show_widget.ui</file>
       <file preprocess="xml-stripblanks">gtk/empty_view.ui</file>
-      <file preprocess="xml-stripblanks">gtk/podcasts_view.ui</file>
-      <file preprocess="xml-stripblanks">gtk/podcasts_child.ui</file>
+      <file preprocess="xml-stripblanks">gtk/shows_view.ui</file>
+      <file preprocess="xml-stripblanks">gtk/shows_child.ui</file>
       <file preprocess="xml-stripblanks">gtk/headerbar.ui</file>
   </gresource>
 </gresources>
diff --git a/hammond-gtk/src/views/shows.rs b/hammond-gtk/src/views/shows.rs
index bd9cf62..8e7b802 100644
--- a/hammond-gtk/src/views/shows.rs
+++ b/hammond-gtk/src/views/shows.rs
@@ -30,7 +30,7 @@ struct ShowsChild {
 
 impl ShowsPopulated {
     pub fn new() -> ShowsPopulated {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcasts_view.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_view.ui");
         let container: gtk::Box = builder.get_object("fb_parent").unwrap();
         let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap();
         let viewport: gtk::Viewport = builder.get_object("viewport").unwrap();
@@ -53,10 +53,7 @@ impl ShowsPopulated {
         use gtk::WidgetExt;
 
         // TODO: handle unwraps.
-        // Note: flowbox_activation always adds "widnget" into the stack and switch to it,
         // TODO: implement back button.
-        // so back button should always remove "widget" and destroy it.
-        let show = show.clone();
         self.flowbox
             .connect_child_activated(clone!(show => move |_, child| {
             // This is such an ugly hack...
@@ -89,7 +86,7 @@ impl ShowsPopulated {
 
 impl ShowsChild {
     fn new() -> ShowsChild {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcasts_child.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_child.ui");
 
         // Copy of gnome-music AlbumWidget
         let container: gtk::Box = builder.get_object("fb_child").unwrap();
diff --git a/hammond-gtk/src/widgets/show.rs b/hammond-gtk/src/widgets/show.rs
index b21bb06..1adcc3d 100644
--- a/hammond-gtk/src/widgets/show.rs
+++ b/hammond-gtk/src/widgets/show.rs
@@ -27,7 +27,7 @@ pub struct ShowWidget {
 impl ShowWidget {
     pub fn new() -> ShowWidget {
         // Adapted from gnome-music AlbumWidget
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcast_widget.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/show_widget.ui");
         let container: gtk::Box = builder.get_object("podcast_widget").unwrap();
 
         let cover: gtk::Image = builder.get_object("cover").unwrap();