Commit adf5a977 authored by louiz’'s avatar louiz’

Remove ^J from the shortcuts triggering the Enter event, because

we’ll use it to add a (real) \n into the input’s text.
Also remove "\n" because it’s useless
parent b707696b
......@@ -196,14 +196,14 @@ class TextMultiWin(FieldInput, windows.Win):
elif key == 'KEY_RIGHT':
if self.val_pos < len(self.options)-1:
self.val_pos += 1
elif key in ('^J', '^M', '\n'):
elif key == '^M':
self.edition_input = windows.Input()
self.edition_input.color = self.color
self.edition_input.resize(self.height, self.width, self.y, self.x)
self.edition_input.text = self.options[self.val_pos]
self.edition_input.key_end()
else:
if key in ('^J', '^M', '\n'):
if key == '^M':
self.options[self.val_pos] = self.edition_input.get_text()
if not self.options[self.val_pos] and self.val_pos != len(self.options) -1:
del self.options[self.val_pos]
......
......@@ -219,16 +219,14 @@ class ChatTab(Tab):
"""
A tab containing a chat of any type.
Just use this class instead of Tab if the tab needs a recent-words completion
Also, \n, ^J and ^M are already bound to on_enter
Also, ^M is already bound to on_enter
And also, add the /say command
"""
def __init__(self, core, room):
Tab.__init__(self, core)
self._room = room
self.key_func['M-/'] = self.last_words_completion
self.key_func['^J'] = self.on_enter
self.key_func['^M'] = self.on_enter
self.key_func['\n'] = self.on_enter
self.commands['say'] = (self.command_say,
_("""Usage: /say <message>\nSay: Just send the message.
Useful if you want your message to begin with a '/'"""), None)
......@@ -282,9 +280,7 @@ class InfoTab(ChatTab):
self.input = windows.Input()
self.name = "Info"
self.color_state = theme.COLOR_TAB_NORMAL
self.key_func['^J'] = self.on_enter
self.key_func['^M'] = self.on_enter
self.key_func['\n'] = self.on_enter
self.key_func['^I'] = self.completion
self.key_func['M-i'] = self.completion
self.resize()
......@@ -804,7 +800,6 @@ class RosterInfoTab(Tab):
self.set_color_state(theme.COLOR_TAB_NORMAL)
self.key_func['^I'] = self.completion
self.key_func['M-i'] = self.completion
self.key_func["^J"] = self.on_enter
self.key_func["^M"] = self.on_enter
self.key_func[' '] = self.on_space
self.key_func["/"] = self.on_slash
......@@ -1217,7 +1212,6 @@ class MucListTab(Tab):
self.key_func["/"] = self.on_slash
self.key_func['j'] = self.join_selected
self.key_func['J'] = self.join_selected_no_focus
self.key_func['^J'] = self.join_selected
self.key_func['^M'] = self.join_selected
self.commands['close'] = (self.close, _("Usage: /close\nClose: Just close this tab"), None)
self.resize()
......
......@@ -1118,9 +1118,7 @@ class CommandInput(Input):
self.on_success = on_success
self.on_input = on_input
self.help_message = help_message
self.key_func['^J'] = self.success
self.key_func['^M'] = self.success
self.key_func['\n'] = self.success
self.key_func['^G'] = self.abort
self.key_func['^C'] = self.abort
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment