From 4b61a8682c62ababc356b59b06de14f85f8c8f28 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Fri, 11 Mar 2011 00:35:26 +0300 Subject: [PATCH] Fixed previous changeset and prevent traceback in command system --- src/command_system/implementation/middleware.py | 4 ++-- src/groupchat_control.py | 2 +- src/message_textview.py | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/command_system/implementation/middleware.py b/src/command_system/implementation/middleware.py index 4bc9aeb4a..ce764e816 100644 --- a/src/command_system/implementation/middleware.py +++ b/src/command_system/implementation/middleware.py @@ -175,7 +175,7 @@ class CommandTools: Add given text to the input history, so user can scroll through it using ctrl + up/down arrow keys. """ - self.save_sent_message(text) + self.save_message(text, 'sent') @property def connection(self): @@ -189,4 +189,4 @@ class CommandTools: """ Get a full JID of the contact. """ - return self.contact.get_full_jid() \ No newline at end of file + return self.contact.get_full_jid() diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 0ae3a56c6..d347ae8b1 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1809,7 +1809,7 @@ class GroupchatControl(ChatControlBase): label = self.get_seclabel() if message != '' or message != '\n': - self.save_sent_message(message) + self.save_message(message, 'sent') # Send the message gajim.connections[self.account].send_gc_message(self.room_jid, diff --git a/src/message_textview.py b/src/message_textview.py index 3a474173b..70cf3afea 100644 --- a/src/message_textview.py +++ b/src/message_textview.py @@ -345,6 +345,18 @@ gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Down, gtk.gdk.CONTROL_MASK, 'mykeypress', int, gtk.keysyms.Down, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK) +# CTRL + SHIFT + UP +gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Up, + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, 'mykeypress', int, + gtk.keysyms.Up, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK | + gtk.gdk.SHIFT_MASK) + +# CTRL + SHIFT + DOWN +gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Down, + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, 'mykeypress', int, + gtk.keysyms.Down, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK | + gtk.gdk.SHIFT_MASK) + # ENTER gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.Return, 0, 'mykeypress', int, gtk.keysyms.Return,