Cleaning up the search bar

diff --git a/data/gonvert.glade b/data/gonvert.glade
index dd5c745..964f625 100644 (file)
--- a/data/gonvert.glade
+++ b/data/gonvert.glade
@@ -210,7 +210,6 @@
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">in</property>
                         <child>
                           <widget class="GtkViewport" id="maemo5HackViewport">
                             <property name="visible">True</property>
@@ -272,29 +271,30 @@
                   <widget class="GtkHBox" id="searchLayout">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkEntry" id="findEntry">
+                      <widget class="GtkButton" id="findButton">
+                        <property name="label" translatable="yes">gtk-find</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Enter unit to find here</property>
-                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <accelerator key="F6" signal="clicked"/>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="findButton">
-                        <property name="label" translatable="yes">Find</property>
+                      <widget class="GtkEntry" id="findEntry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                        <accelerator key="F6" signal="clicked"/>
+                        <property name="tooltip" translatable="yes">Enter unit to find here</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -310,10 +310,25 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkButton" id="closeSearchButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <child>
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-close</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">4</property>
                   </packing>
                 </child>

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index 5855eee..ea8cd38 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -116,7 +116,6 @@ class Gonvert(object):
                change_menu_label(widgets, 'exitMenuItem', _('Exit'))
                change_menu_label(widgets, 'helpMenuItem', _('Help'))
                change_menu_label(widgets, 'aboutMenuItem', _('About'))
-               change_menu_label(widgets, 'findButton', _('Find'))
 
                self._categorySelectionButton = widgets.get_widget("categorySelectionButton")
                self._categoryView = widgets.get_widget('categoryView')
@@ -140,6 +139,7 @@ class Gonvert(object):
                self._findEntry = widgets.get_widget('findEntry')
                self._findLabel = widgets.get_widget('findLabel')
                self._findButton = widgets.get_widget('findButton')
+               self._closeSearchButton = widgets.get_widget('closeSearchButton')
 
                self._unitsNameRenderer = gtk.CellRendererText()
                self._unitsNameRenderer.set_property("scale", 0.75)
@@ -224,6 +224,7 @@ class Gonvert(object):
                self._findButton.connect("clicked", self._on_find_activate)
                self._findEntry.connect("activate", self._on_find_activate)
                self._findEntry.connect("changed", self._on_findEntry_changed)
+               self._closeSearchButton.connect("clicked", self._on_toggle_search)
                self._previousUnitValue.connect("changed", self._on_previous_unit_value_changed)
                self._unitValue.connect("changed", self._on_unit_value_changed)
                self._unitValue.connect("key-press-event", self._on_browse_key_press)