From 576acc1602459c46b90e937a02fac6ead02ab990 Mon Sep 17 00:00:00 2001
From: Yosef Or Boczko <yoseforb@src.gnome.org>
Date: Sun, 16 Feb 2014 05:48:42 +0200
Subject: [PATCH] datetime: Use header bar in the datetime and the timezone
 dialogs

The seatch entry in the timezone dialog is moved to the
title of the header bar.

https://bugzilla.gnome.org/show_bug.cgi?id=724299
---
 panels/datetime/cc-datetime-panel.c |  11 ---
 panels/datetime/datetime.ui         | 106 +++++-----------------------
 2 files changed, 18 insertions(+), 99 deletions(-)

diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index f52187ed0..6854f3cc1 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -484,7 +484,6 @@ city_changed_cb (GtkEntryCompletion *entry_completion,
                  GtkTreeIter        *iter,
                  CcDateTimePanel *self)
 {
-  CcDateTimePanelPrivate *priv = self->priv;
   GtkWidget *entry;
   gchar *zone;
 
@@ -496,8 +495,6 @@ city_changed_cb (GtkEntryCompletion *entry_completion,
   entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (entry_completion));
   gtk_entry_set_text (GTK_ENTRY (entry), "");
 
-  gtk_widget_grab_focus (W ("timezone-close-button"));
-
   return TRUE;
 }
 
@@ -1035,7 +1032,6 @@ setup_timezone_dialog (CcDateTimePanel *self)
   CcDateTimePanelPrivate *priv = self->priv;
   GtkEntryCompletion *completion;
   GtkTreeModel *completion_model;
-  GtkWidget *button;
   GtkWidget *dialog;
   GtkWidget *entry;
 
@@ -1045,12 +1041,9 @@ setup_timezone_dialog (CcDateTimePanel *self)
   gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->builder, "aspectmap")),
                      priv->map);
 
-  button = W ("timezone-close-button");
   dialog = W ("timezone-dialog");
   entry = W ("timezone-searchentry");
 
-  g_signal_connect_swapped (button, "clicked",
-                            G_CALLBACK (gtk_widget_hide), dialog);
   g_signal_connect (dialog, "delete-event",
                     G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
@@ -1144,7 +1137,6 @@ setup_datetime_dialog (CcDateTimePanel *self)
   GtkAdjustment *adjustment;
   GtkCssProvider *provider;
   GtkStyleContext *context;
-  GtkWidget *button;
   GtkWidget *dialog;
   guint num_days;
 
@@ -1162,10 +1154,7 @@ setup_datetime_dialog (CcDateTimePanel *self)
                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
 
-  button = W ("datetime-close-button");
   dialog = W ("datetime-dialog");
-  g_signal_connect_swapped (button, "clicked",
-                            G_CALLBACK (gtk_widget_hide), dialog);
   g_signal_connect (dialog, "delete-event",
                     G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index c7cdcf20e..abefa3c31 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -61,41 +61,12 @@
     <property name="title" translatable="yes">Date &amp; Time</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
+    <property name="use_header_bar">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="datetime-close-button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkBox" id="time-box">
             <property name="visible">True</property>
@@ -358,74 +329,33 @@
     <property name="title" translatable="yes">Time Zone</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox7">
+    <property name="use_header_bar">1</property>
+    <child internal-child="headerbar">
+      <object class="GtkHeaderBar" id="dialog-header-bar">
+        <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkBox" id="map-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_start">5</property>
-            <property name="margin_end">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkSearchEntry" id="timezone-searchentry">
+        <property name="show_close_button">True</property>
+        <child type="title">
+            <object class="GtkSearchEntry" id="timezone-searchentry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="halign">center</property>
+                <property name="margin_start">5</property>
+                <property name="margin_end">5</property>
                 <property name="width_chars">40</property>
                 <property name="primary_icon_name">edit-find-symbolic</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">False</property>
                 <property name="placeholder_text" translatable="yes">Search for a city</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area3">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="timezone-close-button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
+            </object>
         </child>
+      </object>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox7">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child>
           <object class="GtkFrame" id="aspectmap">
             <property name="visible">True</property>