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

Use the same code path for shift-enter as for ctrl-enter.

This commit is contained in:
Tomasz Miąsko 2017-01-25 17:13:41 +01:00
parent 0b7d6cc175
commit b678165d7d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/chat_control_base.py
View File

@ -678,16 +678,17 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
return True return True
elif event.keyval == Gdk.KEY_Return or \ elif event.keyval == Gdk.KEY_Return or \
event.keyval == Gdk.KEY_KP_Enter: # ENTER event.keyval == Gdk.KEY_KP_Enter: # ENTER
if event_state & Gdk.ModifierType.SHIFT_MASK:
return False
message_textview = widget message_textview = widget
message_buffer = message_textview.get_buffer() message_buffer = message_textview.get_buffer()
start_iter, end_iter = message_buffer.get_bounds() start_iter, end_iter = message_buffer.get_bounds()
message = message_buffer.get_text(start_iter, end_iter, False) message = message_buffer.get_text(start_iter, end_iter, False)
xhtml = self.msg_textview.get_xhtml() xhtml = self.msg_textview.get_xhtml()
is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK) if event_state & Gdk.ModifierType.SHIFT_MASK:
send_message = is_ctrl_enter == gajim.config.get('send_on_ctrl_enter') send_message = False
else:
is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK)
send_message = is_ctrl_enter == gajim.config.get('send_on_ctrl_enter')
if send_message and gajim.connections[self.account].connected < 2: if send_message and gajim.connections[self.account].connected < 2:
# we are not connected # we are not connected