Ticket #67: im.diff

Widgets.py

@@ -187 +187 @@
 gobject.type_register( avatarHolder )
 
 
+class inputBox( gtk.TextView ):
+    __gsignals__ = {
+        'message-send':(gobject.SIGNAL_RUN_LAST|gobject.SIGNAL_ACTION,
+                        gobject.TYPE_NONE, ()),
+        'escape-pressed':(gobject.SIGNAL_RUN_LAST|gobject.SIGNAL_ACTION,
+                          gobject.TYPE_NONE, ())
+    }
+    def __init__(self):
+        gobject.GObject.__init__(self)
+        gtk.binding_entry_add_signal(self, gtk.keysyms.KP_Enter, 0, 'message-send')
+        gtk.binding_entry_add_signal(self, gtk.keysyms.Return, 0, 'message-send')
+        gtk.binding_entry_add_signal(self, gtk.keysyms.Escape, 0, 'escape-pressed')
+        
+gobject.type_register( inputBox )

ConversationUI.py

@@ -553 +553 @@
 
         self.pack_end(self.hboxFrame, False, False, 2)
             
-        self.input = gtk.TextView()
+        self.input = Widgets.inputBox()
         self.input.set_left_margin( 6 )
         self.input.set_right_margin( 6 )
         self.input.set_wrap_mode(gtk.WRAP_WORD)
@@ -568 +568 @@
         frameInput.add(self.scrollInput)
         
         self.pack_start(frameInput, True, True, 0)
-        
+
         self.inputBuffer.connect( 'changed', self.on_changed_event )
         self.input.connect( 'key-press-event' , self.on_key_press_event )
+        self.input.connect_after( 'message-send', self.message_send)
+        self.input.connect_after( 'escape-pressed', self.on_escape_pressed_event)
         
         self.input.connect_after( 'map-event', self.on_input_map_event )
         self.input.grab_focus()
@@ -749 +751 @@
                                         self.inputBuffer.get_start_iter(),
                                         self.inputBuffer.get_end_iter() )
         
-    def on_key_press_event( self , widget, event ):
-        if not( event.state & gtk.gdk.SHIFT_MASK ) and \
-            not( event.state & gtk.gdk.CONTROL_MASK ) and \
-            not( event.state & gtk.gdk.MOD1_MASK ) and \
-            ( event.keyval == gtk.keysyms.Return or
-                event.keyval == gtk.keysyms.KP_Enter ):
-                    
+    def message_send(self, widget):
             if self.id_timeout != None:
                 gobject.source_remove( self.id_timeout )
                 self.id_timeout = None
 
             return self.sendMessage()
-        
-        elif event.keyval == gtk.keysyms.Escape:
-            self.parentUI.getParentConversation().close()
-        
-        elif event.keyval == gtk.keysyms.space:
+
+    def on_escape_pressed_event( self, widget ):
+        self.parentUI.getParentConversation().close()
+
+    def on_key_press_event( self , widget, event ):
+        if event.keyval == gtk.keysyms.space:
             if self.id_timeout != None:
                 gobject.source_remove( self.id_timeout )
                 self.id_timeout = None