Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@laptop.org>2012-10-07 17:07:13 (GMT)
committer Simon Schampijer <simon@laptop.org>2012-10-09 17:33:44 (GMT)
commit4baef0b242305999172e898b67987b646cdbf085 (patch)
treecdddab023850df7e82274b00c50ad307aed8fd88
parent642416bab7afd62bb6879e2ba97377308d44370c (diff)
Journal key: do only reveal Journal without focusing the search entry, SL #3988
Follow up of 7d039ea4d3ec1af00e19d99c4517fbde90fc9d67 Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-by: Manuel QuiƱones <manuq@laptop.org>
-rw-r--r--src/jarabe/journal/journalactivity.py9
-rw-r--r--src/jarabe/view/keyhandler.py2
2 files changed, 3 insertions, 8 deletions
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 89d33a3..4bb68fd 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -336,9 +336,6 @@ class JournalActivity(JournalWindow):
metadata['bundle_id'] = bundle.get_bundle_id()
model.write(metadata)
- def search_grab_focus(self):
- self._main_toolbox.search_entry.grab_focus()
-
def __window_state_event_cb(self, window, event):
logging.debug('window_state_event_cb %r', self)
if event.changed_mask & Gdk.WindowState.ICONIFIED:
@@ -376,12 +373,10 @@ class JournalActivity(JournalWindow):
def set_active_volume(self, mount):
self._volumes_toolbar.set_active_volume(mount)
- def focus_search(self):
- """Become visible and give focus to the search entry
- """
+ def show_journal(self):
+ """Become visible and show main view"""
self.reveal()
self.show_main_view()
- self.search_grab_focus()
def get_journal():
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index ef035fb..cb47d17 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -160,7 +160,7 @@ class KeyHandler(object):
session.get_session_manager().shutdown()
def handle_open_search(self, event_time):
- journalactivity.get_journal().focus_search()
+ journalactivity.get_journal().show_journal()
def _key_pressed_cb(self, grabber, keycode, state, event_time):
key = grabber.get_key(keycode, state)