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

no need of print_with_tag_list function, we can use buffer.insert_with_tags_by_name() (Thx Liorithiel)

This commit is contained in:
Yann Leboulanger 2005-06-23 21:35:54 +00:00
parent bd0d5cf94b
commit 0433b146c7
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/chat.py
View File

@ -623,14 +623,6 @@ class Chat:
#we launch the correct application #we launch the correct application
self.plugin.launch_browser_mailer(kind, word) self.plugin.launch_browser_mailer(kind, word)
def print_with_tag_list(self, buffer, text, iter, tag_list):
begin_mark = buffer.create_mark('begin_tag', iter, True)
buffer.insert(iter, text)
begin_tagged = buffer.get_iter_at_mark(begin_mark)
for tag in tag_list:
buffer.apply_tag_by_name(tag, begin_tagged, iter)
buffer.delete_mark(begin_mark)
def detect_and_print_special_text(self, otext, jid, other_tags): def detect_and_print_special_text(self, otext, jid, other_tags):
textview = self.xmls[jid].get_widget('conversation_textview') textview = self.xmls[jid].get_widget('conversation_textview')
buffer = textview.get_buffer() buffer = textview.get_buffer()
@ -650,8 +642,8 @@ class Chat:
if start != 0: if start != 0:
text_before_special_text = otext[index:start] text_before_special_text = otext[index:start]
end_iter = buffer.get_end_iter() end_iter = buffer.get_end_iter()
self.print_with_tag_list(buffer, text_before_special_text, buffer.insert_with_tags_by_name(end_iter,
end_iter, other_tags) text_before_special_text, *other_tags)
index = end # update index index = end # update index
#now print it #now print it
@ -724,8 +716,7 @@ class Chat:
all_tags = tags[:] all_tags = tags[:]
if use_other_tags: if use_other_tags:
all_tags += other_tags all_tags += other_tags
self.print_with_tag_list(buffer, special_text, buffer.insert_with_tags_by_name(end_iter, special_text, *all_tags)
end_iter, all_tags)
def scroll_to_end(self, textview): def scroll_to_end(self, textview):
parent = textview.get_parent() parent = textview.get_parent()
@ -746,6 +737,7 @@ class Chat:
other_tags_for_text = []): other_tags_for_text = []):
textview = self.xmls[jid].get_widget('conversation_textview') textview = self.xmls[jid].get_widget('conversation_textview')
buffer = textview.get_buffer() buffer = textview.get_buffer()
buffer.begin_user_action()
at_the_end = False at_the_end = False
end_iter = buffer.get_end_iter() end_iter = buffer.get_end_iter()
end_rect = textview.get_iter_location(end_iter) end_rect = textview.get_iter_location(end_iter)
@ -763,8 +755,8 @@ class Chat:
after_str = gajim.config.get('after_time') after_str = gajim.config.get('after_time')
format = before_str + '%H:%M:%S' + after_str format = before_str + '%H:%M:%S' + after_str
tim_format = time.strftime(format, tim) tim_format = time.strftime(format, tim)
self.print_with_tag_list(buffer, tim_format + ' ', end_iter, buffer.insert_with_tags_by_name(end_iter, tim_format + ' ',
other_tags_for_time) *other_tags_for_time)
elif gajim.config.get('print_time') == 'sometimes': elif gajim.config.get('print_time') == 'sometimes':
if (time.time() - self.last_time_printout[jid]) > (5*60): if (time.time() - self.last_time_printout[jid]) > (5*60):
self.last_time_printout[jid] = time.time() self.last_time_printout[jid] = time.time()
@ -795,14 +787,14 @@ class Chat:
before_str = gajim.config.get('before_nickname') before_str = gajim.config.get('before_nickname')
after_str = gajim.config.get('after_nickname') after_str = gajim.config.get('after_nickname')
format = before_str + name + after_str + ' ' format = before_str + name + after_str + ' '
self.print_with_tag_list(buffer, format, end_iter, name_tags) buffer.insert_with_tags_by_name(end_iter, format, *name_tags)
# detect urls formatting and if the user has it on emoticons # detect urls formatting and if the user has it on emoticons
index = self.detect_and_print_special_text(text, jid, text_tags) index = self.detect_and_print_special_text(text, jid, text_tags)
# add the rest of text located in the index and after # add the rest of text located in the index and after
end_iter = buffer.get_end_iter() end_iter = buffer.get_end_iter()
self.print_with_tag_list(buffer, text[index:], end_iter, text_tags) buffer.insert_with_tags_by_name(end_iter, text[index:], *text_tags)
#scroll to the end of the textview #scroll to the end of the textview
end = False end = False
@ -811,6 +803,9 @@ class Chat:
end = True end = True
# We scroll to the end after the scrollbar has appeared # We scroll to the end after the scrollbar has appeared
gobject.idle_add(self.scroll_to_end, textview) gobject.idle_add(self.scroll_to_end, textview)
buffer.end_user_action()
if (jid != self.get_active_jid() or \ if (jid != self.get_active_jid() or \
not self.window.is_active() or \ not self.window.is_active() or \
not end) and kind == 'incoming': not end) and kind == 'incoming':