From e04de5a576cdf4ca425c13409f62f6387edd76e9 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Sun, 17 Dec 2017 15:57:06 +0200
Subject: [PATCH] ShowsView: Move title to a tooltip, fix gresource, center
 flowbox halign.

---
 hammond-gtk/resources/gtk/shows_child.ui | 19 -------------------
 hammond-gtk/resources/gtk/shows_view.ui  |  6 +++---
 hammond-gtk/resources/resources.xml      |  1 -
 hammond-gtk/src/views/shows.rs           |  5 +----
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/hammond-gtk/resources/gtk/shows_child.ui b/hammond-gtk/resources/gtk/shows_child.ui
index 82b0128..0fa68f6 100644
--- a/hammond-gtk/resources/gtk/shows_child.ui
+++ b/hammond-gtk/resources/gtk/shows_child.ui
@@ -35,24 +35,5 @@
         <property name="position">0</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkLabel" id="pd_title">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">center</property>
-        <property name="valign">center</property>
-        <property name="use_markup">True</property>
-        <property name="justify">center</property>
-        <property name="ellipsize">end</property>
-        <property name="single_line_mode">True</property>
-        <property name="max_width_chars">33</property>
-        <property name="track_visited_links">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
   </object>
 </interface>
diff --git a/hammond-gtk/resources/gtk/shows_view.ui b/hammond-gtk/resources/gtk/shows_view.ui
index 5a3dff6..7981cb9 100644
--- a/hammond-gtk/resources/gtk/shows_view.ui
+++ b/hammond-gtk/resources/gtk/shows_view.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.1 -->
+<!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="fb_parent">
@@ -19,11 +19,11 @@
               <object class="GtkFlowBox" id="flowbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">baseline</property>
+                <property name="halign">center</property>
                 <property name="valign">start</property>
                 <property name="homogeneous">True</property>
                 <property name="column_spacing">5</property>
-                <property name="row_spacing">2</property>
+                <property name="row_spacing">5</property>
                 <property name="max_children_per_line">20</property>
                 <property name="selection_mode">none</property>
               </object>
diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml
index e8bdc73..cb87ca4 100644
--- a/hammond-gtk/resources/resources.xml
+++ b/hammond-gtk/resources/resources.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/hammond/">
-      <file>banner.png</file>
       <file preprocess="xml-stripblanks">gtk/episode_widget.ui</file>
       <file preprocess="xml-stripblanks">gtk/show_widget.ui</file>
       <file preprocess="xml-stripblanks">gtk/empty_view.ui</file>
diff --git a/hammond-gtk/src/views/shows.rs b/hammond-gtk/src/views/shows.rs
index b8bac62..d12dc58 100644
--- a/hammond-gtk/src/views/shows.rs
+++ b/hammond-gtk/src/views/shows.rs
@@ -79,7 +79,6 @@ impl ShowsPopulated {
 #[derive(Debug)]
 struct ShowsChild {
     container: gtk::Box,
-    title: gtk::Label,
     cover: gtk::Image,
     child: gtk::FlowBoxChild,
 }
@@ -89,7 +88,6 @@ impl Default for ShowsChild {
         let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_child.ui");
 
         let container: gtk::Box = builder.get_object("fb_child").unwrap();
-        let title: gtk::Label = builder.get_object("pd_title").unwrap();
         let cover: gtk::Image = builder.get_object("pd_cover").unwrap();
 
         let child = gtk::FlowBoxChild::new();
@@ -97,7 +95,6 @@ impl Default for ShowsChild {
 
         ShowsChild {
             container,
-            title,
             cover,
             child,
         }
@@ -112,7 +109,7 @@ impl ShowsChild {
     }
 
     fn init(&self, pd: &Podcast) {
-        self.title.set_text(pd.title());
+        self.container.set_tooltip_text(pd.title());
 
         let cover = get_pixbuf_from_path(pd);
         if let Some(img) = cover {