[baobab/wip/gtkmaster: 2/2] Port to GtkHeaderBar

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 0ceb471ccb3b37de5ae499d4a48840eefd7cb686
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jun 2 11:41:10 2013 +0200

    Port to GtkHeaderBar

 src/baobab-main-window.ui |   49 +++++++++++++++++++++++++++++++++++---------
 src/baobab-window.vala    |    8 +++---
 2 files changed, 43 insertions(+), 14 deletions(-)
---
diff --git a/src/baobab-main-window.ui b/src/baobab-main-window.ui
index 9db64df..69f27ba 100644
--- a/src/baobab-main-window.ui
+++ b/src/baobab-main-window.ui
@@ -17,7 +17,7 @@
     <property name="visible">True</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GdHeaderBar" id="header-bar">
+      <object class="GtkHeaderBar" id="header-bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="title" translatable="yes">Devices and locations</property>
@@ -26,12 +26,21 @@
           <class name="baobab-toolbar"/>
         </style>
         <child>
-          <object class="GdHeaderMenuButton" id="menu-button">
+          <object class="GtkMenuButton" id="menu-button">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="symbolic-icon-name">emblem-system-symbolic</property>
-            <property name="menu-model">winmenu</property>
+            <property name="valign">center</property>
+            <property name="menu_model">winmenu</property>
             <property name="action_name">win.gear-menu</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="menu-button-image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">emblem-system-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
@@ -40,7 +49,7 @@
       </object>
     </child>
     <child>
-      <object class="GdHeaderBar" id="result-header-bar">
+      <object class="GtkHeaderBar" id="result-header-bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <style>
@@ -48,22 +57,42 @@
           <class name="baobab-toolbar"/>
         </style>
         <child>
-          <object class="GdHeaderSimpleButton" id="back-button">
+          <object class="GtkButton" id="back-button">
             <property name="visible">True</property>
+            <property name="valign">center</property>
             <property name="can_focus">True</property>
-            <property name="symbolic-icon-name">go-previous-symbolic</property>
             <property name="action_name">win.show-home-page</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="back-button-image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">go-previous-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">start</property>
           </packing>
         </child>
         <child>
-          <object class="GdHeaderSimpleButton" id="reload-button">
+          <object class="GtkButton" id="reload-button">
             <property name="visible">True</property>
+            <property name="valign">center</property>
             <property name="can_focus">True</property>
-            <property name="symbolic-icon-name">view-refresh-symbolic</property>
             <property name="action_name">win.reload</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="reload-button-image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">view-refresh-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
diff --git a/src/baobab-window.vala b/src/baobab-window.vala
index 406c866..cc0c517 100644
--- a/src/baobab-window.vala
+++ b/src/baobab-window.vala
@@ -24,8 +24,8 @@ namespace Baobab {
 
     public class Window : Gtk.ApplicationWindow {
         Settings ui_settings;
-        Gd.HeaderBar header_bar;
-        Gd.HeaderBar result_header_bar;
+        Gtk.HeaderBar header_bar;
+        Gtk.HeaderBar result_header_bar;
         Gtk.Stack main_stack;
         Gtk.Widget home_page;
         Gtk.Widget result_page;
@@ -106,8 +106,8 @@ namespace Baobab {
             main_stack = builder.get_object ("main-stack") as Gtk.Stack;
             home_page = builder.get_object ("home-page") as Gtk.Widget;
             result_page = builder.get_object ("result-page") as Gtk.Widget;
-            header_bar = builder.get_object ("header-bar") as Gd.HeaderBar;
-            result_header_bar = builder.get_object ("result-header-bar") as Gd.HeaderBar;
+            header_bar = builder.get_object ("header-bar") as Gtk.HeaderBar;
+            result_header_bar = builder.get_object ("result-header-bar") as Gtk.HeaderBar;
             infobar = builder.get_object ("infobar") as Gtk.InfoBar;
             infobar_primary = builder.get_object ("infobar-primary-label") as Gtk.Label;
             infobar_secondary = builder.get_object ("infobar-secondary-label") as Gtk.Label;