diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index f8afca3..b479c23 100644
a
|
b
|
class ControlPanel(Gtk.Window): |
55 | 55 | self.set_resizable(False) |
56 | 56 | self.set_modal(True) |
57 | 57 | |
| 58 | self.set_can_focus(True) |
| 59 | self.connect('key-press-event', self.__key_press_event_cb) |
| 60 | |
58 | 61 | self._toolbar = None |
59 | 62 | self._canvas = None |
60 | 63 | self._table = None |
… |
… |
class ControlPanel(Gtk.Window): |
186 | 189 | self._table.show() |
187 | 190 | self._scrolledwindow.show() |
188 | 191 | entry = self._main_toolbar.get_entry() |
189 | | entry.grab_focus() |
190 | 192 | entry.set_text('') |
| 193 | self.grab_focus() |
| 194 | |
| 195 | def __key_press_event_cb(self, window, event): |
| 196 | entry = self._main_toolbar.get_entry() |
| 197 | if not entry.has_focus(): |
| 198 | entry = self._main_toolbar.get_entry() |
| 199 | entry.grab_focus() |
| 200 | return False |
191 | 201 | |
192 | 202 | def _update(self, query): |
193 | 203 | for option in self._options: |
diff --git a/src/jarabe/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py
index 2094d3b..575d927 100644
a
|
b
|
class MainToolbar(Gtk.Toolbar): |
51 | 51 | self._search_entry = iconentry.IconEntry() |
52 | 52 | self._search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, |
53 | 53 | 'system-search') |
| 54 | text = _('Search in %s') % _('Control Panel') |
| 55 | self._search_entry.set_placeholder_text(text) |
54 | 56 | self._search_entry.add_clear_button() |
55 | 57 | self._search_entry.set_width_chars(25) |
56 | 58 | self._search_entry.connect('changed', self.__search_entry_changed_cb) |