copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restore key bindings in textview

This commit is contained in:
Yann Leboulanger 2013-07-31 15:05:45 +02:00
parent fb42680c3d
commit 2ad5b544c4
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/chat_control.py
View File

@ -754,7 +754,24 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
return True return True
################################################################################ ################################################################################
# temporary solution instead Gtk.binding_entry_add_signal # temporary solution instead Gtk.binding_entry_add_signal
if event.keyval == Gdk.KEY_Return or \ message_buffer = self.msg_textview.get_buffer()
event_state = event.get_state()
if event.keyval == Gdk.KEY_Up:
if event_state & Gdk.ModifierType.CONTROL_MASK:
if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP
self.scroll_messages('up', message_buffer, 'received')
else: # Ctrl+UP
self.scroll_messages('up', message_buffer, 'sent')
return True
elif event.keyval == Gdk.KEY_Down:
if event_state & Gdk.ModifierType.CONTROL_MASK:
if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down
self.scroll_messages('down', message_buffer, 'received')
else: # Ctrl+Down
self.scroll_messages('down', message_buffer, 'sent')
return True
elif event.keyval == Gdk.KEY_Return or \
event.keyval == Gdk.KEY_KP_Enter: # ENTER event.keyval == Gdk.KEY_KP_Enter: # ENTER
message_textview = widget message_textview = widget
message_buffer = message_textview.get_buffer() message_buffer = message_textview.get_buffer()
@ -763,7 +780,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
xhtml = self.msg_textview.get_xhtml() xhtml = self.msg_textview.get_xhtml()
if gajim.config.get('send_on_ctrl_enter'): if gajim.config.get('send_on_ctrl_enter'):
if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER if event_state & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER
send_message = True send_message = True
else: else:
end_iter = message_buffer.get_end_iter() end_iter = message_buffer.get_end_iter()
@ -771,7 +788,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
send_message = False send_message = False
else: # send on Enter, do newline on Ctrl Enter else: # send on Enter, do newline on Ctrl Enter
if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER if event_state & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER
end_iter = message_buffer.get_end_iter() end_iter = message_buffer.get_end_iter()
message_buffer.insert_at_cursor('\n') message_buffer.insert_at_cursor('\n')
send_message = False send_message = False
@ -787,6 +804,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
if send_message: if send_message:
self.send_message(message, xhtml=xhtml) # send the message self.send_message(message, xhtml=xhtml) # send the message
return True return True
elif event.keyval == Gdk.KEY_z: # CTRL+z
if event_state & Gdk.ModifierType.CONTROL_MASK:
self.msg_textview.undo()
return True
################################################################################ ################################################################################
return False return False
@ -1414,16 +1435,19 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
if pos == size and size > 0 and direction == 'up' and \ if pos == size and size > 0 and direction == 'up' and \
msg_type == 'sent' and not self.correcting: msg_type == 'sent' and not self.correcting:
self.correcting = True self.correcting = True
self.old_message_tv_color = self.msg_textview.get_style().base[ context = self.msg_textview.get_style_context()
Gtk.StateType.NORMAL] state = Gtk.StateFlags.NORMAL
self.msg_textview.modify_base(Gtk.StateType.NORMAL, Gdk.color_parse( self.old_message_tv_color = context.get_background_color(state)
'PaleGoldenrod')) color = Gdk.RGBA()
Gdk.RGBA.parse(color, 'PaleGoldenrod')
self.msg_textview.override_background_color(Gtk.StateType.NORMAL,
color)
message = history[pos - 1] message = history[pos - 1]
msg_buf.set_text(message) msg_buf.set_text(message)
return return
if self.correcting: if self.correcting:
# We were previously correcting # We were previously correcting
self.msg_textview.modify_base(Gtk.StateType.NORMAL, self.msg_textview.override_background_color(Gtk.StateType.NORMAL,
self.old_message_tv_color) self.old_message_tv_color)
self.correcting = False self.correcting = False
pos += -1 if direction == 'up' else +1 pos += -1 if direction == 'up' else +1