From ac513700884be8893b449f170661287dc50643fb Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Thu, 12 Oct 2017 15:41:30 +0300
Subject: [PATCH] Split headerbar on it's own glade.ui file.

---
 hammond-gtk/gtk/foo.ui       |  65 ----------------------
 hammond-gtk/gtk/headerbar.ui | 101 +++++++++++++++++++++++++++++++++++
 hammond-gtk/src/main.rs      |  21 +++++---
 3 files changed, 114 insertions(+), 73 deletions(-)
 create mode 100644 hammond-gtk/gtk/headerbar.ui

diff --git a/hammond-gtk/gtk/foo.ui b/hammond-gtk/gtk/foo.ui
index 7550058..87b5f4b 100644
--- a/hammond-gtk/gtk/foo.ui
+++ b/hammond-gtk/gtk/foo.ui
@@ -24,71 +24,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkHeaderBar" id="headerbar1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="title">Hello</property>
-    <property name="subtitle">World!</property>
-    <property name="show_close_button">True</property>
-    <child>
-      <object class="GtkButton" id="homebutton">
-        <property name="label">gtk-home</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="use_stock">True</property>
-        <property name="always_show_image">True</property>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="refbutton">
-        <property name="label">gtk-refresh</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="always_show_image">True</property>
-      </object>
-      <packing>
-        <property name="pack_type">end</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="addbutton">
-        <property name="label">gtk-add</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="always_show_image">True</property>
-      </object>
-      <packing>
-        <property name="pack_type">end</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="searchbutton">
-        <property name="label">gtk-find</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="always_show_image">True</property>
-      </object>
-      <packing>
-        <property name="pack_type">end</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-  </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <property name="default_width">800</property>
diff --git a/hammond-gtk/gtk/headerbar.ui b/hammond-gtk/gtk/headerbar.ui
new file mode 100644
index 0000000..f5e8f5a
--- /dev/null
+++ b/hammond-gtk/gtk/headerbar.ui
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkHeaderBar" id="headerbar1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="title">Hello</property>
+    <property name="subtitle">World!</property>
+    <property name="show_close_button">True</property>
+    <child>
+      <object class="GtkButton" id="homebutton">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+        <property name="always_show_image">True</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="stock">gtk-home</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButton" id="addbutton">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="tooltip_text" translatable="yes">Add Podcast</property>
+        <property name="valign">center</property>
+        <property name="use_underline">True</property>
+        <property name="always_show_image">True</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="stock">gtk-add</property>
+          </object>
+        </child>
+        <style>
+          <class name="image-button"/>
+        </style>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButton" id="refbutton">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+        <property name="use_underline">True</property>
+        <property name="always_show_image">True</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="stock">gtk-refresh</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToggleButton" id="searchbutton">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="tooltip_text" translatable="yes">Search</property>
+        <property name="valign">center</property>
+        <child>
+          <object class="GtkImage" id="search-button-image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon_name">edit-find-symbolic</property>
+            <property name="icon_size">1</property>
+          </object>
+        </child>
+        <style>
+          <class name="image-button"/>
+        </style>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs
index 935532d..e91eecb 100644
--- a/hammond-gtk/src/main.rs
+++ b/hammond-gtk/src/main.rs
@@ -52,10 +52,13 @@ fn create_tree_store(connection: &SqliteConnection, builder: &gtk::Builder) -> T
             podcast_model.insert_with_values(
                 Some(&iter),
                 None,
-                &[0, 1, 2, 6, 7, 8],
                 &[
-                    &ep.id(), &ep.title().unwrap(), &ep.description().unwrap_or_default(), &ep.uri(),
-                    &ep.local_uri().unwrap_or_default(), &ep.published_date().unwrap_or_default(),
+                    0, 1, 2, 6, 7, 8
+                ],
+                &[
+                    &ep.id(), &ep.title().unwrap(), &ep.description().unwrap_or_default(),
+                    &ep.uri(), &ep.local_uri().unwrap_or_default(),
+                    &ep.published_date().unwrap_or_default(),
                 ],
             );
         }
@@ -105,20 +108,22 @@ fn main() {
 
     // Adapted copy of the way gnome-music does albumview
     let glade_src = include_str!("../gtk/foo.ui");
+    let header_src = include_str!("../gtk/headerbar.ui");
     let builder = gtk::Builder::new_from_string(glade_src);
+    let header_build = gtk::Builder::new_from_string(header_src);
 
     // Get the main window
     // let window: gtk::Window = builder.get_object("window1").unwrap();
     let window: gtk::Window = builder.get_object("window2").unwrap();
     // Get the headerbar
-    let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap();
+    let header: gtk::HeaderBar = header_build.get_object("headerbar1").unwrap();
     window.set_titlebar(&header);
 
-    let refresh_button: gtk::Button = builder.get_object("refbutton").unwrap();
+    let refresh_button: gtk::Button = header_build.get_object("refbutton").unwrap();
     // TODO: Have a small dropdown menu
-    let _add_button: gtk::Button = builder.get_object("addbutton").unwrap();
-    let _search_button: gtk::Button = builder.get_object("searchbutton").unwrap();
-    let _home_button: gtk::Button = builder.get_object("homebutton").unwrap();
+    let _add_button: gtk::Button = header_build.get_object("addbutton").unwrap();
+    let _search_button: gtk::Button = header_build.get_object("searchbutton").unwrap();
+    let _home_button: gtk::Button = header_build.get_object("homebutton").unwrap();
 
     // FIXME: This locks the ui atm.
     refresh_button.connect_clicked(|_| {