CTRL+PGDN|PGUP restored. closes #1413

This commit is contained in:
Travis Shirk 2006-01-19 01:30:18 +00:00
parent e556473f29
commit 74b7b3d578
2 changed files with 13 additions and 11 deletions

View File

@ -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

View File

@ -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