Commits

commits@gajim.org

17632 discussions

gajim: better behaviour of column width in ACE. Fixes #7446
by Gajim 15 Sep '13

15 Sep '13

changeset 9c47072dbb68 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9c47072dbb68 description: better behaviour of column width in ACE. Fixes #7446 diffstat: src/advanced_configuration_window.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (21 lines): diff -r b7170b76360d -r 9c47072dbb68 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Sun Sep 15 12:11:18 2013 +0200 +++ b/src/advanced_configuration_window.py Sun Sep 15 12:16:55 2013 +0200 @@ -117,13 +117,14 @@ col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.props.resizable = True - # set max width only for initializing the treeview. - col.set_max_width(250) - gobject.idle_add(col.set_max_width, -1) + col.props.expand = True + col.props.sizing = Gtk.TreeViewColumnSizing.FIXED renderer_text = Gtk.CellRendererText() col = Gtk.TreeViewColumn(_('Type'), renderer_text, text = 2) treeview.insert_column(col, -1) + col.props.expand = True + col.props.sizing = Gtk.TreeViewColumnSizing.FIXED treeview.set_model(self.modelfilter)

1 0

gajim: fix E2E / GPG information dialog and another information ...
by Gajim 15 Sep '13

15 Sep '13

changeset a6cfb6d4e04e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a6cfb6d4e04e description: fix E2E / GPG information dialog and another information dialog transient_for property. Fixes #7185 diffstat: src/chat_control.py | 4 ++-- src/dialogs.py | 5 +++-- src/message_window.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diffs (57 lines): diff -r b1cad9794614 -r a6cfb6d4e04e src/chat_control.py --- a/src/chat_control.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/chat_control.py Mon Sep 09 17:36:21 2013 +0200 @@ -2349,9 +2349,9 @@ def _on_authentication_button_clicked(self, widget): if self.gpg_is_active: - dialogs.GPGInfoWindow(self) + dialogs.GPGInfoWindow(self, self.parent_win.window) elif self.session and self.session.enable_encryption: - dialogs.ESessionInfoWindow(self.session) + dialogs.ESessionInfoWindow(self.session, self.parent_win.window) def send_message(self, message, keyID='', chatstate=None, xhtml=None, process_commands=True, attention=False): diff -r b1cad9794614 -r a6cfb6d4e04e src/dialogs.py --- a/src/dialogs.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/dialogs.py Mon Sep 09 17:36:21 2013 +0200 @@ -5147,7 +5147,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, session): + def __init__(self, session, transient_for=None): self.session = session self.xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') @@ -5158,7 +5158,7 @@ self.button_label = self.xml.get_object('button_label') self.window = self.xml.get_object('esession_info_window') self.update_info() - + self.window.set_transient_for(transient_for) self.window.show_all() @@ -5269,6 +5269,7 @@ path = gtkgui_helpers.get_icon_path(image, 32) security_image.set_from_file(path) + self.window.set_transient_for(transient_for) xml.connect_signals(self) self.window.show_all() diff -r b1cad9794614 -r a6cfb6d4e04e src/message_window.py --- a/src/message_window.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/message_window.py Mon Sep 09 17:36:21 2013 +0200 @@ -221,7 +221,8 @@ dialogs.YesNoDialog( _('You are going to close several tabs'), _('Do you really want to close them all?'), - checktext=_('_Do not ask me again'), on_response_yes=on_yes1) + checktext=_('_Do not ask me again'), on_response_yes=on_yes1, + transient_for=self.window) return True def on_yes(ctrl):

1 0

gajim: Use send_message instead of pushing an event and print at...
by Gajim 15 Sep '13

15 Sep '13

changeset bbb6aae1e693 in /home/hg/repos/gajim author: noonien <fsmail(a)kondorgulasch.de> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=bbb6aae1e693 description: Use send_message instead of pushing an event and print at own when sending remotely (when possibe). Fixes #7457 diffstat: src/remote_control.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diffs (18 lines): diff -r a6cfb6d4e04e -r bbb6aae1e693 src/remote_control.py --- a/src/remote_control.py Mon Sep 09 17:36:21 2013 +0200 +++ b/src/remote_control.py Mon Sep 02 14:35:54 2013 +0200 @@ -442,11 +442,9 @@ ctrl = gajim.interface.msg_win_mgr.search_control(jid, connected_account) if ctrl: - ctrl.print_conversation(message, frm='outgoing') - - gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=connected_account, jid=jid, message=message, - keyID=keyID, type_=type_, control=ctrl)) + ctrl.send_message(message) + else: + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=connected_account, jid=jid, message=message, keyID=keyID, type_=type_, control=ctrl)) return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False)

1 0

gajim: escape previous message in last message correction toolti...
by Gajim 15 Sep '13

15 Sep '13

changeset 17d4813a707e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=17d4813a707e description: escape previous message in last message correction tooltip. Fixes #7453 diffstat: src/conversation_textview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r bbb6aae1e693 -r 17d4813a707e src/conversation_textview.py --- a/src/conversation_textview.py Mon Sep 02 14:35:54 2013 +0200 +++ b/src/conversation_textview.py Sun Sep 15 12:09:07 2013 +0200 @@ -474,7 +474,7 @@ i2 = self.print_conversation_line(message, '', 'outgoing', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ - old_txt + GLib.markup_escape_text(old_txt) self.show_corrected_message_warning(i2, tt_txt) self.last_sent_message_marks[1] = buffer_.create_mark(None, i2, left_gravity=True) @@ -492,7 +492,7 @@ i2 = self.print_conversation_line(message, '', 'incoming', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ - old_txt + GLib.markup_escape_text(old_txt) self.show_corrected_message_warning(i2, tt_txt) self.last_received_message_marks[name][1] = buffer_.create_mark(None, i2, left_gravity=True)

1 0

gajim: set title to insecure dialog. Fixes #7239
by Gajim 15 Sep '13

15 Sep '13

changeset 9eec0daca873 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9eec0daca873 description: set title to insecure dialog. Fixes #7239 diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 17d4813a707e -r 9eec0daca873 src/dialogs.py --- a/src/dialogs.py Sun Sep 15 12:09:07 2013 +0200 +++ b/src/dialogs.py Thu Sep 12 17:30:50 2013 +0200 @@ -1883,6 +1883,7 @@ self.ok_button = self.action_area.get_children()[0] # right to left self.ok_button.set_sensitive(False) self.checkbutton1.connect('clicked', self.on_checkbutton_clicked) + self.set_title(_('Insecure connection')) def on_checkbutton_clicked(self, widget): self.ok_button.set_sensitive(widget.get_active())

1 0

gajim: add 2 more direction mark :/. Fixes #7284
by Gajim 15 Sep '13

15 Sep '13

changeset 7ea8d7724463 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7ea8d7724463 description: add 2 more direction mark :/. Fixes #7284 diffstat: src/dialogs.py | 3 ++- src/groupchat_control.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 9eec0daca873 -r 7ea8d7724463 src/dialogs.py --- a/src/dialogs.py Thu Sep 12 17:30:50 2013 +0200 +++ b/src/dialogs.py Thu Sep 12 17:41:33 2013 +0200 @@ -4636,7 +4636,8 @@ % {'room_jid': room_jid} contact = gajim.contacts.get_first_contact_from_jid(account, jid) contact_text = contact and contact.name or jid - sectext = sectext.replace('$Contact', contact_text) + sectext = i18n.direction_mark + sectext.replace('$Contact', + contact_text) if comment: # only if not None and not '' comment = GLib.markup_escape_text(comment) diff -r 9eec0daca873 -r 7ea8d7724463 src/groupchat_control.py --- a/src/groupchat_control.py Thu Sep 12 17:30:50 2013 +0200 +++ b/src/groupchat_control.py Thu Sep 12 17:41:33 2013 +0200 @@ -1556,7 +1556,7 @@ newly_created = False nick = i18n.direction_mark + obj.nick - nick_jid = nick + nick_jid = nick + i18n.direction_mark # Set to true if role or affiliation have changed right_changed = False

1 0

gajim: SynchroniseSelectAccountDialog, ClientCertChooserDialog s...
by Gajim 15 Sep '13

15 Sep '13

changeset 8f5fc5f8a001 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8f5fc5f8a001 description: SynchroniseSelectAccountDialog, ClientCertChooserDialog set transient_for. See #7185 diffstat: src/dialogs.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (33 lines): diff -r c3b5f390fa4a -r 8f5fc5f8a001 src/dialogs.py --- a/src/dialogs.py Sat Sep 07 22:06:48 2013 +0400 +++ b/src/dialogs.py Sat Sep 07 22:27:45 2013 +0400 @@ -1477,9 +1477,10 @@ """ def __init__(self, title_text, action, buttons, default_response, select_multiple=False, current_folder=None, on_response_ok=None, - on_response_cancel=None): - - GObject.GObject.__init__(self, title=title_text, action=action) + on_response_cancel=None, transient_for=None): + + GObject.GObject.__init__(self, title=title_text, parent=transient_for, + action=action) self.add_button(buttons[0],buttons[1]) if len(buttons) ==4: self.add_button(buttons[2],buttons[3]) @@ -2695,6 +2696,7 @@ self.account = account self.xml = gtkgui_helpers.get_gtk_builder('synchronise_select_account_dialog.ui') self.dialog = self.xml.get_object('synchronise_select_account_dialog') + self.dialog.set_transient_for(gajim.interface.instances['accounts'].window) self.accounts_treeview = self.xml.get_object('accounts_treeview') model = Gtk.ListStore(str, str, bool) self.accounts_treeview.set_model(model) @@ -4709,6 +4711,7 @@ FileChooserDialog.__init__(self, title_text=_('Choose Client Cert #PCKS12'), + transient_for=gajim.interface.instances['accounts'].window, action=Gtk.FileChooserAction.OPEN, buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK),

1 0

gajim: gtk -> Gtk
by Gajim 15 Sep '13

15 Sep '13

changeset ae9651fc0d74 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ae9651fc0d74 description: gtk -> Gtk diffstat: src/groupchat_control.py | 8 ++++---- src/gui_menu_builder.py | 4 ++-- src/roster_window.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diffs (48 lines): diff -r 8f5fc5f8a001 -r ae9651fc0d74 src/groupchat_control.py --- a/src/groupchat_control.py Sat Sep 07 22:27:45 2013 +0400 +++ b/src/groupchat_control.py Sun Sep 15 11:54:42 2013 +0200 @@ -833,12 +833,12 @@ request_voice_separator = xml.get_object('request_voice_separator') if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): - img = gtk.Image() - img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) + img = Gtk.Image() + img.set_from_icon_name('bookmark-new', Gtk.IconSize.MENU) bookmark_room_menuitem.set_image(img) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = gtk.Image() - img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) history_menuitem.set_image(img) if hide_buttonbar_items: diff -r 8f5fc5f8a001 -r ae9651fc0d74 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sat Sep 07 22:27:45 2013 +0400 +++ b/src/gui_menu_builder.py Sun Sep 15 11:54:42 2013 +0200 @@ -257,8 +257,8 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = gtk.Image() - img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) history_menuitem.set_image(img) if control: diff -r 8f5fc5f8a001 -r ae9651fc0d74 src/roster_window.py --- a/src/roster_window.py Sat Sep 07 22:27:45 2013 +0400 +++ b/src/roster_window.py Sun Sep 15 11:54:42 2013 +0200 @@ -5242,8 +5242,8 @@ return history_menuitem = self.xml.get_object('history_menuitem') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = gtk.Image() - img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) history_menuitem.set_image(img) new_chat_menuitem = self.xml.get_object('new_chat_menuitem') single_message_menuitem = self.xml.get_object(

1 0

gajim: add twiter icon to disco, better irc detection, use addre...
by Gajim 15 Sep '13

15 Sep '13

changeset e78e89605177 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e78e89605177 description: add twiter icon to disco, better irc detection, use address when identidy doesn't help enough. Fixes #7396 diffstat: src/disco.py | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diffs (99 lines): diff -r ae9651fc0d74 -r e78e89605177 src/disco.py --- a/src/disco.py Sun Sep 15 11:54:42 2013 +0200 +++ b/src/disco.py Sun Sep 08 18:11:53 2013 +0200 @@ -96,6 +96,7 @@ # Transports ('conference', 'irc'): (ToplevelAgentBrowser, 'irc'), ('_jid', 'irc'): (False, 'irc'), + ('gateway', 'irc'): (False, 'irc'), ('gateway', 'aim'): (False, 'aim'), ('_jid', 'aim'): (False, 'aim'), ('gateway', 'gadu-gadu'): (False, 'gadu-gadu'), @@ -115,6 +116,7 @@ ('gateway', 'facebook'): (False, 'facebook'), ('_jid', 'facebook'): (False, 'facebook'), ('gateway', 'tv'): (False, 'tv'), + ('gateway', 'twitter'): (False, 'twitter'), } # Category type to "human-readable" description string, and sort priority @@ -293,11 +295,12 @@ if not self._cbs[cbkey]: del self._cbs[cbkey] - def get_icon(self, identities = []): + def get_icon(self, identities = [], addr=''): """ Return the icon for an agent """ # Grab the first identity with an icon + quiet = False for identity in identities: try: cat, type_ = identity['category'], identity['type'] @@ -309,17 +312,22 @@ break else: # Loop fell through, default to unknown - info = _agent_type_info[(0, 0)] - filename = info[1] - if not filename: # we don't have an image to show for this type - filename = 'jabber' + filename = addr.split('.')[0] + quiet = True # Use the cache if possible if filename in _icon_cache: return _icon_cache[filename] # Or load it - pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-' + filename, size=32) - # Store in cache - _icon_cache[filename] = pix + pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-' + filename, size=32, + quiet=quiet) + if pix: + # Store in cache + _icon_cache[filename] = pix + return pix + if 'jabber' in _icon_cache: + return _icon_cache['jabber'] + pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-jabber', size=32) + _icon_cache['jabber'] = pix return pix def get_browser(self, identities=[], features=[]): @@ -948,7 +956,7 @@ self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=self._get_agent_address()) self.window.banner_icon.set_from_pixbuf(pix) self.window.banner_icon.show() @@ -1217,7 +1225,7 @@ identity = {'category': '_jid', 'type': type_} identities.append(identity) # Set the pixmap for the row - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=addr) self.model.append(None, (self.jid, self.node, pix, descr, 1)) # Grab info on the service self.cache.get_info(self.jid, self.node, self._agent_info, force=False) @@ -1709,7 +1717,7 @@ # Put it in the 'other' category for now cat_args = ('other',) # Set the pixmap for the row - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=addr) # Put it in the right category cat = self._find_category(*cat_args) if not cat: @@ -1741,7 +1749,7 @@ self._update_progressbar() # Search for an icon and category we can display - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=addr) cat, type_ = None, None for identity in identities: try:

1 0

gajim: render the whole line when we use XEP-309 Last Message Co...
by Gajim 15 Sep '13

15 Sep '13

changeset f11a5ece742a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f11a5ece742a description: render the whole line when we use XEP-309 Last Message Correction. Fixes #7400, #7453 diffstat: icons/hicolor/32x32/categories/gajim-agent-twitter.png | Bin src/conversation_textview.py | 98 ++++++++++------ src/htmltextview.py | 12 +- 3 files changed, 67 insertions(+), 43 deletions(-) diffs (246 lines): diff -r e78e89605177 -r f11a5ece742a icons/hicolor/32x32/categories/gajim-agent-twitter.png Binary file icons/hicolor/32x32/categories/gajim-agent-twitter.png has changed diff -r e78e89605177 -r f11a5ece742a src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 08 18:11:53 2013 +0200 +++ b/src/conversation_textview.py Sun Sep 08 18:18:23 2013 +0200 @@ -482,8 +482,8 @@ buffer_.delete(i1, i2) tag = 'outgoingtxt' if message.startswith('/me'): - tag = 'outgoing' - i2 = self.print_real_text(message, text_tags=[tag], name=name, + tag = 'outgoing' + i2 = self.print_conversation_line(message, '', 'outgoing', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -501,7 +501,7 @@ i2 = buffer_.get_iter_at_mark(m2) txt = buffer_.get_text(i1, i2, True) buffer_.delete(i1, i2) - i2 = self.print_real_text(message, text_tags=['incomingtxt'], name=name, + i2 = self.print_conversation_line(message, '', 'incoming', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -1260,12 +1260,14 @@ def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, - displaymarking=None): + displaymarking=None, iter_=None): """ Print 'chat' type messages """ buffer_ = self.tv.get_buffer() buffer_.begin_user_action() + if iter_: + temp_mark = buffer_.create_mark(None, iter_, left_gravity=True) if self.marks_queue.full(): # remove oldest line m1 = self.marks_queue.get() @@ -1274,7 +1276,11 @@ i2 = buffer_.get_iter_at_mark(m2) buffer_.delete(i1, i2) buffer_.delete_mark(m1) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = buffer_.get_iter_at_mark(temp_mark) + buffer_.delete_mark(temp_mark) + else: + end_iter = buffer_.get_end_iter() end_offset = end_iter.get_offset() at_the_end = self.at_the_end() move_selection = False @@ -1282,21 +1288,22 @@ get_offset() == end_offset: move_selection = True - # Create one mark and add it to queue once if it's the first line - # else twice (one for end bound, one for start bound) - mark = None - if buffer_.get_char_count() > 0: - if not simple: - buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') - if move_selection: - sel_start, sel_end = buffer_.get_selection_bounds() - sel_end.backward_char() - buffer_.select_range(sel_start, sel_end) - mark = buffer_.create_mark(None, end_iter, left_gravity=True) + if not iter_: + # Create one mark and add it to queue once if it's the first line + # else twice (one for end bound, one for start bound) + mark = None + if buffer_.get_char_count() > 0: + if not simple and not iter_: + buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') + if move_selection: + sel_start, sel_end = buffer_.get_selection_bounds() + sel_end.backward_char() + buffer_.select_range(sel_start, sel_end) + mark = buffer_.create_mark(None, end_iter, left_gravity=True) + self.marks_queue.put(mark) + if not mark: + mark = buffer_.create_mark(None, end_iter, left_gravity=True) self.marks_queue.put(mark) - if not mark: - mark = buffer_.create_mark(None, end_iter, left_gravity=True) - self.marks_queue.put(mark) if kind == 'incoming_queue': kind = 'incoming' if old_kind == 'incoming_queue': @@ -1338,7 +1345,7 @@ 'time_sometimes') # If there's a displaymarking, print it here. if displaymarking: - self.print_displaymarking(displaymarking) + self.print_displaymarking(displaymarking, iter_=end_iter) # kind = info, we print things as if it was a status: same color, ... if kind in ('error', 'info'): kind = 'status' @@ -1348,36 +1355,43 @@ if other_text_tag: # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) - if text.startswith('/me'): - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) + if text.startswith('/me') and not iter_: + mark1 = mark else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared: self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark) + direction_mark=direction_mark, iter_=end_iter) else: self.print_real_text(gajim.config.get( - 'chat_merge_consecutive_nickname_indent')) + 'chat_merge_consecutive_nickname_indent'), + iter_=end_iter) else: self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark) + direction_mark=direction_mark, iter_=end_iter) if kind == 'incoming': text_tags.append('incomingtxt') - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) + if not iter_: + mark1 = mark elif kind == 'outgoing': text_tags.append('outgoingtxt') - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) - self.print_subject(subject) - self.print_real_text(text, text_tags, name, xhtml, graphics=graphics) - if mark1: + if not iter_: + mark1 = mark + self.print_subject(subject, iter_=end_iter) + self.print_real_text(text, text_tags, name, xhtml, graphics=graphics, + iter_=end_iter) + if not iter_ and mark1: mark2 = buffer_.create_mark(None, buffer_.get_end_iter(), left_gravity=True) if kind == 'incoming': + if name in self.last_received_message_marks: + m = self.last_received_message_marks[name][1] + buffer_.delete_mark(m) self.last_received_message_marks[name] = [mark1, mark2] elif kind == 'outgoing': + m = self.last_sent_message_marks[1] + if m: + buffer_.delete_mark(m) self.last_sent_message_marks = [mark1, mark2] # scroll to the end of the textview if at_the_end or kind == 'outgoing': @@ -1390,6 +1404,7 @@ self.just_cleared = False buffer_.end_user_action() + return end_iter def get_time_to_show(self, tim, direction_mark=''): """ @@ -1423,23 +1438,30 @@ elif text.startswith('/me ') or text.startswith('/me\n'): return kind - def print_displaymarking(self, displaymarking): + def print_displaymarking(self, displaymarking, iter_=None): bgcolor = displaymarking.getAttr('bgcolor') or '#FFF' fgcolor = displaymarking.getAttr('fgcolor') or '#000' text = displaymarking.getData() if text: buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, buffer_.create_tag(None, background=bgcolor, foreground=fgcolor)) buffer_.insert_with_tags(end_iter, '[' + text + ']', tag) end_iter = buffer_.get_end_iter() buffer_.insert_with_tags(end_iter, ' ') - def print_name(self, name, kind, other_tags_for_name, direction_mark=''): + def print_name(self, name, kind, other_tags_for_name, direction_mark='', + iter_=None): if name: buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() name_tags = other_tags_for_name[:] # create a new list name_tags.append(kind) before_str = gajim.config.get('before_nickname') @@ -1469,7 +1491,7 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.tv.display_html(xhtml, self.tv, self) + self.tv.display_html(xhtml, self.tv, self, iter_=iter_) return except Exception as e: gajim.log.debug('Error processing xhtml: ' + str(e)) diff -r e78e89605177 -r f11a5ece742a src/htmltextview.py --- a/src/htmltextview.py Sun Sep 08 18:11:53 2013 +0200 +++ b/src/htmltextview.py Sun Sep 08 18:18:23 2013 +0200 @@ -690,7 +690,7 @@ def handle_specials(self, text): if self.conv_textview: self.iter = self.conv_textview.detect_and_print_special_text(text, - self._get_style_tags()) + self._get_style_tags(), iter_=self.iter) else: self._insert_text(text) @@ -853,8 +853,7 @@ self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) - #Pango.SCALE_XX_SMALL) - self.get_buffer().create_tag('eol', scale=0.5787037037037) + self.get_buffer().create_tag('eol') self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface @@ -1059,9 +1058,12 @@ # self.hyperlink_handler can be overwritten, so call it when needed self.hyperlink_handler(texttag, widget, event, iter_, kind) - def display_html(self, html, textview, conv_textview): + def display_html(self, html, textview, conv_textview, iter_=None): buffer_ = self.get_buffer() - eob = buffer_.get_end_iter() + if iter_: + eob = iter_ + else: + eob = buffer_.get_end_iter() ## this works too if libxml2 is not available # parser = xml.sax.make_parser(['drv_libxml2']) # parser.setFeature(xml.sax.handler.feature_validation, True)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits