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

Final touches on chatstate notifications

This commit is contained in:
Travis Shirk 2005-09-05 01:39:42 +00:00
parent 1984dc9e8e
commit 8a6113f159
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat.py
View File

@ -160,14 +160,9 @@ class Chat:
self.window.set_title(title) self.window.set_title(title)
gtkgui_helpers.set_unset_urgency_hint(self.window, unread) gtkgui_helpers.set_unset_urgency_hint(self.window, unread)
def redraw_tab(self, contact, chatstate = None): def redraw_tab(self, jid, chatstate = None):
'''redraw the label of the tab '''redraw the label of the tab
if chatstate is given that means we have HE SENT US a chatstate''' if chatstate is given that means we have HE SENT US a chatstate'''
if isinstance(contact, unicode):
jid = contact
else:
jid = contact.jid
unread = '' unread = ''
if self.nb_unread[jid] > 1: if self.nb_unread[jid] > 1:
unread = '[' + unicode(self.nb_unread[jid]) + '] ' unread = '[' + unicode(self.nb_unread[jid]) + '] '

17
src/tabbed_chat_window.py
View File

@ -368,8 +368,6 @@ timestamp, contact):
message_textview = self.xmls[contact.jid].get_widget('message_textview') message_textview = self.xmls[contact.jid].get_widget('message_textview')
message_tv_buffer = message_textview.get_buffer() message_tv_buffer = message_textview.get_buffer()
message_tv_buffer.connect('insert-text',
self.on_message_tv_buffer_insert_text, contact.jid)
message_tv_buffer.connect('changed', message_tv_buffer.connect('changed',
self.on_message_tv_buffer_changed, contact) self.on_message_tv_buffer_changed, contact)
@ -381,7 +379,7 @@ timestamp, contact):
self.tabbed_chat_popup_menu = xm.get_widget('tabbed_chat_popup_menu') self.tabbed_chat_popup_menu = xm.get_widget('tabbed_chat_popup_menu')
chat.Chat.new_tab(self, contact.jid) chat.Chat.new_tab(self, contact.jid)
self.redraw_tab(contact) self.redraw_tab(contact.jid)
self.draw_widgets(contact) self.draw_widgets(contact)
# restore previous conversation # restore previous conversation
@ -408,7 +406,7 @@ timestamp, contact):
contact = gajim.get_first_contact_instance_from_jid(account, jid) contact = gajim.get_first_contact_instance_from_jid(account, jid)
self.draw_name_banner(contact, chatstate) self.draw_name_banner(contact, chatstate)
# update chatstate in tab for this chat # update chatstate in tab for this chat
self.redraw_tab(contact, chatstate) self.redraw_tab(contact.jid, chatstate)
def check_for_possible_paused_chatstate(self, jid): def check_for_possible_paused_chatstate(self, jid):
''' did we move mouse of that window or write something in message ''' did we move mouse of that window or write something in message
@ -470,17 +468,12 @@ timestamp, contact):
return True # loop forever return True # loop forever
def on_message_tv_buffer_insert_text(self, textbuffer, textiter, text, length, jid):
self.kbd_activity_in_last_5_secs = True
self.kbd_activity_in_last_30_secs = True
# XXX: only send the event every N'th character after the first N... optimization
self.send_chatstate('composing', jid)
def on_message_tv_buffer_changed(self, textbuffer, contact): def on_message_tv_buffer_changed(self, textbuffer, contact):
self.kbd_activity_in_last_5_secs = True self.kbd_activity_in_last_5_secs = True
self.kbd_activity_in_last_30_secs = True self.kbd_activity_in_last_30_secs = True
# All characters have been erased, undo composing if textbuffer.get_char_count():
if textbuffer.get_char_count() == 0: self.send_chatstate('composing', contact.jid)
else:
self.send_chatstate('active', contact.jid) self.send_chatstate('active', contact.jid)
def reset_kbd_mouse_timeout_vars(self): def reset_kbd_mouse_timeout_vars(self):