changeset 5298b7793483 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5298b7793483 description: use ―*20 instead of gajim-muc-separator.png. See #7476

diffstat:

icons/hicolor/16x16/status/gajim-muc_separator.png | Bin src/conversation_textview.py | 12 +++--------- src/htmltextview.py | 15 ++------------- 3 files changed, 5 insertions(+), 22 deletions(-)

diffs (81 lines):

diff -r 574293a69d0e -r 5298b7793483 icons/hicolor/16x16/status/gajim-muc_separator.png Binary file icons/hicolor/16x16/status/gajim-muc_separator.png has changed diff -r 574293a69d0e -r 5298b7793483 src/conversation_textview.py --- a/src/conversation_textview.py Sat Nov 02 16:09:12 2013 +0100 +++ b/src/conversation_textview.py Sat Nov 02 17:06:21 2013 +0100 @@ -173,8 +173,6 @@ ) )

- FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-muc_separator') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check')

# smooth scroll constants @@ -330,8 +328,6 @@ self.xep0184_warning_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.just_cleared = False

@@ -587,7 +583,7 @@ self.focus_out_end_mark) begin_iter_for_previous_line = end_iter_for_previous_line.copy() # 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 buffer_.delete(begin_iter_for_previous_line, @@ -596,14 +592,12 @@

# add the new focus out line end_iter = buffer_.get_end_iter() - buffer_.insert(end_iter, '\n') - buffer_.insert_pixbuf(end_iter, - ConversationTextview.FOCUS_OUT_LINE_PIXBUF) + buffer_.insert(end_iter, '\n' + '―' * 20)

end_iter = buffer_.get_end_iter() before_img_iter = end_iter.copy() # 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)

self.allow_focus_out_line = False diff -r 574293a69d0e -r 5298b7793483 src/htmltextview.py --- a/src/htmltextview.py Sat Nov 02 16:09:12 2013 +0100 +++ b/src/htmltextview.py Sat Nov 02 17:06:21 2013 +0100 @@ -796,15 +796,8 @@ elif name == 'hr': #FIXME: plenty of unused attributes (width, height,...) :) self._jump_line() - try: - if self.conv_textbuf: - 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)) + self._insert_text('\u2015'*40) + self._jump_line() elif name in LIST_ELEMS: self.list_counters.pop() elif name == 'li': @@ -1142,10 +1135,6 @@

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()

def on_textview_motion_notify_event(widget, event):