From e6b3fb40e3b8361faf6ecbb711c9b80b04a0ba5e Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 8 Jan 2013 21:56:36 +0100 Subject: [PATCH] fix emitting key_press_event --- src/chat_control.py | 4 ++-- src/message_window.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 7d5b9b19c..46aa6d3f3 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -701,7 +701,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up)): return False - self.parent_win.notebook.emit('key_press_event', event) + self.parent_win.notebook.event(event) return True def show_emoticons_menu(self): @@ -766,7 +766,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # SHIFT + PAGE_[UP|DOWN]: send to conv_textview elif event.keyval == Gdk.KEY_Page_Down or \ event.keyval == Gdk.KEY_Page_Up: - self.conv_textview.tv.emit('key_press_event', event) + self.conv_textview.tv.event(event) return True elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: # CTRL + TAB diff --git a/src/message_window.py b/src/message_window.py index d7271b281..3a907972a 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -337,9 +337,9 @@ class MessageWindow(object): elif event.keyval == Gdk.KEY_ISO_Left_Tab: # CTRL + SHIFT + TAB self.move_to_next_unread_tab(False) elif event.keyval == Gdk.KEY_Page_Down: # CTRL + PAGE DOWN - self.notebook.emit('key_press_event', event) + self.notebook.event(event) elif event.keyval == Gdk.KEY_Page_Up: # CTRL + PAGE UP - self.notebook.emit('key_press_event', event) + self.notebook.event(event) def accel_group_func(self, accel_group, acceleratable, keyval, modifier): st = '1234567890' # alt+1 means the first tab (tab 0) @@ -400,7 +400,7 @@ class MessageWindow(object): event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK event.keyval = int(keyval) - self.notebook.emit('key_press_event', event) + self.notebook.event(event) return True if modifier & Gdk.ModifierType.SHIFT_MASK: @@ -823,7 +823,7 @@ class MessageWindow(object): return True # SHIFT + PAGE_[UP|DOWN]: send to conv_textview elif event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - control.conv_textview.tv.emit('key_press_event', event) + control.conv_textview.tv.event(event) return True elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: # CTRL + TAB @@ -845,7 +845,7 @@ class MessageWindow(object): if isinstance(control, ChatControlBase): # we forwarded it to message textview - control.msg_textview.emit('key_press_event', event) + control.msg_textview.event(event) control.msg_textview.grab_focus() def get_tab_at_xy(self, x, y):