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

use ―*20 instead of gajim-muc-separator.png. See #7476

Browse source
This commit is contained in:
Yann Leboulanger 2013-11-02 17:06:21 +01:00
parent f888f57d1c
commit 722429a347
3 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
icons/hicolor/16x16/status/gajim-muc_separator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 209 B

12
src/conversation_textview.py
View file

@ -173,8 +173,6 @@ class ConversationTextview(GObject.GObject):
) )
) )
FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap(
'gajim-muc_separator')
MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check')
# smooth scroll constants # smooth scroll constants
@ -330,8 +328,6 @@ class ConversationTextview(GObject.GObject):
self.xep0184_warning_tooltip = tooltips.BaseTooltip() self.xep0184_warning_tooltip = tooltips.BaseTooltip()
self.line_tooltip = tooltips.BaseTooltip() self.line_tooltip = tooltips.BaseTooltip()
# use it for hr too
self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF
self.smooth_id = None self.smooth_id = None
self.just_cleared = False self.just_cleared = False
@ -587,7 +583,7 @@ class ConversationTextview(GObject.GObject):
self.focus_out_end_mark) self.focus_out_end_mark)
begin_iter_for_previous_line = end_iter_for_previous_line.copy() begin_iter_for_previous_line = end_iter_for_previous_line.copy()
# img_char+1 (the '\n') # img_char+1 (the '\n')
begin_iter_for_previous_line.backward_chars(2) begin_iter_for_previous_line.backward_chars(21)
# remove focus out line # remove focus out line
buffer_.delete(begin_iter_for_previous_line, buffer_.delete(begin_iter_for_previous_line,
@ -596,14 +592,12 @@ class ConversationTextview(GObject.GObject):
# add the new focus out line # add the new focus out line
end_iter = buffer_.get_end_iter() end_iter = buffer_.get_end_iter()
buffer_.insert(end_iter, '\n') buffer_.insert(end_iter, '\n' + '―' * 20)
buffer_.insert_pixbuf(end_iter,
ConversationTextview.FOCUS_OUT_LINE_PIXBUF)
end_iter = buffer_.get_end_iter() end_iter = buffer_.get_end_iter()
before_img_iter = end_iter.copy() before_img_iter = end_iter.copy()
# one char back (an image also takes one char) # one char back (an image also takes one char)
before_img_iter.backward_char() before_img_iter.backward_chars(20)
buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter)
self.allow_focus_out_line = False self.allow_focus_out_line = False

15
src/htmltextview.py
View file

@ -796,15 +796,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
elif name == 'hr': elif name == 'hr':
#FIXME: plenty of unused attributes (width, height,...) :) #FIXME: plenty of unused attributes (width, height,...) :)
self._jump_line() self._jump_line()
try: self._insert_text('\u2015'*40)
if self.conv_textbuf: self._jump_line()
self.textbuf.insert_pixbuf(self.iter,
self.textview.focus_out_line_pixbuf)
else:
self._insert_text('\u2550'*40)
self._jump_line()
except Exception as e:
log.debug('Error in hr' + str(e))
elif name in LIST_ELEMS: elif name in LIST_ELEMS:
self.list_counters.pop() self.list_counters.pop()
elif name == 'li': elif name == 'li':
@ -1142,10 +1135,6 @@ if __name__ == '__main__':
htmlview = ConversationTextview(None) htmlview = ConversationTextview(None)
path = gtkgui_helpers.get_icon_path('gajim-muc_separator')
# use this for hr
htmlview.tv.focus_out_line_pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
tooltip = tooltips.BaseTooltip() tooltip = tooltips.BaseTooltip()
def on_textview_motion_notify_event(widget, event): def on_textview_motion_notify_event(widget, event):