diff --git a/src/chat_control.py b/src/chat_control.py index 50dd0c999..925b0f54d 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -179,6 +179,11 @@ class ChatControlBase(MessageControl): elif event.keyval == gtk.keysyms.Tab: # CTRL + TAB self.parent_win.move_to_next_unread_tab(True) return True + # CTRL + PAGE_[UP|DOWN]: send to parent notebook + elif event.keyval == gtk.keysyms.Page_Down or \ + event.keyval == gtk.keysyms.Page_Up: + self.parent_win.notebook.emit('key_press_event', event) + return True elif event.keyval == gtk.keysyms.m and \ (event.state & gtk.gdk.MOD1_MASK): # alt + m opens emoticons menu if gajim.config.get('useemoticons'): @@ -225,13 +230,18 @@ class ChatControlBase(MessageControl): return True # SHIFT + PAGE_[UP|DOWN]: send to conv_textview elif event.keyval == gtk.keysyms.Page_Down or \ - event.keyval == gtk.keysyms.Page_Up: + event.keyval == gtk.keysyms.Page_Up: self.conv_textview.emit('key_press_event', event) return True elif event.state & gtk.gdk.CONTROL_MASK: if event.keyval == gtk.keysyms.Tab: # CTRL + TAB self.parent_win.move_to_next_unread_tab(True) return True + # CTRL + PAGE_[UP|DOWN]: send to parent notebook + elif event.keyval == gtk.keysyms.Page_Down or \ + event.keyval == gtk.keysyms.Page_Up: + self.parent_win.notebook.emit('key_press_event', event) + return True # we pressed a control key or ctrl+sth: we don't block # the event in order to let ctrl+c (copy text) and # others do their default work diff --git a/src/message_window.py b/src/message_window.py index d075562a5..d2d38423a 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -167,9 +167,9 @@ class MessageWindow: if event.state & gtk.gdk.CONTROL_MASK: # Tab switch bindings if event.keyval == gtk.keysyms.Tab: # CTRL + TAB - self.notebook.emit('key_press_event', event) + self.move_to_next_unread_tab(True) elif event.keyval == gtk.keysyms.ISO_Left_Tab: # CTRL + SHIFT + TAB - self.notebook.emit('key_press_event', event) + self.move_to_next_unread_tab(False) elif event.keyval == gtk.keysyms.Page_Down: # CTRL + PAGE DOWN self.notebook.emit('key_press_event', event) elif event.keyval == gtk.keysyms.Page_Up: # CTRL + PAGE UP @@ -430,14 +430,6 @@ class MessageWindow: self.move_to_next_unread_tab(False) elif event.keyval == gtk.keysyms.Tab: # CTRL + TAB self.move_to_next_unread_tab(True) - elif event.keyval == gtk.keysyms.Page_Down or\ - event.keyval == gtk.keysyms.Page_Up: # CTRL + PAGE UP|DOWN - # construct event instance from binding - event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - self.notebook.emit('key_press_event', event) elif event.keyval == gtk.keysyms.F4: # CTRL + F4 self.remove_tab(contact) elif event.keyval == gtk.keysyms.w: # CTRL + W