Ticket #3998: cp_unfocus_search.patch

src/jarabe/controlpanel/gui.py

@@ -55 +55 @@
         self.set_resizable(False)
         self.set_modal(True)
 
+        self.set_can_focus(True)
+        self.connect('key-press-event', self.__key_press_event_cb)
+
         self._toolbar = None
         self._canvas = None
         self._table = None
@@ -186 +189 @@
         self._table.show()
         self._scrolledwindow.show()
         entry = self._main_toolbar.get_entry()
-        entry.grab_focus()
         entry.set_text('')
+        self.grab_focus()
+
+    def __key_press_event_cb(self, window, event):
+        entry = self._main_toolbar.get_entry()
+        if not entry.has_focus():
+            entry = self._main_toolbar.get_entry()
+            entry.grab_focus()
+        return False
 
     def _update(self, query):
         for option in self._options:

src/jarabe/controlpanel/toolbar.py

@@ -51 +51 @@
         self._search_entry = iconentry.IconEntry()
         self._search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY,
                                               'system-search')
+        text = _('Search in %s') % _('Control Panel')
+        self._search_entry.set_placeholder_text(text)
         self._search_entry.add_clear_button()
         self._search_entry.set_width_chars(25)
         self._search_entry.connect('changed', self.__search_entry_changed_cb)