From a39e642b5aede4410799ec49de990ac529f0c40e Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Tue, 4 Sep 2018 11:22:18 +0300
Subject: [PATCH] EpisodeWidget: Change cacnel button to an icon

This also reworks the button_box to be just a GtkBox instead.
I couldn't get ButtonBox to behave the way I wanted.

Fixes #89
---
 podcasts-gtk/resources/gtk/episode_widget.ui | 70 +++++++++++---------
 podcasts-gtk/src/widgets/episode.rs          |  2 +-
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/podcasts-gtk/resources/gtk/episode_widget.ui b/podcasts-gtk/resources/gtk/episode_widget.ui
index 066485b..59043e9 100644
--- a/podcasts-gtk/resources/gtk/episode_widget.ui
+++ b/podcasts-gtk/resources/gtk/episode_widget.ui
@@ -44,8 +44,10 @@ Tobias Bernard
         <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="info_container">
+            <property name="width_request">230</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">start</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
@@ -61,7 +63,7 @@ Tobias Bernard
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -205,23 +207,53 @@ Tobias Bernard
           </packing>
         </child>
         <child>
-          <object class="GtkButtonBox" id="button_box">
+          <object class="GtkBox" id="button_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">center</property>
+            <property name="halign">end</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
+              <object class="GtkButton" id="play_button">
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
+                <property name="receives_default">True</property>
+                <property name="no_show_all">True</property>
+                <property name="tooltip_text" translatable="yes">Play this episode</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">media-playback-start-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Cancel the download proccess</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">edit-delete-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">end</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -241,34 +273,10 @@ Tobias Bernard
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="play_button">
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="no_show_all">True</property>
-                <property name="tooltip_text" translatable="yes">Play this episode</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">media-playback-start-symbolic</property>
-                  </object>
-                </child>
-              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
-                <property name="non_homogeneous">True</property>
               </packing>
             </child>
           </object>
diff --git a/podcasts-gtk/src/widgets/episode.rs b/podcasts-gtk/src/widgets/episode.rs
index 940148a..20823c9 100644
--- a/podcasts-gtk/src/widgets/episode.rs
+++ b/podcasts-gtk/src/widgets/episode.rs
@@ -65,7 +65,7 @@ struct InfoLabels {
 
 #[derive(Clone, Debug)]
 struct Buttons {
-    container: gtk::ButtonBox,
+    container: gtk::Box,
     play: gtk::Button,
     download: gtk::Button,
     cancel: gtk::Button,