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

fix newline in history textview and timestamp in conversation textview

Browse source
This commit is contained in:
Denis Fomin 2013-01-08 13:22:33 +04:00
parent a9464b4cf6
commit 402e1e241d
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/conversation_textview.py
View file

@ -1233,8 +1233,11 @@ class ConversationTextview(GObject.GObject):
if current_print_time == 'always' and kind != 'info' and not simple: if current_print_time == 'always' and kind != 'info' and not simple:
timestamp_str = self.get_time_to_show(tim) timestamp_str = self.get_time_to_show(tim)
timestamp = time.strftime(timestamp_str, tim) timestamp = time.strftime(timestamp_str, tim)
buffer_.insert_with_tags_by_name(end_iter, timestamp, if other_tags_for_time:
*other_tags_for_time) buffer_.insert_with_tags_by_name(end_iter, timestamp,
*other_tags_for_time)
else:
buffer_.insert (end_iter, timestamp)
elif current_print_time == 'sometimes' and kind != 'info' and not simple: elif current_print_time == 'sometimes' and kind != 'info' and not simple:
every_foo_seconds = 60 * gajim.config.get( every_foo_seconds = 60 * gajim.config.get(
'print_ichat_every_foo_minutes') 'print_ichat_every_foo_minutes')
@ -1248,7 +1251,7 @@ class ConversationTextview(GObject.GObject):
else: else:
tim_format = self.get_time_to_show(tim) tim_format = self.get_time_to_show(tim)
buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n', buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n',
'time_sometimes') 'time_sometimes')
# If there's a displaymarking, print it here. # If there's a displaymarking, print it here.
if displaymarking: if displaymarking:
self.print_displaymarking(displaymarking) self.print_displaymarking(displaymarking)

10
src/history_window.py
View file

@ -472,8 +472,10 @@ class HistoryWindow:
after_str = gajim.config.get('after_nickname') after_str = gajim.config.get('after_nickname')
after_str = helpers.from_one_line(after_str) after_str = helpers.from_one_line(after_str)
format = before_str + contact_name + after_str + ' ' format = before_str + contact_name + after_str + ' '
buf.insert_with_tags_by_name(end_iter, format, tag_name) if tag_name:
buf.insert_with_tags_by_name(end_iter, format, tag_name)
else:
buf.insert(end_iter, format)
if subject: if subject:
message = _('Subject: %s\n') % subject + message message = _('Subject: %s\n') % subject + message
xhtml = None xhtml = None
@ -486,7 +488,9 @@ class HistoryWindow:
else: else:
self.history_textview.print_real_text(message, name=contact_name, self.history_textview.print_real_text(message, name=contact_name,
xhtml=xhtml) xhtml=xhtml)
self.history_textview.print_real_text('\n') buffer_ = self.history_textview.tv.get_buffer()
eob = buffer_.get_end_iter()
buffer_.insert_with_tags_by_name(eob, '\n', 'eol')
def on_search_entry_activate(self, widget): def on_search_entry_activate(self, widget):
text = self.search_entry.get_text() text = self.search_entry.get_text()