aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2011-08-23 16:31:28 +0800
committerJonny Lamb <jonnylamb@gnome.org>2011-08-23 16:31:28 +0800
commit20a005394616e171ab3c7a974122bfa01df426a2 (patch)
tree38ffb346e7b83d10ab3174de68dbd94b4211e7da
parent2c55a1ac6432591d45dc396e8353b6840eedb5b8 (diff)
parent885456479f37aa5aa500361bef33ac3dd746428a (diff)
downloadgsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.tar
gsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.tar.gz
gsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.tar.bz2
gsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.tar.lz
gsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.tar.xz
gsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.tar.zst
gsoc2013-empathy-20a005394616e171ab3c7a974122bfa01df426a2.zip
Merge branch 'search-bar'
-rw-r--r--libempathy-gtk/empathy-search-bar.ui43
1 files changed, 27 insertions, 16 deletions
diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui
index 7d42594d2..cfb8eeddd 100644
--- a/libempathy-gtk/empathy-search-bar.ui
+++ b/libempathy-gtk/empathy-search-bar.ui
@@ -4,21 +4,9 @@
<!-- 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="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>
<child>
@@ -48,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>
@@ -59,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>
@@ -74,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>
@@ -119,5 +110,25 @@
</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">False</property>
+ <property name="stock_id">gtk-close</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
</interface>