From 78265c9fd2f7526876c1418b80dda44d96f6c644 Mon Sep 17 00:00:00 2001
From: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon, 22 Aug 2011 16:25:02 +0100
Subject: search-bar: move close button to RHS

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
---
 libempathy-gtk/empathy-search-bar.ui | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui
index 7d42594d2..0cb9f3c7b 100644
--- a/libempathy-gtk/empathy-search-bar.ui
+++ b/libempathy-gtk/empathy-search-bar.ui
@@ -6,18 +6,6 @@
     <property name="visible">True</property>
     <property name="icon_size">2</property>
     <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
-    <child>
-      <object class="GtkToolButton" id="search_close">
-        <property name="visible">True</property>
-        <property name="is_important">True</property>
-        <property name="receives_default">True</property>
-        <property name="icon_name">gtk-close</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">True</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkToolItem" id="search_entry_toolitem">
         <property name="visible">True</property>
@@ -119,5 +107,26 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorToolItem" id="expander1">
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="search_close">
+        <property name="visible">True</property>
+        <property name="is_important">True</property>
+        <property name="receives_default">True</property>
+        <property name="icon_name">gtk-close</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
   </object>
 </interface>
-- 
cgit v1.2.3


From 64e2c818c7faead9671d959a87d60ce92c082ab1 Mon Sep 17 00:00:00 2001
From: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon, 22 Aug 2011 16:25:49 +0100
Subject: search-bar: make close button non-important stock gtk-close

This has the much nicer side-effect that if it gets thrown off the
side because it doesn't have enough room, the icon and label will be
shown in the expander.

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
---
 libempathy-gtk/empathy-search-bar.ui | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui
index 0cb9f3c7b..f6a615ede 100644
--- a/libempathy-gtk/empathy-search-bar.ui
+++ b/libempathy-gtk/empathy-search-bar.ui
@@ -119,9 +119,8 @@
     <child>
       <object class="GtkToolButton" id="search_close">
         <property name="visible">True</property>
-        <property name="is_important">True</property>
-        <property name="receives_default">True</property>
-        <property name="icon_name">gtk-close</property>
+        <property name="is_important">False</property>
+        <property name="stock_id">gtk-close</property>
       </object>
       <packing>
         <property name="expand">False</property>
-- 
cgit v1.2.3


From 6df8cf14b3b25782ce5437ae0e26e0726da1daa2 Mon Sep 17 00:00:00 2001
From: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon, 22 Aug 2011 16:50:51 +0100
Subject: search-bar: use smaller icons

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
---
 libempathy-gtk/empathy-search-bar.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui
index f6a615ede..e041355ac 100644
--- a/libempathy-gtk/empathy-search-bar.ui
+++ b/libempathy-gtk/empathy-search-bar.ui
@@ -4,7 +4,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkToolbar" id="search_widget">
     <property name="visible">True</property>
-    <property name="icon_size">2</property>
+    <property name="icon_size">1</property>
     <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
     <child>
       <object class="GtkToolItem" id="search_entry_toolitem">
-- 
cgit v1.2.3


From 885456479f37aa5aa500361bef33ac3dd746428a Mon Sep 17 00:00:00 2001
From: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon, 22 Aug 2011 16:51:01 +0100
Subject: search-bar: shorten labels to just Next & Previous

The verb, "Find", is already present on the left of the entry.

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
---
 libempathy-gtk/empathy-search-bar.ui | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui
index e041355ac..cfb8eeddd 100644
--- a/libempathy-gtk/empathy-search-bar.ui
+++ b/libempathy-gtk/empathy-search-bar.ui
@@ -36,10 +36,11 @@
     </child>
     <child>
       <object class="GtkToolButton" id="search_previous">
-        <property name="label" translatable="yes">Find Previous</property>
+        <property name="label" translatable="yes">_Previous</property>
         <property name="visible">True</property>
         <property name="is_important">True</property>
         <property name="icon_name">gtk-go-back-ltr</property>
+        <property name="use_underline">True</property>
       </object>
       <packing>
         <property name="homogeneous">True</property>
@@ -47,10 +48,11 @@
     </child>
     <child>
       <object class="GtkToolButton" id="search_next">
-        <property name="label" translatable="yes">Find Next</property>
+        <property name="label" translatable="yes">_Next</property>
         <property name="visible">True</property>
         <property name="is_important">True</property>
         <property name="icon_name">gtk-go-forward-ltr</property>
+        <property name="use_underline">True</property>
       </object>
       <packing>
         <property name="homogeneous">True</property>
@@ -62,10 +64,11 @@
         <property name="is_important">True</property>
         <child>
           <object class="GtkCheckButton" id="search_match_case">
-            <property name="label" translatable="yes">Match case</property>
+            <property name="label" translatable="yes">Mat_ch case</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="draw_indicator">True</property>
+            <property name="use_underline">True</property>
           </object>
         </child>
       </object>
-- 
cgit v1.2.3