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

improve RTL behaviour. See #7284

Browse source
This commit is contained in:
Yann Leboulanger 2013-02-16 23:49:39 +01:00
parent 4b797e4d3c
commit 63557c8c05
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/conversation_textview.py
View file

@ -1241,17 +1241,22 @@ class ConversationTextview(GObject.GObject):
# We don't have tim for outgoing messages... # We don't have tim for outgoing messages...
tim = time.localtime() tim = time.localtime()
current_print_time = gajim.config.get('print_time') current_print_time = gajim.config.get('print_time')
direction_mark = i18n.paragraph_direction_mark(text)
# don't apply direction mark if it's status message
if kind == 'status':
direction_mark = ''
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)
timestamp = direction_mark + timestamp
if other_tags_for_time: if other_tags_for_time:
buffer_.insert_with_tags_by_name(end_iter, timestamp, buffer_.insert_with_tags_by_name(end_iter, timestamp,
*other_tags_for_time) *other_tags_for_time)
else: else:
buffer_.insert (end_iter, timestamp) 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')
seconds_passed = time.mktime(tim) - self.last_time_printout seconds_passed = time.mktime(tim) - self.last_time_printout
if seconds_passed > every_foo_seconds: if seconds_passed > every_foo_seconds:
self.last_time_printout = time.mktime(tim) self.last_time_printout = time.mktime(tim)
@ -1277,12 +1282,14 @@ class ConversationTextview(GObject.GObject):
else: # not status nor /me else: # not status nor /me
if gajim.config.get('chat_merge_consecutive_nickname'): if gajim.config.get('chat_merge_consecutive_nickname'):
if kind != old_kind or self.just_cleared: if kind != old_kind or self.just_cleared:
self.print_name(name, kind, other_tags_for_name) self.print_name(name, kind, other_tags_for_name,
direction_mark=direction_mark)
else: else:
self.print_real_text(gajim.config.get( self.print_real_text(gajim.config.get(
'chat_merge_consecutive_nickname_indent')) 'chat_merge_consecutive_nickname_indent'))
else: else:
self.print_name(name, kind, other_tags_for_name) self.print_name(name, kind, other_tags_for_name,
direction_mark=direction_mark)
if kind == 'incoming': if kind == 'incoming':
text_tags.append('incomingtxt') text_tags.append('incomingtxt')
elif kind == 'outgoing': elif kind == 'outgoing':
@ -1347,7 +1354,7 @@ class ConversationTextview(GObject.GObject):
end_iter = buffer_.get_end_iter() end_iter = buffer_.get_end_iter()
buffer_.insert_with_tags(end_iter, ' ') buffer_.insert_with_tags(end_iter, ' ')
def print_name(self, name, kind, other_tags_for_name): def print_name(self, name, kind, other_tags_for_name, direction_mark=''):
if name: if name:
buffer_ = self.tv.get_buffer() buffer_ = self.tv.get_buffer()
end_iter = buffer_.get_end_iter() end_iter = buffer_.get_end_iter()
@ -1357,8 +1364,8 @@ class ConversationTextview(GObject.GObject):
before_str = helpers.from_one_line(before_str) before_str = helpers.from_one_line(before_str)
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 + name + after_str + ' ' format_ = direction_mark + before_str + name + after_str + ' '
buffer_.insert_with_tags_by_name(end_iter, format, *name_tags) buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags)
def print_subject(self, subject): def print_subject(self, subject):
if subject: # if we have subject, show it too! if subject: # if we have subject, show it too!