Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 2 commits: Prevent readmarker from showing until called
by Philipp Hörist 13 Apr '21

13 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 9a2e6506 by lovetox at 2021-04-13T23:37:03+02:00 Prevent readmarker from showing until called - - - - - 2c38a4d3 by lovetox at 2021-04-13T23:37:03+02:00 Rework Message Row - Add Styling - - - - - 14 changed files: - gajim/chat_control_base.py - + gajim/common/styling.py - + gajim/gtk/conversation/code_widget.py - + gajim/gtk/conversation/message_widget.py - + gajim/gtk/conversation/plain_widget.py - + gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/view.py - + test/no_gui/test_styling.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -54,7 +54,6 @@ from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog from gajim.gui.message_input import MessageInputTextView -from gajim.gui.util import at_the_end from gajim.gui.util import get_hardware_key_codes from gajim.gui.util import get_builder from gajim.gui.util import generate_account_badge ===================================== gajim/common/styling.py ===================================== @@ -0,0 +1,337 @@ +import string +import re +from dataclasses import dataclass +from dataclasses import field + +PRE = '`' +STRONG = '*' +STRIKE = '~' +EMPH = '_' + +QUOTE = '> ' +PRE_TEXT = '```' + +WHITESPACE = set(string.whitespace) +BLOCK_DIRS = set([QUOTE, PRE_TEXT]) +SPAN_DIRS = set([PRE, STRONG, STRIKE, EMPH]) +VALID_SPAN_START = WHITESPACE | SPAN_DIRS + +SD = 0 +SD_POS = 1 + +PRE_RX = r'(?P<pre>^```.+?(^```$(.|\Z)))' +PRE_NESTED_RX = r'(?P<pre>^```.+?((^```$(.|\Z))|\Z))' +QUOTE_RX = r'(?P<quote>^(?=>).*?(^|\Z)(?!>))' + +BLOCK_RX = re.compile(PRE_RX + '|' + QUOTE_RX, re.S | re.M) +BLOCK_NESTED_RX = re.compile(PRE_NESTED_RX + '|' + QUOTE_RX, re.S | re.M) +UNQUOTE_RX = re.compile(r'^> |^>', re.M) + +URI_RX = r'((?P<protocol>[\w-]+://?|www[.])[\S()<>]+?(?=[,]?(\s|\Z)+))' +URI_RX = re.compile(URI_RX) + +ADDRESS_RX = r'(\b(?P<protocol>(xmpp|mailto)+:)?[\w-]*@(.*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' +ADDRESS_RX = re.compile(ADDRESS_RX) + + +@dataclass +class StyleObject: + start: int + end: int + text: str + + +@dataclass +class Uri(StyleObject): + name: str = field(default='uri', init=False) + + +@dataclass +class Address(StyleObject): + name: str = field(default='address', init=False) + + +@dataclass +class XMPPAddress(StyleObject): + name: str = field(default='xmppadr', init=False) + + +@dataclass +class MailAddress(StyleObject): + name: str = field(default='mailadr', init=False) + + +@dataclass +class Block(StyleObject): + + @classmethod + def from_match(cls, match): + return cls(start=match.start(), + end=match.end(), + text=str(match.group(cls.name))) + + +@dataclass +class PlainBlock(Block): + name: str = field(default='plain', init=False) + spans: list = field(default_factory=list) + uris: list = field(default_factory=list) + + +@dataclass +class PreBlock(Block): + name: str = field(default='pre', init=False) + + +@dataclass +class QuoteBlock(Block): + name: str = field(default='quote', init=False) + blocks: list = field(default_factory=list) + + def unquote(self): + return UNQUOTE_RX.sub('', self.text) + + +@dataclass +class PlainSpan(StyleObject): + name: str = field(default='plain', init=False) + + +@dataclass +class StrongSpan(StyleObject): + name: str = field(default='strong', init=False) + + +@dataclass +class EmphasisSpan(StyleObject): + name: str = field(default='emphasis', init=False) + + +@dataclass +class PreTextSpan(StyleObject): + name: str = field(default='pre', init=False) + + +@dataclass +class StrikeSpan(StyleObject): + name: str = field(default='strike', init=False) + + +SPAN_CLS_DICT = { + STRONG: StrongSpan, + EMPH: EmphasisSpan, + PRE: PreTextSpan, + STRIKE: StrikeSpan +} + + +@dataclass +class ParsingResult: + blocks: list + + +def process(text, nested=False): + blocks = _parse_blocks(text, nested) + for block in blocks: + if isinstance(block, PlainBlock): + offset = block.start + for line in block.text.splitlines(keepends=True): + block.spans += _parse_line(line, offset) + block.uris += _parse_uris(line, offset) + offset += len(line) + + if isinstance(block, QuoteBlock): + result = process(block.unquote(), nested=True) + block.blocks = result.blocks + + return ParsingResult(blocks) + + +def _parse_blocks(text, nested): + blocks = [] + text_len = len(text) + last_end_pos = 0 + + rx = BLOCK_NESTED_RX if nested else BLOCK_RX + + for match in rx.finditer(text): + if match.start() != last_end_pos: + blocks.append(PlainBlock(start=last_end_pos, + end=match.start(), + text=text[last_end_pos:match.start()])) + + last_end_pos = match.end() + group_dict = match.groupdict() + + if group_dict.get('quote') is not None: + blocks.append(QuoteBlock.from_match(match)) + + if group_dict.get('pre') is not None: + blocks.append(PreBlock.from_match(match)) + + if last_end_pos != text_len: + blocks.append(PlainBlock(start=last_end_pos, + end=text_len, + text=text[last_end_pos:])) + return blocks + + +def _parse_line(line, offset): + index = 0 + length = len(line) + stack = [] + spans = [] + + while index < length: + sd = line[index] + if sd not in SPAN_DIRS: + index += 1 + continue + + is_valid_start = _is_valid_span_start(line, index) + is_valid_end = _is_valid_span_end(line, index) + + if is_valid_start and is_valid_end: + # Favor end over new start, this means parsing is done non-greedy + if sd in [open_sd for open_sd, _ in stack]: + is_valid_start = False + + if is_valid_start: + if sd == PRE: + index = _handle_pre_span(line, index, offset, spans) + continue + + stack.append((sd, index)) + index += 1 + continue + + if is_valid_end: + if sd not in [open_sd for open_sd, _ in stack]: + index += 1 + continue + + if _is_span_empty(sd, index, stack): + stack.pop() + index += 1 + continue + + start_pos = _find_span_start_position(sd, stack) + spans.append(_make_span(line, sd, start_pos, index, offset)) + + index += 1 + + return spans + + +def _parse_uris(line, offset): + uris = [] + for match in URI_RX.finditer(line): + uri = _make_uri(line, match.start(), match.end(), offset) + uris.append(uri) + + for match in ADDRESS_RX.finditer(line): + uri = _make_address(line, match.start(), match.end(), offset) + uris.append(uri) + + return uris + + +def _handle_pre_span(line, index, offset, spans): + # Scan ahead for the end + end = line.find(PRE, index + 1) + if end == -1: + return index + 1 + + if end - index == 1: + # empty span + return index + 1 + + spans.append(_make_span(line, PRE, index, end, offset)) + return end + 1 + + +def _make_span(line, sd, start, end, offset): + text = line[start:end + 1] + start += offset + end += offset + 1 + span_class = SPAN_CLS_DICT.get(sd) + return span_class(start=start, end=end, text=text) + + +def _make_uri(line, start, end, offset): + text = line[start:end] + start += offset + end += offset + return Uri(start=start, end=end, text=text) + + +def _make_address(line, start, end, offset): + text = line[start:end] + start += offset + end += offset + + if text.startswith('xmpp'): + return XMPPAddress(start=start, end=end, text=text) + + if text.startswith('mailto'): + return MailAddress(start=start, end=end, text=text) + + return Address(start=start, end=end, text=text) + + +def _is_span_empty(sd, index, stack): + start_sd = stack[-1][SD] + if start_sd != sd: + return False + + pos = stack[-1][SD_POS] + return pos == index - 1 + + +def _find_span_start_position(sd, stack): + while stack: + start_sd, pos = stack.pop() + if start_sd == sd: + return pos + + raise ValueError('Unable to find opening span') + + +def _is_valid_span_start(line, index): + ''' + https://xmpp.org/extensions/xep-0393.html#span + + ... The opening styling directive MUST be located at the beginning + of the line, after a whitespace character, or after a different opening + styling directive. The opening styling directive MUST NOT be followed + by a whitespace character ... + ''' + + try: + char = line[index + 1] + except IndexError: + return False + + if char in WHITESPACE: + return False + + if index == 0: + return True + + char = line[index - 1] + return char in VALID_SPAN_START + + +def _is_valid_span_end(line, index): + ''' + https://xmpp.org/extensions/xep-0393.html#span + + ... and the closing styling directive MUST NOT be preceeded + by a whitespace character ... + ''' + + if index == 0: + return False + + char = line[index - 1] + return char not in WHITESPACE ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -0,0 +1,59 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import gi +gi.require_version('GtkSource', '4') +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import GtkSource + + +class CodeWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + + self._account = account + + self._textview = CodeTextview() + # self._scrolled = Gtk.ScrolledWindow() + # self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, + # Gtk.PolicyType.AUTOMATIC) + # self._scrolled.set_hexpand(True) + # self._scrolled.set_vexpand(True) + # self._scrolled.set_propagate_natural_height(True) + # self._scrolled.set_max_content_height(400) + # self._scrolled.add(self._textview) + + self.add(self._textview) + + def add_content(self, block): + self._textview.print_code(block) + + +class CodeTextview(GtkSource.View): + def __init__(self): + GtkSource.View.__init__(self) + self.set_editable(False) + self.set_cursor_visible(False) + self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + + self._source_manager = GtkSource.LanguageManager.get_default() + + def print_code(self, block): + buffer_ = self.get_buffer() + lang = self._source_manager.get_language('python3') + buffer_.set_language(lang) + self.set_show_line_numbers(True) + buffer_.insert(buffer_.get_start_iter(), block.text) ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -0,0 +1,47 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from .code_widget import CodeWidget +from .quote_widget import QuoteWidget +from .plain_widget import PlainWidget + + +class MessageWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self._account = account + + def add_content(self, blocks): + for block in blocks: + if block.name == 'plain': + widget = PlainWidget(self._account) + widget.add_content(block) + self.add(widget) + continue + + if block.name == 'pre': + widget = CodeWidget(self._account) + widget.add_content(block) + self.add(widget) + continue + + if block.name == 'quote': + message_widget = MessageWidget(self._account) + message_widget.add_content(block.blocks) + widget = QuoteWidget(self._account) + widget.attach_message_widget(message_widget) + self.add(widget) + continue ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -0,0 +1,335 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from urllib.parse import quote + +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Pango +from gi.repository import Gdk +from gi.repository import GLib + +from gajim.common import app +from gajim.common import i18n +from gajim.common.const import StyleAttr +from gajim.common.helpers import open_uri +from gajim.common.helpers import reduce_chars_newlines +from gajim.common.helpers import parse_uri +from gajim.common.i18n import _ + +from .util import get_cursor + + +URI_TAGS = ['uri', 'address', 'xmppadr', 'mailadr'] +STYLE_TAGS = ['strong', 'emphasis', 'strike', 'pre'] + + +class PlainWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + + self._account = account + + self._textview = MessageTextview(self._account) + self.add(self._textview) + + def add_content(self, block): + self._textview.print_text_with_styling(block) + + +class MessageTextview(Gtk.TextView): + + __gsignals__ = { + 'quote': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + ), + } + + def __init__(self, account): + Gtk.TextView.__init__(self) + self.set_hexpand(True) + self.set_margin_start(0) + self.set_margin_end(0) + self.set_border_width(0) + self.set_left_margin(0) + self.set_right_margin(0) + self.set_has_tooltip(True) + self.set_editable(False) + self.set_cursor_visible(False) + self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + + self.connect('query-tooltip', self._query_tooltip) + self.connect('button-press-event', self._on_button_press) + self.connect('populate-popup', self._on_populate_popup) + + self._account = account + + # Used for changing the mouse pointer when hovering clickable URIs + self._cursor_changed = False + + # Keeps text selections for quoting and search actions + self._selected_text = '' + + self.get_style_context().add_class('gajim-conversation-font') + + # Create Tags + self._create_url_tags() + self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) + self.get_buffer().create_tag('emphasis', style=Pango.Style.ITALIC) + self.get_buffer().create_tag('strike', strikethrough=True) + self.get_buffer().create_tag('pre', family='monospace') + + self.connect('destroy', self._on_destroy) + + def _on_destroy(self, *args): + pass + + def _create_url_tags(self): + color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + for name in URI_TAGS: + tag = self.get_buffer().create_tag(name, + foreground=color, + underline=Pango.Underline.SINGLE) + tag.connect('event', self._on_uri_clicked, tag) + + def update_tags(self): + tag_table = self.get_buffer().get_tag_table() + color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + + for tag in URI_TAGS: + tag_table.lookup(tag).set_property('foreground', color) + + def clear(self): + buffer_ = self.get_buffer() + start, end = buffer_.get_bounds() + buffer_.delete(start, end) + + def get_text(self): + buffer_ = self.get_buffer() + start, end = buffer_.get_bounds() + return buffer_.get_text(start, end, False) + + def print_text_with_styling(self, block): + buffer_ = self.get_buffer() + buffer_.insert(buffer_.get_start_iter(), block.text) + + for span in block.spans: + start_iter = buffer_.get_iter_at_offset(span.start) + end_iter = buffer_.get_iter_at_offset(span.end) + buffer_.apply_tag_by_name(span.name, start_iter, end_iter) + + for uri in block.uris: + start_iter = buffer_.get_iter_at_offset(uri.start) + end_iter = buffer_.get_iter_at_offset(uri.end) + buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) + + def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): + window = widget.get_window(Gtk.TextWindowType.TEXT) + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, x_pos, y_pos) + + iter_ = self.get_iter_at_position(x_pos, y_pos)[1] + for tag in iter_.get_tags(): + tag_name = tag.get_property('name') + if getattr(tag, 'is_anchor', False): + text = getattr(tag, 'title', False) + if text: + if len(text) > 50: + text = reduce_chars_newlines(text, 47, 1) + tooltip.set_text(text) + window.set_cursor(get_cursor('pointer')) + self._cursor_changed = True + return True + if tag_name in URI_TAGS: + window.set_cursor(get_cursor('pointer')) + self._cursor_changed = True + return False + + if self._cursor_changed: + window.set_cursor(get_cursor('text')) + self._cursor_changed = False + return False + + def _on_button_press(self, _widget, event): + ''' + We don’t open the standard context menu when receiving + a click on tagged text. + If it’s untagged text, check if something is selected + ''' + self._selected_text = '' + + if event.button != 3: + # If it’s not a right click + return False + + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, + int(event.x), + int(event.y)) + iter_ = self.get_iter_at_location(x_pos, y_pos) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() + + if tags: + # A tagged text fragment has been clicked + for tag in tags: + tag_name = tag.get_property('name') + if tag_name in URI_TAGS: + # Block regular context menu + return True + + # Check if there is a selection and make it available for + # _on_populate_popup + buffer_ = self.get_buffer() + return_val = buffer_.get_selection_bounds() + if return_val: + # Something has been selected, get the text + start_sel, finish_sel = return_val[0], return_val[1] + self._selected_text = buffer_.get_text( + start_sel, finish_sel, True) + elif iter_.get_char() and ord(iter_.get_char()) > 31: + # Clicked on a word, take whole word for selection + start_sel = iter_.copy() + if not start_sel.starts_word(): + start_sel.backward_word_start() + finish_sel = iter_.copy() + if not finish_sel.ends_word(): + finish_sel.forward_word_end() + self._selected_text = buffer_.get_text( + start_sel, finish_sel, True) + return False + + def _on_populate_popup(self, _textview, menu): + ''' + Overrides the default context menu. + If text is selected, a submenu with actions on the selection is added. + (see _on_button_press) + ''' + if not self._selected_text: + menu.show_all() + return + + if not self._history_mode: + item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) + id_ = item.connect('activate', self._on_quote) + self.handlers[id_] = item + menu.prepend(item) + + selected_text_short = reduce_chars_newlines( + self._selected_text, 25, 2) + item = Gtk.MenuItem.new_with_mnemonic( + _('_Actions for "%s"') % selected_text_short) + menu.prepend(item) + submenu = Gtk.Menu() + item.set_submenu(submenu) + uri_text = quote(self._selected_text.encode('utf-8')) + + if app.settings.get('always_english_wikipedia'): + uri = (f'https://en.wikipedia.org/wiki/' + f'Special:Search?search={uri_text}') + else: + uri = (f'https://{i18n.get_short_lang_code()}.wikipedia.org/' + f'wiki/Special:Search?search={uri_text}') + item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + item = Gtk.MenuItem.new_with_mnemonic( + _('Look it up in _Dictionary')) + dict_link = app.settings.get('dictionary_url') + if dict_link == 'WIKTIONARY': + # Default is wikitionary.org + if app.settings.get('always_english_wiktionary'): + uri = (f'https://en.wiktionary.org/wiki/' + f'Special:Search?search={uri_text}') + else: + uri = (f'https://{i18n.get_short_lang_code()}.wiktionary.org/' + f'wiki/Special:Search?search={uri_text}') + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + else: + if dict_link.find('%s') == -1: + # There has to be a '%s' in the url if it’s not WIKTIONARY + item = Gtk.MenuItem.new_with_label( + _('Dictionary URL is missing a "%s"')) + item.set_sensitive(False) + else: + uri = dict_link % uri_text + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + search_link = app.settings.get('search_engine') + if search_link.find('%s') == -1: + # There has to be a '%s' in the url + item = Gtk.MenuItem.new_with_label( + _('Web Search URL is missing a "%s"')) + item.set_sensitive(False) + else: + item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) + uri = search_link % uri_text + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + menu.show_all() + + def _on_uri_clicked(self, texttag, _widget, event, iter_, _kind): + if event.type != Gdk.EventType.BUTTON_PRESS: + return Gdk.EVENT_PROPAGATE + + begin_iter = iter_.copy() + # we get the beginning of the tag + while not begin_iter.starts_tag(texttag): + begin_iter.backward_char() + end_iter = iter_.copy() + # we get the end of the tag + while not end_iter.ends_tag(texttag): + end_iter.forward_char() + + # Detect XHTML-IM link + word = getattr(texttag, 'href', None) + if not word: + word = self.get_buffer().get_text(begin_iter, end_iter, True) + + uri = parse_uri(word) + if event.button.button == 3: # right click + self.show_context_menu(uri) + return Gdk.EVENT_STOP + + # self.plugin_modified = False + # app.plugin_manager.extension_point( + # 'hyperlink_handler', uri, self, self.get_toplevel()) + # if self.plugin_modified: + # return Gdk.EVENT_STOP + + open_uri(uri, account=self._account) + return Gdk.EVENT_STOP + + def _on_quote(self, _widget): + self.emit('quote', self._selected_text) + + @staticmethod + def _visit_uri(_widget, uri): + open_uri(uri) ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -0,0 +1,33 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gi.repository import Gtk + + +class QuoteWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + + self._account = account + + self._message_widget = None + + def attach_message_widget(self, message_widget): + # Purpose of this method is to prevent circular imports + if self._message_widget is not None: + raise ValueError('QuoteWidget already has a MessageWidget attached') + self._message_widget = message_widget + self.add(message_widget) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -30,7 +30,7 @@ class BaseRow(Gtk.ListBoxRow): - def __init__(self, account, widget='label', history_mode=False): + def __init__(self, account, widget=None, history_mode=False): Gtk.ListBoxRow.__init__(self) self.type = '' self.timestamp = None @@ -46,18 +46,12 @@ def __init__(self, account, widget='label', history_mode=False): self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) self.add(self.grid) - if widget == 'textview': - self.label = None - self.textview = ConversationTextview( - account, history_mode=history_mode) - else: - self.textview = None + if widget == 'label': self.label = Gtk.Label() self.label.set_selectable(True) self.label.set_line_wrap(True) self.label.set_xalign(0) - self.label.set_line_wrap_mode( - Pango.WrapMode.WORD_CHAR) + self.label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) @property def is_merged(self): ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -20,7 +20,7 @@ class DateRow(BaseRow): def __init__(self, account, timestamp): - BaseRow.__init__(self, account) + BaseRow.__init__(self, account, widget='label') self.set_selectable(False) self.set_activatable(False) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -33,8 +33,7 @@ def __init__(self, subject, graphics, history_mode=False): - BaseRow.__init__(self, account, widget='textview', - history_mode=history_mode) + BaseRow.__init__(self, account, history_mode=history_mode) self.type = 'info' self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -24,11 +24,13 @@ from gajim.common.const import TRUST_SYMBOL_DATA from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string +from gajim.common.styling import process from gajim.common.i18n import _ from gajim.common.i18n import Q_ from .base import BaseRow from .base import MoreMenuButton +from ..message_widget import MessageWidget from ...util import format_fingerprint @@ -60,8 +62,7 @@ def __init__(self, # other_tags_for_time were always empty? - BaseRow.__init__(self, account, widget='textview', - history_mode=history_mode) + BaseRow.__init__(self, account, history_mode=history_mode) self.type = 'chat' self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp @@ -80,13 +81,9 @@ def __init__(self, self.get_style_context().add_class( 'conversation-mention-highlight') - self.textview.connect('quote', self._on_quote_selection) - self.textview.print_text( - text, - other_text_tags=other_text_tags, - kind=kind, - name=name, - additional_data=additional_data) + result = process(text) + message_widget = MessageWidget(account) + message_widget.add_content(result.blocks) self._meta_box = Gtk.Box(spacing=6) self._meta_box.pack_start( @@ -132,7 +129,7 @@ def __init__(self, avatar_placeholder.add(self._avatar_surface) bottom_box = Gtk.Box(spacing=6) - bottom_box.add(self.textview) + bottom_box.add(message_widget) bottom_box.add(MoreMenuButton(self, history_mode=history_mode)) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -23,7 +23,7 @@ class ReadMarkerRow(BaseRow): def __init__(self, account, contact): - BaseRow.__init__(self, account) + BaseRow.__init__(self, account, widget='label') self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) @@ -34,6 +34,7 @@ def __init__(self, account, contact): self.label.get_style_context().add_class( 'conversation-read-marker') self.grid.attach(self.label, 0, 0, 1, 1) + self.set_no_show_all(True) def set_timestamp(self, timestamp): self.timestamp = timestamp ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -23,7 +23,7 @@ class ScrollHintRow(BaseRow): def __init__(self, account, history_mode=False): - BaseRow.__init__(self, account) + BaseRow.__init__(self, account, widget='label') self.set_selectable(False) self.set_activatable(False) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -210,6 +210,7 @@ def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): start_of_day = get_start_of_day(timestamp) ===================================== test/no_gui/test_styling.py ===================================== @@ -0,0 +1,352 @@ +import unittest + +import gajim.common.styling as styling +from gajim.common.styling import PlainBlock +from gajim.common.styling import PreBlock +from gajim.common.styling import QuoteBlock +from gajim.common.styling import PreTextSpan +from gajim.common.styling import StrongSpan +from gajim.common.styling import EmphasisSpan +from gajim.common.styling import StrikeSpan +from gajim.common.styling import Url +from gajim.common.styling import URL_RX +from gajim.common.styling import ADDRESS_RX + + +STYLING = { + 'pre cannot have children': { + 'input': '_no pre `with *children*`_', + 'tokens': [ + PlainBlock(start=0, end=26, text='_no pre `with *children*`_', spans=[ + PreTextSpan(start=8, end=25, text='`with *children*`'), + EmphasisSpan(start=0, end=26, text='_no pre `with *children*`_') + ]) + ] + }, + + 'nested spans': { + 'input': '_*~children~*_', + 'tokens': [ + PlainBlock(start=0, end=14, text='_*~children~*_', spans=[ + StrikeSpan(start=2, end=12, text='~children~'), + StrongSpan(start=1, end=13, text='*~children~*'), + EmphasisSpan(start=0, end=14, text='_*~children~*_'), + ]) + ] + }, + + 'spans': { + 'input': '*strong* _emph_~strike~ `pre`', + 'tokens': [ + PlainBlock(start=0, end=30, text='*strong* _emph_~strike~ `pre`', spans=[ + StrongSpan(start=0, end=8, text='*strong*'), + EmphasisSpan(start=9, end=15, text='_emph_'), + StrikeSpan(start=15, end=23, text='~strike~'), + PreTextSpan(start=25, end=30, text='`pre`') + ]) + ] + }, + + 'spans lazily match': { + 'input': '*strong*plain*', + 'tokens': [ + PlainBlock(start=0, end=14, text='*strong*plain*', spans=[ + StrongSpan(start=0, end=8, text='*strong*') + ]) + ] + }, + + 'start span only': { + 'input': '*not strong', + 'tokens': [ + PlainBlock(start=0, end=11, text='*not strong', spans=[]) + ] + }, + + 'end span only': { + 'input': 'not strong*', + 'tokens': [ + PlainBlock(start=0, end=11, text='not strong*', spans=[]) + ] + }, + + 'invalid end span': { + 'input': '*not *strong', + 'tokens': [ + PlainBlock(start=0, end=12, text='*not *strong', spans=[]) + ] + }, + + 'empty span': { + 'input': '**', + 'tokens': [ + PlainBlock(start=0, end=2, text='**', spans=[]) + ] + }, + + '3 unmatched directives': { + 'input': '***', + 'tokens': [ + PlainBlock(start=0, end=3, text='***', spans=[]) + ] + }, + + '4 unmatched directives': { + 'input': '****', + 'tokens': [ + PlainBlock(start=0, end=4, text='****', spans=[]) + ] + }, + + 'invalid diretives ignored': { + 'input': '* plain *strong*', + 'tokens': [ + PlainBlock(start=0, end=16, text='* plain *strong*', spans=[ + StrongSpan(start=8, end=16, text='*strong*') + ]) + ] + }, + + 'uneven start directives': { + 'input': '*this is *uneven*', + 'tokens': [ + PlainBlock(start=0, end=17, text='*this is *uneven*', spans=[ + StrongSpan(start=9, end=17, text='*uneven*') + ]) + ] + }, + + 'overlapping directives': { + 'input': '*this cannot _overlap*_', + 'tokens': [ + PlainBlock(start=0, end=23, text='*this cannot _overlap*_', spans=[ + StrongSpan(start=0, end=22, text='*this cannot _overlap*') + ]) + ] + }, + + 'plain blocks': { + 'input': 'one\nand two', + 'tokens': [ + PlainBlock(start=0, end=11, text='one\nand two', spans=[]) + ] + }, + + 'pre block with closing': { + 'input': '```\npre *fmt* ```\n```\nplain', + 'tokens': [ + PreBlock(start=0, end=22, text='```\npre *fmt* ```\n```\n', spans=[]), + PlainBlock(start=22, end=27, text='plain', spans=[]) + ] + }, + + 'pre block EOF': { + 'input': '````\na\n```', + 'tokens': [ + PreBlock(start=0, end=10, text='````\na\n```', spans=[]) + ] + }, + + 'pre block no terminator EOF': { + 'input': '```\na```', + 'tokens': [ + PlainBlock(start=0, end=8, text='```\na```', spans=[]) + ] + }, + + 'pre block no body EOF': { + 'input': '```newtoken\n', + 'tokens': [ + PlainBlock(start=0, end=12, text='```newtoken\n', spans=[]) + ] + }, + + 'single level block quote': { + 'input': '> quoted\nnot quoted', + 'tokens': [ + QuoteBlock(start=0, end=10, text='> quoted\n', spans=[], blocks=[ + PlainBlock(start=0, end=8, text=' quoted\n', spans=[]) + ]), + PlainBlock(start=10, end=20, text='not quoted', spans=[]) + ] + }, + + 'multi level block quote': { + 'input': '> quoted\n>> quote > 2\n>quote 1\n\nnot quoted', + 'tokens': [ + QuoteBlock(start=0, end=34, text='> quoted\n>> quote > 2\n>quote 1\n', spans=[], blocks=[ + PlainBlock(start=0, end=8, text=' quoted\n', spans=[]), + QuoteBlock(start=8, end=22, text='> quote > 2\n', spans=[], blocks=[ + PlainBlock(start=0, end=12, text=' quote > 2\n', spans=[]) + ]), + PlainBlock(start=22, end=30, text='quote 1\n', spans=[]) + ]), + PlainBlock(start=34, end=45, text='\nnot quoted', spans=[]) + ] + }, + + 'quote start then EOF': { + 'input': '> ', + 'tokens': [ + QuoteBlock(start=0, end=2, text='> ', spans=[], blocks=[]) + ] + }, + + 'quote with children': { + 'input': '> ```\n> pre\n> ```\n> not pre', + 'tokens': [ + QuoteBlock(start=0, end=27, text='> ```\n> pre\n> ```\n> not pre', spans=[], blocks=[ + PreBlock(start=0, end=12, text='```\npre\n```\n', spans=[]), + PlainBlock(start=12, end=19, text='not pre', spans=[]) + ]) + ] + }, + + 'pre end of parent': { + 'input': '> ``` \n> pre\nplain', + 'tokens': [ + QuoteBlock(start=0, end=13, text='> ``` \n> pre\n', spans=[], blocks=[ + PreBlock(start=0, end=9, text='``` \npre\n', spans=[]) + ]), + PlainBlock(start=13, end=18, text='plain', spans=[]) + ] + }, + + 'span lines': { + 'input': '*not \n strong*', + 'tokens': [ + PlainBlock(start=0, end=14, text='*not \n strong*', spans=[]) + ] + }, + + 'plain with uri': { + 'input': 'some kind of link http://foo.com/blah_blah', + 'tokens': [ + PlainBlock(start=0, end=42, text='some kind of link http://foo.com/blah_blah', spans=[], uris=[ + Url(start=18, end=42, text='http://foo.com/blah_blah') + ]) + ] + }, + + 'plain with uri don’t consider comma': { + 'input': 'some kind of link http://foo.com/blah_blah,', + 'tokens': [ + PlainBlock(start=0, end=43, text='some kind of link http://foo.com/blah_blah,', spans=[], uris=[ + Url(start=18, end=42, text='http://foo.com/blah_blah') + ]) + ] + }, + + 'plain with uri and styling': { + 'input': 'some *kind* of link http://foo.com/blah_blah', + 'tokens': [ + PlainBlock(start=0, end=44, text='some *kind* of link http://foo.com/blah_blah', spans=[ + StrongSpan(start=5, end=11, text='*kind*') + ], uris=[ + Url(start=20, end=44, text='http://foo.com/blah_blah') + ]) + ] + }, + +} + + +URLS = [ + 'http://foo.com/blah_blah', + 'http://foo.com/blah_blah/', + 'http://foo.com/blah_blah_(wikipedia)', + 'http://foo.com/blah_blah_(wikipedia)_(again)', + 'http://www.example.com/wpstyle/?p=364', + 'https://www.example.com/foo/?bar=baz&inga=42&quux', + 'http://✪df.ws/123', + 'http://userid:password@example.com:8080', + 'http://userid:password@example.com:8080/', + 'http://userid@example.com', + 'http://userid@example.com/', + 'http://userid@example.com:8080', + 'http://userid@example.com:8080/', + 'http://userid:password@example.com', + 'http://userid:password@example.com/', + 'http://142.42.1.1/', + 'http://142.42.1.1:8080/', + 'http://➡.ws/䨹', + 'http://⌘.ws', + 'http://⌘.ws/', + 'http://foo.com/blah_(wikipedia)#cite-1', + 'http://foo.com/blah_(wikipedia)_blah#cite-1', + 'http://foo.com/unicode_(✪)_in_parens', + 'http://foo.com/(something)?after=parens', + 'http://☺.damowmow.com/', + 'http://code.google.com/events/#&product=browser', + 'http://j.mp', + 'ftp://foo.bar/baz', + 'http://foo.bar/?q=Test%20URL-encoded%20stuff', + 'http://مثال.إختبار', + 'http://例子.测试', + 'http://उदाहरण.परीक्षा', + 'http://-.~_!$&\'()*+,;=:%40:80%2f::::::@example.com', + 'http://1337.net', + 'http://a.b-c.de', + 'http://223.255.255.254', + 'https://foo_bar.example.com/', +] + + +EMAILS = [ + 'asd(a)asd.at', + 'asd(a)asd.asd.at', +] + + +URL_WITH_TEXT = [ + ('see this http://userid@example.com/ link', 'http://userid@example.com/'), + ('see this http://userid@example.com/, and ..', 'http://userid@example.com/'), +] + +XMPP_URIS = [ + ('see xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message ...', 'xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message'), +] + + +class Test(unittest.TestCase): + def test_styling(self): + for _name, params in STYLING.items(): + result = styling.process(params['input']) + self.assertTrue(result.blocks == params['tokens']) + + def test_urls(self): + for url in URLS: + match = URL_RX.search(url) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(url[start:end] == url) + + def test_emails(self): + for email in EMAILS: + match = ADDRESS_RX.search(email) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(email[start:end] == email) + + def test_url_with_text(self): + for text, result in URL_WITH_TEXT: + match = URL_RX.search(text) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(text[start:end] == result) + + def test_xmpp_uris(self): + for text, result in XMPP_URIS: + match = ADDRESS_RX.search(text) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(text[start:end] == result) + + + +if __name__ == "__main__": + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b56b0da6ca78c27eb9a925534efc089… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b56b0da6ca78c27eb9a925534efc089… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix appveyor build
by Philipp Hörist 09 Apr '21

09 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1691af57 by lovetox at 2021-04-09T20:00:19+02:00 Windows: Fix appveyor build - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== @@ -24,6 +24,7 @@ install: - bash -lc "pacman --needed --noconfirm -Syu" # This is needed because without killing all processes -Su will fail - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process + - bash -lc "pacman -Sydd --noconfirm filesystem" - bash -lc "pacman --needed --noconfirm -Su" build_script: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1691af5715585bf1be96b6c0e77f0ecc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1691af5715585bf1be96b6c0e77f0ecc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: GTK Tests: Use ConversationView for XHTML test
by Daniel Brötzmann 04 Apr '21

04 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f821fecc by wurstsalat at 2021-04-05T00:01:38+02:00 GTK Tests: Use ConversationView for XHTML test - - - - - b56b0da6 by wurstsalat at 2021-04-05T00:03:49+02:00 Remove obsolete conversation_textview.py - - - - - 5 changed files: - − gajim/conversation_textview.py - gajim/gtk/conversation/view.py - gajim/gtk/conversation_textview.py - gajim/gtk/htmltextview.py - test/gtk/htmltextview.py Changes: ===================================== gajim/conversation_textview.py deleted ===================================== @@ -1,1297 +0,0 @@ -# Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> -# Copyright (C) 2005-2006 Alex Mauer <hawke AT hawkesnest.net> -# Travis Shirk <travis AT pobox.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# Julien Pivotto <roidelapluie AT gmail.com> -# Stephan Erb <steve-e AT h3c.de> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import time -import queue -import urllib -import logging - -from gi.repository import Gtk -from gi.repository import Pango -from gi.repository import GObject -from gi.repository import GLib -from gi.repository import Gdk - -from gajim.common import app -from gajim.common import helpers -from gajim.common import i18n -from gajim.common.i18n import _ -from gajim.common.i18n import Q_ -from gajim.common.helpers import AdditionalDataDict -from gajim.common.const import StyleAttr -from gajim.common.const import Trust -from gajim.common.const import URI_SCHEMES -from gajim.common.helpers import to_user_string -from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX -from gajim.common.regex import BASIC_REGEX -from gajim.common.regex import LINK_REGEX -from gajim.common.regex import EMOT_AND_BASIC_REGEX -from gajim.common.regex import EMOT_AND_LINK_REGEX - -from gajim.gui import util -from gajim.gui.util import get_cursor -from gajim.gui.util import format_fingerprint -from gajim.gui.util import text_to_color -from gajim.gui.emoji_data import emoji_pixbufs -from gajim.gui.emoji_data import is_emoji -from gajim.gui.emoji_data import get_emoji_pixbuf -from gajim.gui.htmltextview import HtmlTextView - -NOT_SHOWN = 0 -ALREADY_RECEIVED = 1 -SHOWN = 2 - -log = logging.getLogger('gajim.conversation_textview') - -TRUST_SYMBOL_DATA = { - Trust.UNTRUSTED: ('dialog-error-symbolic', - _('Untrusted'), - 'error-color'), - Trust.UNDECIDED: ('security-low-symbolic', - _('Trust Not Decided'), - 'warning-color'), - Trust.BLIND: ('security-medium-symbolic', - _('Unverified'), - 'encrypted-color'), - Trust.VERIFIED: ('security-high-symbolic', - _('Verified'), - 'encrypted-color') -} - - -class ConversationTextview(GObject.GObject): - """ - Class for the conversation textview (where user reads already said messages) - for chat/groupchat windows - """ - __gsignals__ = dict(quote=( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, # return value - (str, ) # arguments - )) - - def __init__(self, account, used_in_history_window=False): - """ - If used_in_history_window is True, then we do not show Clear menuitem in - context menu - """ - GObject.GObject.__init__(self) - self.used_in_history_window = used_in_history_window - self.line = 0 - self._message_list = [] - self.corrected_text_list = {} - - # no need to inherit TextView, use it as attribute is safer - self.tv = HtmlTextView(account) - self.tv.connect('query-tooltip', self._query_tooltip) - - self._buffer = self.tv.get_buffer() - self.handlers = {} - self.image_cache = {} - # self.last_sent_message_id = message_id - self.last_sent_message_id = None - # last_received_message_id[name] = (message_id, line_start_mark) - self.last_received_message_id = {} - self.autoscroll = True - # connect signals - id_ = self.tv.connect('populate_popup', self.on_textview_populate_popup) - self.handlers[id_] = self.tv - id_ = self.tv.connect('button_press_event', - self.on_textview_button_press_event) - self.handlers[id_] = self.tv - - self.account = account - self._cursor_changed = False - self.last_time_printout = 0 - self.encryption_enabled = False - - style = self.tv.get_style_context() - style.add_class('gajim-conversation-font') - buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() - buffer_.create_mark('end', end_iter, False) - - self.tagIn = buffer_.create_tag('incoming') - color = app.css_config.get_value( - '.gajim-incoming-nickname', StyleAttr.COLOR) - self.tagIn.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-incoming-nickname') - self.tagIn.set_property('font-desc', desc) - - self.tagOut = buffer_.create_tag('outgoing') - color = app.css_config.get_value( - '.gajim-outgoing-nickname', StyleAttr.COLOR) - self.tagOut.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-outgoing-nickname') - self.tagOut.set_property('font-desc', desc) - - self.tagStatus = buffer_.create_tag('status') - color = app.css_config.get_value( - '.gajim-status-message', StyleAttr.COLOR) - self.tagStatus.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-status-message') - self.tagStatus.set_property('font-desc', desc) - - self.tagInText = buffer_.create_tag('incomingtxt') - color = app.css_config.get_value( - '.gajim-incoming-message-text', StyleAttr.COLOR) - if color: - self.tagInText.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-incoming-message-text') - self.tagInText.set_property('font-desc', desc) - - self.tagOutText = buffer_.create_tag('outgoingtxt') - color = app.css_config.get_value( - '.gajim-outgoing-message-text', StyleAttr.COLOR) - if color: - self.tagOutText.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-outgoing-message-text') - self.tagOutText.set_property('font-desc', desc) - - self.tagMarked = buffer_.create_tag('marked') - color = app.css_config.get_value( - '.gajim-highlight-message', StyleAttr.COLOR) - self.tagMarked.set_property('foreground', color) - self.tagMarked.set_property('weight', Pango.Weight.BOLD) - - textview_icon = buffer_.create_tag('textview-icon') - textview_icon.set_property('rise', Pango.units_from_double(-2.45)) - - # To help plugins easily identify the nickname - buffer_.create_tag('nickname') - - tag = buffer_.create_tag('time_sometimes') - tag.set_property('foreground', 'darkgrey') - #Pango.SCALE_SMALL - tag.set_property('scale', 0.8333333333333) - tag.set_property('justification', Gtk.Justification.CENTER) - - tag = buffer_.create_tag('small') - #Pango.SCALE_SMALL - tag.set_property('scale', 0.8333333333333) - - self.tv.create_tags() - - tag = buffer_.create_tag('bold') - tag.set_property('weight', Pango.Weight.BOLD) - - tag = buffer_.create_tag('italic') - tag.set_property('style', Pango.Style.ITALIC) - - tag = buffer_.create_tag('strikethrough') - tag.set_property('strikethrough', True) - - buffer_.create_tag('focus-out-line', justification=Gtk.Justification.CENTER) - self.displaymarking_tags = {} - - # One mark at the beginning then 2 marks between each lines - size = app.settings.get('max_conversation_lines') - size = 2 * size - 1 - self.marks_queue = queue.Queue(size) - - self.allow_focus_out_line = True - # holds a mark at the end of --- line - self.focus_out_end_mark = None - - self.just_cleared = False - - def _query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): - window = widget.get_window(Gtk.TextWindowType.TEXT) - x_pos, y_pos = self.tv.window_to_buffer_coords( - Gtk.TextWindowType.TEXT, x_pos, y_pos) - - iter_ = self.tv.get_iter_at_position(x_pos, y_pos)[1] - for tag in iter_.get_tags(): - tag_name = tag.get_property('name') - if tag_name == 'focus-out-line': - tooltip.set_text(_( - 'Text below this line is what has ' - 'been said since the\nlast time you paid attention to this ' - 'group chat')) - return True - if getattr(tag, 'is_anchor', False): - text = getattr(tag, 'title', False) - if text: - if len(text) > 50: - text = text[:47] + '…' - tooltip.set_text(text) - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return True - if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return False - - if self._cursor_changed: - window.set_cursor(get_cursor('text')) - self._cursor_changed = False - return False - - def del_handlers(self): - for i in self.handlers: - if self.handlers[i].handler_is_connected(i): - self.handlers[i].disconnect(i) - del self.handlers - self.tv.destroy() - - def update_tags(self): - self.tagIn.set_property('foreground', app.css_config.get_value('.gajim-incoming-nickname', StyleAttr.COLOR)) - self.tagOut.set_property('foreground', app.css_config.get_value('.gajim-outgoing-nickname', StyleAttr.COLOR)) - self.tagStatus.set_property('foreground', - app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR)) - self.tagMarked.set_property('foreground', - app.css_config.get_value('.gajim-highlight-message', StyleAttr.COLOR)) - self.tv.update_tags() - - def scroll_to_end(self, force=False): - if self.autoscroll or force: - GLib.idle_add(util.scroll_to_end, self.tv.get_parent()) - - def correct_message(self, correct_id, kind, name): - allowed = True - if kind == 'incoming': - try: - if correct_id in self.last_received_message_id[name]: - start_mark = self.last_received_message_id[name][1] - else: - allowed = False - except KeyError: - allowed = False - elif kind == 'outgoing': - if self.last_sent_message_id[0] == correct_id: - start_mark = self.last_sent_message_id[1] - else: - allowed = False - else: - allowed = False - - if not allowed: - log.debug('Message correction not allowed') - return None - - end_mark, index = self.get_end_mark(correct_id, start_mark) - if not index: - log.debug('Could not find line to correct') - return None - - buffer_ = self.tv.get_buffer() - if not end_mark: - end_iter = self.tv.get_buffer().get_end_iter() - else: - end_iter = buffer_.get_iter_at_mark(end_mark) - - start_iter = buffer_.get_iter_at_mark(start_mark) - - old_txt = buffer_.get_text(start_iter, end_iter, True) - buffer_.delete(start_iter, end_iter) - buffer_.delete_mark(start_mark) - - return index, end_mark, old_txt - - def show_receipt(self, id_): - line = self._get_message_line(id_) - if line is None: - return - line.set_receipt() - - def show_displayed(self, id_): - line = self._get_message_line(id_) - if line is None: - return - line.set_displayed() - - def show_error(self, id_, error): - line = self._get_message_line(id_) - if line is None: - return - line.set_error(to_user_string(error)) - - def show_focus_out_line(self): - if not self.allow_focus_out_line: - # if room did not receive focus-in from the last time we added - # --- line then do not add again - return - - print_focus_out_line = False - buffer_ = self.tv.get_buffer() - - if self.focus_out_end_mark is None: - # this happens only first time we focus out on this room - print_focus_out_line = True - - else: - focus_out_end_iter = buffer_.get_iter_at_mark(self.focus_out_end_mark) - focus_out_end_iter_offset = focus_out_end_iter.get_offset() - if focus_out_end_iter_offset != buffer_.get_end_iter().get_offset(): - # this means after last-focus something was printed - # (else end_iter's offset is the same as before) - # only then print ---- line (eg. we avoid printing many following - # ---- lines) - print_focus_out_line = True - - if print_focus_out_line and buffer_.get_char_count() > 0: - buffer_.begin_user_action() - - # remove previous focus out line if such focus out line exists - if self.focus_out_end_mark is not None: - end_iter_for_previous_line = buffer_.get_iter_at_mark( - 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(21) - - # remove focus out line - buffer_.delete(begin_iter_for_previous_line, - end_iter_for_previous_line) - buffer_.delete_mark(self.focus_out_end_mark) - - # add the new focus out line - end_iter = buffer_.get_end_iter() - 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_chars(20) - buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) - - self.allow_focus_out_line = False - - # update the iter we hold to make comparison the next time - self.focus_out_end_mark = buffer_.create_mark(None, - buffer_.get_end_iter(), left_gravity=True) - - buffer_.end_user_action() - self.scroll_to_end() - - def clear(self, tv=None): - """ - Clear text in the textview - """ - buffer_ = self.tv.get_buffer() - start, end = buffer_.get_bounds() - buffer_.delete(start, end) - size = app.settings.get('max_conversation_lines') - size = 2 * size - 1 - self.marks_queue = queue.Queue(size) - self.focus_out_end_mark = None - self.just_cleared = True - - def visit_url_from_menuitem(self, widget, link): - """ - Basically it filters out the widget instance - """ - helpers.open_uri(link) - - def on_textview_populate_popup(self, textview, menu): - """ - Override the default context menu and we prepend Clear (only if - used_in_history_window is False) and if we have sth selected we show a - submenu with actions on the phrase (see - on_conversation_textview_button_press_event) - """ - separator_menuitem_was_added = False - if not self.used_in_history_window: - item = Gtk.SeparatorMenuItem.new() - menu.prepend(item) - separator_menuitem_was_added = True - - item = Gtk.MenuItem.new_with_mnemonic(_('_Clear')) - menu.prepend(item) - id_ = item.connect('activate', self.clear) - self.handlers[id_] = item - - if self.selected_phrase: - if not separator_menuitem_was_added: - item = Gtk.SeparatorMenuItem.new() - menu.prepend(item) - - if not self.used_in_history_window: - item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) - id_ = item.connect('activate', self.on_quote) - self.handlers[id_] = item - menu.prepend(item) - - _selected_phrase = helpers.reduce_chars_newlines( - self.selected_phrase, 25, 2) - item = Gtk.MenuItem.new_with_mnemonic( - _('_Actions for "%s"') % _selected_phrase) - menu.prepend(item) - submenu = Gtk.Menu() - item.set_submenu(submenu) - phrase_for_url = urllib.parse.quote(self.selected_phrase.encode( - 'utf-8')) - - always_use_en = app.settings.get('always_english_wikipedia') - if always_use_en: - link = 'https://en.wikipedia.org/wiki/Special:Search?search=%s'\ - % phrase_for_url - else: - link = 'https://%s.wikipedia.org/wiki/Special:Search?search=%s'\ - % (i18n.get_short_lang_code(), phrase_for_url) - item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - submenu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic(_('Look it up in _Dictionary')) - dict_link = app.settings.get('dictionary_url') - if dict_link == 'WIKTIONARY': - # special link (yeah undocumented but default) - always_use_en = app.settings.get('always_english_wiktionary') - if always_use_en: - link = 'https://en.wiktionary.org/wiki/Special:Search?search=%s'\ - % phrase_for_url - else: - link = 'https://%s.wiktionary.org/wiki/Special:Search?search=%s'\ - % (i18n.get_short_lang_code(), phrase_for_url) - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - else: - if dict_link.find('%s') == -1: - # we must have %s in the url if not WIKTIONARY - item = Gtk.MenuItem.new_with_label(_( - 'Dictionary URL is missing an "%s" and it is not WIKTIONARY')) - item.set_property('sensitive', False) - else: - link = dict_link % phrase_for_url - id_ = item.connect('activate', self.visit_url_from_menuitem, - link) - self.handlers[id_] = item - submenu.append(item) - - - search_link = app.settings.get('search_engine') - if search_link.find('%s') == -1: - # we must have %s in the url - item = Gtk.MenuItem.new_with_label( - _('Web Search URL is missing an "%s"')) - item.set_property('sensitive', False) - else: - item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) - link = search_link % phrase_for_url - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - submenu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - submenu.append(item) - - menu.show_all() - - def on_quote(self, widget): - self.emit('quote', self.selected_phrase) - - def on_textview_button_press_event(self, widget, event): - # If we clicked on a tagged text do NOT open the standard popup menu - # if normal text check if we have sth selected - self.selected_phrase = '' # do not move below event button check! - - if event.button != 3: # if not right click - return False - - x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - int(event.x), int(event.y)) - iter_ = self.tv.get_iter_at_location(x, y) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - - if tags: # we clicked on sth special (it can be status message too) - for tag in tags: - tag_name = tag.get_property('name') - if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - return True # we block normal context menu - - # we check if sth was selected and if it was we assign - # selected_phrase variable - # so on_conversation_textview_populate_popup can use it - buffer_ = self.tv.get_buffer() - return_val = buffer_.get_selection_bounds() - if return_val: # if sth was selected when we right-clicked - # get the selected text - start_sel, finish_sel = return_val[0], return_val[1] - self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True) - elif iter_.get_char() and ord(iter_.get_char()) > 31: - # we clicked on a word, do as if it's selected for context menu - start_sel = iter_.copy() - if not start_sel.starts_word(): - start_sel.backward_word_start() - finish_sel = iter_.copy() - if not finish_sel.ends_word(): - finish_sel.forward_word_end() - self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True) - - def detect_and_print_special_text(self, otext, other_tags, graphics=True, - iter_=None, additional_data=None): - """ - Detect special text (emots & links & formatting), print normal text - before any special text it founds, then print special text (that happens - many times until last special text is printed) and then return the index - after *last* special text, so we can print it in - print_conversation_line() - """ - if not otext: - return - if additional_data is None: - additional_data = AdditionalDataDict() - buffer_ = self.tv.get_buffer() - if other_tags: - insert_tags_func = buffer_.insert_with_tags_by_name - else: - insert_tags_func = buffer_.insert - # detect_and_print_special_text() is also used by - # HtmlHandler.handle_specials() and there tags is Gtk.TextTag objects, - # not strings - if other_tags and isinstance(other_tags[0], Gtk.TextTag): - insert_tags_func = buffer_.insert_with_tags - - index = 0 - - # Too many special elements (emoticons, LaTeX formulas, etc) - # may cause Gajim to freeze (see #5129). - # We impose an arbitrary limit of 100 specials per message. - specials_limit = 100 - - # add oob text to the end - - oob_url = additional_data.get_value('gajim', 'oob_url') - if oob_url is not None: - oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') - if oob_url != otext: - otext += '\n{} {}'.format(oob_desc, oob_url) - - # basic: links + mail + formatting is always checked (we like that) - if app.settings.get('emoticons_theme') and graphics: - # search for emoticons & urls - if app.settings.get('ascii_formatting'): - regex = EMOT_AND_BASIC_REGEX - else: - regex = EMOT_AND_LINK_REGEX - else: - if app.settings.get('ascii_formatting'): - # search for just urls + mail + formatting - regex = BASIC_REGEX - else: # search for just urls + mail - regex = LINK_REGEX - iterator = regex.finditer(otext) - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - for match in iterator: - start, end = match.span() - special_text = otext[start:end] - if start > index: - text_before_special_text = otext[index:start] - if not iter_: - end_iter = buffer_.get_end_iter() - # we insert normal text - if other_tags: - insert_tags_func(end_iter, text_before_special_text, *other_tags) - else: - buffer_.insert(end_iter, text_before_special_text) - index = end # update index - - # now print it - self.print_special_text(special_text, other_tags, graphics=graphics, - iter_=end_iter, additional_data=additional_data) - specials_limit -= 1 - if specials_limit <= 0: - break - - # add the rest of text located in the index and after - insert_tags_func(end_iter, otext[index:], *other_tags) - - return end_iter - - def print_special_text(self, special_text, other_tags, graphics=True, - iter_=None, additional_data=None): - """ - Is called by detect_and_print_special_text and prints special text - (emots, links, formatting) - """ - if additional_data is None: - additional_data = AdditionalDataDict() - - # PluginSystem: adding GUI extension point for ConversationTextview - self.plugin_modified = False - app.plugin_manager.extension_point('print_special_text', self, - special_text, other_tags, graphics, additional_data, iter_) - if self.plugin_modified: - return - - tags = [] - use_other_tags = True - text_is_valid_uri = False - is_xhtml_link = None - show_ascii_formatting_chars = \ - app.settings.get('show_ascii_formatting_chars') - buffer_ = self.tv.get_buffer() - - # Detect XHTML-IM link - ttt = buffer_.get_tag_table() - tags_ = [(ttt.lookup(t) if isinstance(t, str) else t) for t in other_tags] - for t in tags_: - is_xhtml_link = getattr(t, 'href', None) - if is_xhtml_link: - break - - # Check if we accept this as an uri - for scheme in URI_SCHEMES: - if special_text.startswith(scheme): - text_is_valid_uri = True - - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - - theme = app.settings.get('emoticons_theme') - show_emojis = theme and theme != 'font' - if show_emojis and graphics and is_emoji(special_text): - # it's an emoticon - if emoji_pixbufs.complete: - # only search for the pixbuf if we are sure - # that loading is completed - pixbuf = get_emoji_pixbuf(special_text) - if pixbuf is None: - buffer_.insert(end_iter, special_text) - else: - pixbuf = pixbuf.copy() - anchor = buffer_.create_child_anchor(end_iter) - anchor.plaintext = special_text - img = Gtk.Image.new_from_pixbuf(pixbuf) - img.show() - self.tv.add_child_at_anchor(img, anchor) - else: - # Set marks and save them so we can replace the emojis - # once the loading is complete - start_mark = buffer_.create_mark(None, end_iter, True) - buffer_.insert(end_iter, special_text) - end_mark = buffer_.create_mark(None, end_iter, True) - emoji_pixbufs.append_marks( - self.tv, start_mark, end_mark, special_text) - - elif (special_text.startswith('www.') or - special_text.startswith('ftp.') or - text_is_valid_uri and not is_xhtml_link): - tags.append('url') - elif special_text.startswith('mailto:') and not is_xhtml_link: - tags.append('mail') - elif special_text.startswith('xmpp:') and not is_xhtml_link: - tags.append('xmpp') - elif STH_AT_STH_DOT_STH_REGEX.match(special_text) and \ - not is_xhtml_link: - # it's a JID or mail - tags.append('sth_at_sth') - elif special_text.startswith('*'): # it's a bold text - tags.append('bold') - if special_text[1] == '~' and special_text[-2] == '~' and\ - len(special_text) > 4: # it's also strikethrough - tags.append('strikethrough') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove *~ ~* - elif special_text[1] == '_' and special_text[-2] == '_' and \ - len(special_text) > 4: # it's also italic - tags.append('italic') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove *_ _* - else: - if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove * * - elif special_text.startswith('~'): # it's a strikethrough text - tags.append('strikethrough') - if special_text[1] == '*' and special_text[-2] == '*' and \ - len(special_text) > 4: # it's also bold - tags.append('bold') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove ~* *~ - elif special_text[1] == '_' and special_text[-2] == '_' and \ - len(special_text) > 4: # it's also italic - tags.append('italic') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove ~_ _~ - else: - if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove ~ ~ - elif special_text.startswith('_'): # it's an italic text - tags.append('italic') - if special_text[1] == '*' and special_text[-2] == '*' and \ - len(special_text) > 4: # it's also bold - tags.append('bold') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove _* *_ - elif special_text[1] == '~' and special_text[-2] == '~' and \ - len(special_text) > 4: # it's also strikethrough - tags.append('strikethrough') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove _~ ~_ - else: - if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove _ _ - else: - # It's nothing special - if use_other_tags: - insert_tags_func = buffer_.insert_with_tags_by_name - if other_tags and isinstance(other_tags[0], Gtk.TextTag): - insert_tags_func = buffer_.insert_with_tags - if other_tags: - insert_tags_func(end_iter, special_text, *other_tags) - else: - buffer_.insert(end_iter, special_text) - - if tags: - all_tags = tags[:] - if use_other_tags: - all_tags += other_tags - # convert all names to TextTag - all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] - buffer_.insert_with_tags(end_iter, special_text, *all_tags) - if 'url' in tags: - puny_text = helpers.puny_encode_url(special_text) - if puny_text != special_text: - puny_tags = [] - if use_other_tags: - puny_tags += other_tags - if not puny_text: - puny_text = _('Invalid URL') - puny_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in puny_tags] - buffer_.insert_with_tags(end_iter, " (%s)" % puny_text, *puny_tags) - - def print_empty_line(self, iter_=None): - buffer_ = self.tv.get_buffer() - if not iter_: - iter_ = buffer_.get_end_iter() - buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') - self.just_cleared = False - - def get_end_mark(self, message_id, start_mark): - for index, line in enumerate(self._message_list): - if line.id == message_id and line.start_mark == start_mark: - try: - end_mark = self._message_list[index + 1].start_mark - end_mark_name = end_mark.get_name() - except IndexError: - # We are at the last message - end_mark = None - end_mark_name = None - - log.debug('start mark: %s, end mark: %s, ' - 'replace message-list index: %s', - start_mark.get_name(), end_mark_name, index) - - return end_mark, index - log.debug('stanza-id not in message list') - return None, None - - def get_insert_mark(self, timestamp): - # message_list = [(timestamp, line_start_mark, message_id)] - # We check if this is a new Message - try: - if self._message_list[-1].timestamp <= timestamp: - return None, None - except IndexError: - # We have no Messages in the TextView - return None, None - - # Not a new Message - # Search for insertion point - for index, line in enumerate(self._message_list): - if line.timestamp > timestamp: - return line.start_mark, index - - # Should not happen, but who knows - return None, None - - def _get_message_line(self, id_): - for message_line in reversed(self._message_list): - if message_line.id == id_: - return message_line - - def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - subject=None, old_kind=None, graphics=True, - displaymarking=None, message_id=None, correct_id=None, additional_data=None, - marker=None, error=None): - """ - Print 'chat' type messages - """ - if additional_data is None: - additional_data = AdditionalDataDict() - buffer_ = self.tv.get_buffer() - buffer_.begin_user_action() - insert_mark = None - insert_mark_name = None - - if kind == 'incoming_queue': - kind = 'incoming' - if old_kind == 'incoming_queue': - old_kind = 'incoming' - - if not tim: - # For outgoing Messages and Status prints - tim = time.time() - - corrected = False - if correct_id: - try: - index, insert_mark, old_txt = \ - self.correct_message(correct_id, kind, name) - if correct_id in self.corrected_text_list: - self.corrected_text_list[message_id] = \ - self.corrected_text_list[correct_id] + '\n{}' \ - .format(GLib.markup_escape_text(old_txt)) - del self.corrected_text_list[correct_id] - else: - self.corrected_text_list[message_id] = \ - _('Message corrected. Original message:\n{}') \ - .format(GLib.markup_escape_text(old_txt)) - corrected = True - except TypeError: - log.debug('Message was not corrected !') - - if not corrected: - # Get insertion point into TextView - insert_mark, index = self.get_insert_mark(tim) - - if insert_mark: - insert_mark_name = insert_mark.get_name() - - log.debug( - 'Printed Line: %s, %s, %s, inserted after: %s' - ', stanza-id: %s, correct-id: %s', - self.line, text, tim, insert_mark_name, - message_id, correct_id) - - if not insert_mark: # Texview is empty or Message is new - iter_ = buffer_.get_end_iter() - # Insert new Line if Textview is not empty - if buffer_.get_char_count() > 0 and not corrected: - buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') - else: - iter_ = buffer_.get_iter_at_mark(insert_mark) - - # Create a temporary mark at the start of the line - # with gravity=Left, so it will not move - # even if we insert directly at the mark iter - temp_mark = buffer_.create_mark('temp', iter_, left_gravity=True) - - if text.startswith('/me '): - direction_mark = i18n.paragraph_direction_mark(str(text[3:])) - else: - direction_mark = i18n.paragraph_direction_mark(text) - # don't apply direction mark if it's status message - if kind == 'status': - direction_mark = i18n.direction_mark - - # print the encryption icon - if kind in ('incoming', 'outgoing'): - self.print_encryption_status(iter_, additional_data) - - # print the time stamp - self.print_time(text, kind, tim, direction_mark, - other_tags_for_time, iter_) - - # If there's a displaymarking, print it here. - if displaymarking: - self.print_displaymarking(displaymarking, iter_) - - # kind = info, we print things as if it was a status: same color, ... - if kind in ('error', 'info'): - kind = 'status' - other_text_tag = self.detect_other_text_tag(text, kind) - text_tags = [] - if other_tags_for_text: - text_tags = other_tags_for_text[:] # create a new list - if other_text_tag: - text_tags.append(other_text_tag) - - else: # not status nor /me - if app.settings.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, iter_=iter_) - else: - self.print_real_text(app.settings.get( - 'chat_merge_consecutive_nickname_indent'), - mark=insert_mark, additional_data=additional_data) - else: - self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark, iter_=iter_) - if kind == 'incoming': - text_tags.append('incomingtxt') - elif kind == 'outgoing': - text_tags.append('outgoingtxt') - - self.print_subject(subject, iter_=iter_) - - iter_ = self.print_real_text(text, text_tags, name, graphics=graphics, - mark=insert_mark, additional_data=additional_data) - - message_icons = MessageIcons() - self._insert_message_icons(iter_, message_icons) - - # If we inserted a Line we add a new line at the end - if insert_mark: - buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') - # We delete the temp mark and replace it with a mark - # that has gravity=right - temp_iter = buffer_.get_iter_at_mark(temp_mark) - buffer_.delete_mark(temp_mark) - new_mark = buffer_.create_mark( - str(self.line), temp_iter, left_gravity=False) - - message_line = MessageLine(message_id, tim, message_icons, new_mark) - - if corrected: - message_line.set_correction( - self.corrected_text_list[message_id]) - - if error is not None: - message_line.set_error(to_user_string(error)) - - if marker is not None: - if marker == 'received': - message_line.set_receipt() - elif marker == 'displayed': - message_line.set_displayed() - - if index is None: - # New Message - self._message_list.append(message_line) - elif corrected: - # Replace the corrected message - self._message_list[index] = message_line - else: - # We insert the message at index - self._message_list.insert(index, message_line) - - if kind == 'incoming': - self.last_received_message_id[name] = (message_id, new_mark) - elif kind == 'outgoing': - self.last_sent_message_id = (message_id, new_mark) - - if not insert_mark: - if self.autoscroll or kind == 'outgoing': - # we are at the end or we are sending something - self.scroll_to_end(force=True) - - self.just_cleared = False - buffer_.end_user_action() - - self.line += 1 - - def get_time_to_show(self, tim): - """ - Format the time according to config setting 'time_stamp' - """ - format_ = helpers.from_one_line(app.settings.get('time_stamp')) - tim_format = time.strftime(format_, tim) - return tim_format - - def detect_other_text_tag(self, text, kind): - if kind == 'status': - return kind - if text.startswith('/me ') or text.startswith('/me\n'): - return kind - - def _insert_message_icons(self, iter_, message_icons): - temp_mark = self._buffer.create_mark(None, iter_, True) - self._buffer.insert(iter_, ' ') - anchor = self._buffer.create_child_anchor(iter_) - anchor.plaintext = '' - self._buffer.insert(iter_, ' ') - - # Apply mark to vertically center the icon - start = self._buffer.get_iter_at_mark(temp_mark) - self._buffer.apply_tag_by_name('textview-icon', start, iter_) - self.tv.add_child_at_anchor(message_icons, anchor) - - def print_encryption_status(self, iter_, additional_data): - details = self._get_encryption_details(additional_data) - if details is None: - # Message was not encrypted - if not self.encryption_enabled: - return - icon = 'channel-insecure-symbolic' - color = 'unencrypted-color' - tooltip = _('Not encrypted') - else: - name, fingerprint, trust = details - tooltip = _('Encrypted (%s)') % (name) - if trust is None: - # The encryption plugin did not pass trust information - icon = 'channel-secure-symbolic' - color = 'encrypted-color' - else: - icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] - tooltip = '%s\n%s' % (tooltip, trust_tooltip) - if fingerprint is not None: - fingerprint = format_fingerprint(fingerprint) - tooltip = '%s\n<tt>%s</tt>' % (tooltip, fingerprint) - - temp_mark = self._buffer.create_mark(None, iter_, True) - self._buffer.insert(iter_, ' ') - anchor = self._buffer.create_child_anchor(iter_) - anchor.plaintext = '' - self._buffer.insert(iter_, ' ') - - # Apply mark to vertically center the icon - start = self._buffer.get_iter_at_mark(temp_mark) - self._buffer.apply_tag_by_name('textview-icon', start, iter_) - - image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) - image.show() - image.set_tooltip_markup(tooltip) - image.get_style_context().add_class(color) - self.tv.add_child_at_anchor(image, anchor) - - @staticmethod - def _get_encryption_details(additional_data): - name = additional_data.get_value('encrypted', 'name') - if name is None: - return - - fingerprint = additional_data.get_value('encrypted', 'fingerprint') - trust = additional_data.get_value('encrypted', 'trust') - return name, fingerprint, trust - - def print_time(self, text, kind, tim, direction_mark, other_tags_for_time, iter_): - local_tim = time.localtime(tim) - buffer_ = self.tv.get_buffer() - current_print_time = app.settings.get('print_time') - - if current_print_time == 'always': - timestamp_str = self.get_time_to_show(local_tim) - timestamp = time.strftime(timestamp_str, local_tim) - timestamp = direction_mark + timestamp + direction_mark - if other_tags_for_time: - buffer_.insert_with_tags_by_name(iter_, timestamp, - *other_tags_for_time) - else: - buffer_.insert(iter_, timestamp) - elif current_print_time == 'sometimes': - every_foo_seconds = 60 * app.settings.get( - 'print_ichat_every_foo_minutes') - seconds_passed = tim - self.last_time_printout - if seconds_passed > every_foo_seconds: - self.last_time_printout = tim - tim_format = self.get_time_to_show(local_tim) - buffer_.insert_with_tags_by_name(iter_, tim_format + '\n', - 'time_sometimes') - - def print_displaymarking(self, displaymarking, iter_): - bgcolor = displaymarking.bgcolor - fgcolor = displaymarking.fgcolor - text = displaymarking.name - if text: - buffer_ = self.tv.get_buffer() - tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, - buffer_.create_tag(None, background=bgcolor, foreground=fgcolor)) - buffer_.insert_with_tags(iter_, '[' + text + ']', tag) - buffer_.insert_with_tags(iter_, ' ') - - def print_name(self, name, kind, other_tags_for_name, direction_mark='', - iter_=None): - if name: - name_tags = [] - buffer_ = self.tv.get_buffer() - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - - if other_tags_for_name: - name_tags = other_tags_for_name[:] # create a new list - name_tags.append(kind) - name_tags.append('nickname') - - for tag in name_tags: - if tag.startswith('muc_nickname_color_'): - self._add_new_colour_tags(tag, name) - - before_str = app.settings.get('before_nickname') - before_str = helpers.from_one_line(before_str) - after_str = app.settings.get('after_nickname') - after_str = helpers.from_one_line(after_str) - format_ = before_str + name + direction_mark + after_str + ' ' - buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) - - def _add_new_colour_tags(self, tag, name): - if self._buffer.get_tag_table().lookup(tag) is not None: - return - rgba = Gdk.RGBA(*text_to_color(name)) - self._buffer.create_tag(tag, foreground_rgba=rgba) - - def print_subject(self, subject, iter_=None): - if subject: # if we have subject, show it too! - subject = _('Subject: %s\n') % subject - buffer_ = self.tv.get_buffer() - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - buffer_.insert(end_iter, subject) - self.print_empty_line(end_iter) - - def print_real_text(self, text, text_tags=None, name=None, - graphics=True, mark=None, additional_data=None): - """ - Add normal and special text. call this to add text - """ - if text_tags is None: - text_tags = [] - if additional_data is None: - additional_data = AdditionalDataDict() - buffer_ = self.tv.get_buffer() - if not mark: - iter_ = buffer_.get_end_iter() - else: - iter_ = buffer_.get_iter_at_mark(mark) - - xhtml = additional_data.get_value('gajim', 'xhtml', False) - if xhtml and app.settings.get('show_xhtml'): - 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, iter_=iter_) - return iter_ - except Exception as error: - log.debug('Error processing xhtml: %s', error) - log.debug('with |%s|', xhtml) - - # /me is replaced by name if name is given - if name and (text.startswith('/me ') or text.startswith('/me\n')): - text = '* ' + name + text[3:] - text_tags.append('italic') - - # PluginSystem: adding GUI extension point for ConversationTextview - self.plugin_modified = False - app.plugin_manager.extension_point('print_real_text', self, - text, text_tags, graphics, iter_, additional_data) - - if self.plugin_modified: - if not mark: - return buffer_.get_end_iter() - return buffer_.get_iter_at_mark(mark) - - if not mark: - iter_ = buffer_.get_end_iter() - else: - iter_ = buffer_.get_iter_at_mark(mark) - - # detect urls formatting and if the user has it on emoticons - return self.detect_and_print_special_text(text, text_tags, graphics=graphics, - iter_=iter_, additional_data=additional_data) - - -class MessageLine: - def __init__(self, id_, timestamp, message_icons, start_mark): - self.id = id_ - self.timestamp = timestamp - self.start_mark = start_mark - self._has_receipt = False - self._has_displayed = False - self._message_icons = message_icons - - @property - def has_receipt(self): - return self._has_receipt - - @property - def has_displayed(self): - return self._has_displayed - - def set_receipt(self): - self._has_receipt = True - if self._has_displayed: - return - self._message_icons.set_receipt_icon_visible(True) - - def set_displayed(self): - self._has_displayed = True - self._message_icons.set_displayed_icon_visible(True) - - def set_correction(self, tooltip): - self._message_icons.set_correction_icon_visible(True) - self._message_icons.set_correction_tooltip(tooltip) - - def set_error(self, tooltip): - self._message_icons.set_error_icon_visible(True) - self._message_icons.set_error_tooltip(tooltip) - - -class MessageIcons(Gtk.Box): - def __init__(self): - Gtk.Box.__init__(self, - orientation=Gtk.Orientation.HORIZONTAL) - - self._correction_image = Gtk.Image.new_from_icon_name( - 'document-edit-symbolic', Gtk.IconSize.MENU) - self._correction_image.set_no_show_all(True) - - self._marker_image = Gtk.Image.new_from_icon_name( - 'feather-check-symbolic', Gtk.IconSize.MENU) - self._marker_image.get_style_context().add_class( - 'receipt-received-color') - self._marker_image.set_tooltip_text(_('Received')) - self._marker_image.set_no_show_all(True) - - self._error_image = Gtk.Image.new_from_icon_name( - 'dialog-warning-symbolic', Gtk.IconSize.MENU) - self._error_image.get_style_context().add_class('warning-color') - self._error_image.set_no_show_all(True) - - self.add(self._correction_image) - self.add(self._marker_image) - self.add(self._error_image) - self.show_all() - - def set_receipt_icon_visible(self, visible): - if not app.settings.get('positive_184_ack'): - return - self._marker_image.set_visible(visible) - - def set_displayed_icon_visible(self, visible): - self._marker_image.set_visible(visible) - self._marker_image.set_from_icon_name( - 'feather-check-double-symbolic', Gtk.IconSize.MENU) - self._marker_image.set_tooltip_text(Q_('?Message state:Read')) - - def set_correction_icon_visible(self, visible): - self._correction_image.set_visible(visible) - - def set_correction_tooltip(self, text): - self._correction_image.set_tooltip_markup(text) - - def set_error_icon_visible(self, visible): - self._error_image.set_visible(visible) - - def set_error_tooltip(self, text): - self._error_image.set_tooltip_markup(text) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -52,7 +52,9 @@ def __init__(self, account, contact, history_mode=False): self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_sort_func(self._sort_func) self._account = account - self._client = app.get_client(account) + self._client = None + if account is not None: + self._client = app.get_client(account) self._contact = contact self._history_mode = history_mode @@ -70,8 +72,9 @@ def __init__(self, account, contact, history_mode=False): # message_id -> row mapping self._message_id_row_map = {} - self._read_marker_row = ReadMarkerRow(self._account, self._contact) - self.add(self._read_marker_row) + if self._contact is not None: + self._read_marker_row = ReadMarkerRow(self._account, self._contact) + self.add(self._read_marker_row) self._scroll_hint_row = ScrollHintRow(self._account, history_mode=self._history_mode) @@ -133,8 +136,9 @@ def add_message(self, if other_text_tags is None: other_text_tags = [] - if (kind in ('status', 'info') or - (subject and self._contact.is_groupchat)): + muc_subject = bool(subject and self._contact is not None and + self._contact.is_groupchat) + if kind in ('status', 'info') or muc_subject: message = InfoMessageRow( self._account, timestamp, @@ -157,6 +161,11 @@ def add_message(self, return avatar = self._get_avatar(kind, name) + + is_groupchat = False + if self._contact is not None: + is_groupchat = self._contact.is_groupchat + message = MessageRow( self._account, message_id, @@ -166,7 +175,7 @@ def add_message(self, text, other_text_tags, avatar, - self._contact.is_groupchat, + is_groupchat, additional_data=additional_data, display_marking=display_marking, marker=marker, @@ -181,6 +190,9 @@ def add_message(self, self._insert_message(message) def _get_avatar(self, kind, name): + if self._contact is None: + return None + scale = self.get_scale_factor() if self._contact.is_groupchat: contact = self._contact.get_resource(name) ===================================== gajim/gtk/conversation_textview.py ===================================== @@ -184,8 +184,7 @@ def print_text(self, text, other_text_tags=None, kind=None, graphics=True, if (name and (text.startswith('/me ') or text.startswith('/me\n'))): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.display_html( - xhtml, self, self) + self.display_html(xhtml, self) return except Exception as err: log.debug('Error processing xhtml: %s', err) @@ -217,7 +216,7 @@ def print_text(self, text, other_text_tags=None, kind=None, graphics=True, GLib.idle_add(self.queue_resize) def parse_formatting(self, text, text_tags, graphics=True, - additional_data=None): + additional_data=None, iter_=None): ''' Parses message formatting (Emojis, URIs, Styles). A regex is used for text matching. Each text fragment gets @@ -237,10 +236,8 @@ def parse_formatting(self, text, text_tags, graphics=True, else: insert_tags_func = buffer_.insert - # TODO: Adapt HtmlHandler.handle_specials() - # detect_and_print_special_text() is used by - # HtmlHandler.handle_specials() and uses Gtk.TextTag objects, - # not strings + # parse_formatting() is used by HtmlHandler.handle_specials() + # and uses Gtk.TextTag objects, not strings if text_tags and isinstance(text_tags[0], Gtk.TextTag): insert_tags_func = buffer_.insert_with_tags @@ -273,7 +270,11 @@ def parse_formatting(self, text, text_tags, graphics=True, regex = LINK_REGEX iterator = regex.finditer(text) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() + # TODO: Evaluate limit # Too many fragments (emoticons, LaTeX formulas, etc) # may cause Gajim to freeze (see #5129). @@ -285,7 +286,8 @@ def parse_formatting(self, text, text_tags, graphics=True, fragment = text[start:end] if start > index: text_before_fragment = text[index:start] - end_iter = buffer_.get_end_iter() + if not iter_: + end_iter = buffer_.get_end_iter() if text_tags: insert_tags_func( end_iter, text_before_fragment, *text_tags) @@ -296,7 +298,8 @@ def parse_formatting(self, text, text_tags, graphics=True, self.apply_formatting(fragment, text_tags, graphics=graphics, - additional_data=additional_data) + additional_data=additional_data, + iter_=end_iter) fragment_limit += 1 if fragment_limit <= 0: break @@ -304,8 +307,10 @@ def parse_formatting(self, text, text_tags, graphics=True, # Add remaining text after last match insert_tags_func(buffer_.get_end_iter(), text[index:], *text_tags) + return end_iter + def apply_formatting(self, fragment, text_tags, graphics=True, - additional_data=None): + additional_data=None, iter_=None): # TODO: Plugin system GUI extension point # self.plugin_modified = False # app.plugin_manager.extension_point('print_special_text', self, @@ -329,7 +334,10 @@ def apply_formatting(self, fragment, text_tags, graphics=True, # Check if we accept this as an uri is_valid_uri = fragment.startswith(tuple(URI_SCHEMES)) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() theme = app.settings.get('emoticons_theme') show_emojis = theme and theme != 'font' ===================================== gajim/gtk/htmltextview.py ===================================== @@ -208,12 +208,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler): It keeps a stack of "style spans" (start/end element pairs) and a stack of list counters, for nested lists. """ - def __init__(self, textview, conv_textview, startiter): + def __init__(self, textview, startiter): xml.sax.handler.ContentHandler.__init__(self) self.textbuf = textview.get_buffer() self.textview = textview self.iter = startiter - self.conv_textview = conv_textview self.text = '' self.starting = True self.preserve = False @@ -561,11 +560,10 @@ def _anchor_event(self, _tag, _textview, event, _iter, href, type_): return False def handle_specials(self, text): - if self.conv_textview: - self.iter = self.conv_textview.detect_and_print_special_text( - text, self._get_style_tags(), iter_=self.iter) - else: - self._insert_text(text) + # TODO: Parse formatting + # self.iter = self.textview.parse_formatting( + # text, self._get_style_tags(), iter_=self.iter) + self._insert_text(text) def characters(self, content): if self.preserve: @@ -830,14 +828,14 @@ def hyperlink_handler(self, texttag, _widget, event, iter_, _kind): open_uri(uri, account=self.account) return Gdk.EVENT_STOP - def display_html(self, html, textview, conv_textview, iter_=None): + def display_html(self, html, textview, iter_=None): buffer_ = self.get_buffer() if iter_: eob = iter_ else: eob = buffer_.get_end_iter() parser = xml.sax.make_parser() - parser.setContentHandler(HtmlHandler(textview, conv_textview, eob)) + parser.setContentHandler(HtmlHandler(textview, eob)) parser.parse(StringIO(html)) # If the xhtml ends with a BLOCK element we have to remove # the \n we add after BLOCK elements ===================================== test/gtk/htmltextview.py ===================================== @@ -7,17 +7,33 @@ from gajim.common import app from gajim.common import configpaths configpaths.init() -from gajim.common.helpers import AdditionalDataDict +from gajim.common.const import KindConstant from gajim import gui gui.init('gtk') -from gajim.conversation_textview import ConversationTextview +from gajim.common.helpers import AdditionalDataDict + +from gajim.gui.conversation.view import ConversationView from gajim.gui_interface import Interface + +def setting_side_effect(*args, **kwargs): + if args[0] == 'chat_timestamp_format': + return '%H:%M' + if args[0] in ('autoawaytime', 'autoxatime'): + return 5 + if args[0] == 'show_xhtml': + return True + + +app.settings = MagicMock() +app.settings.get.side_effect = setting_side_effect + app.plugin_manager = MagicMock() app.logger = MagicMock() app.cert_store = MagicMock() +app.storage = MagicMock() app.interface = Interface() @@ -45,10 +61,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> @@ -60,10 +72,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> @@ -77,10 +85,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> @@ -93,10 +97,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <ul style='background-color:rgb(120,140,100)'> @@ -114,10 +114,6 @@ def faciter(n,acc): </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <ol style='background-color:rgb(120,140,100)'> @@ -136,10 +132,6 @@ def faciter(n,acc): </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> @@ -163,10 +155,6 @@ def faciter(n,acc): </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ @@ -178,32 +166,38 @@ def faciter(n,acc): hhx4dbgYKAAA7' alt='Larry'/> </body> ''', - ] class TextviewWindow(Gtk.Window): def __init__(self): - Gtk.Window.__init__(self, title="Textview Test") + Gtk.Window.__init__(self, title='Textview Test') self.set_default_size(600, 600) - self._textview = ConversationTextview(None) + self._conversation_view = ConversationView(None, None) scrolled = Gtk.ScrolledWindow() scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) - scrolled.add(self._textview.tv) + scrolled.add(self._conversation_view) self.add(scrolled) self.show() self._print_xhtml() def _print_xhtml(self): + timestamp = 1 for xhtml in XHTML: additional_data = AdditionalDataDict() additional_data.set_value('gajim', 'xhtml', xhtml) - self._textview.print_real_text(None, additional_data=additional_data) - self._textview.print_real_text('\n') + self._conversation_view.add_message( + '', + KindConstant.SINGLE_MSG_RECV, + 'Test Row', + timestamp, + additional_data=additional_data) + timestamp += 1 + win = TextviewWindow() -win.connect("destroy", Gtk.main_quit) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a45033ce8f89390dd7765c279918467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a45033ce8f89390dd7765c279918467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix readmarker breaking merge
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a45033ce by lovetox at 2021-04-04T23:51:48+02:00 Fix readmarker breaking merge - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -236,6 +236,9 @@ def _find_ancestor(self, message): if row is None: return None + if row.type == 'read_marker': + continue + if row.type != 'chat': return None @@ -254,6 +257,9 @@ def _update_descendants(self, message): if row is None: return + if row.type == 'read_marker': + continue + if row.type != 'chat': return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a45033ce8f89390dd7765c279918467d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a45033ce8f89390dd7765c279918467d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] show info messages
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5a86aeb2 by lovetox at 2021-04-04T23:45:14+02:00 show info messages - - - - - 1 changed file: - gajim/gtk/conversation/rows/info.py Changes: ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -65,3 +65,4 @@ def __init__(self, graphics=graphics) self.grid.attach(self.textview, 1, 0, 1, 1) + self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a86aeb247715ebc31c5f44e159a3825… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a86aeb247715ebc31c5f44e159a3825… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve read marker
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 27cdd4a7 by lovetox at 2021-04-04T23:38:23+02:00 Improve read marker - - - - - 2 changed files: - gajim/chat_control.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -559,6 +559,8 @@ def _on_message_received(self, event): correct_id=event.correct_id, additional_data=event.additional_data) + self.conversation_view.set_read_marker(event.properties.id) + def _on_message_error(self, event): self.conversation_view.show_error(event.message_id, event.error) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -311,6 +311,10 @@ def iter_rows(self): yield row def set_read_marker(self, id_): + if id_ is None: + self._read_marker_row.hide() + return + row = self._get_row_by_message_id(id_) if row is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27cdd4a72f7d18dbf71df34cf9f60da8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27cdd4a72f7d18dbf71df34cf9f60da8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove unused imports
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f354d46a by lovetox at 2021-04-04T23:24:56+02:00 Remove unused imports - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -15,8 +15,6 @@ import logging import time -from bisect import bisect_right -from datetime import datetime from datetime import timedelta from gi.repository import GLib @@ -96,7 +94,6 @@ def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): - self._last_incoming_timestamp = datetime.fromtimestamp(0) self._row_count = 0 self.clearing = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f354d46a504a5ce53b9b9e419b0a2294… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f354d46a504a5ce53b9b9e419b0a2294… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Make read recipes work
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d652c035 by lovetox at 2021-04-04T23:23:37+02:00 Make read recipes work - - - - - 2 changed files: - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from datetime import datetime from gi.repository import Gtk @@ -19,11 +20,12 @@ from .base import BaseRow + class ReadMarkerRow(BaseRow): - def __init__(self, account, contact, timestamp): + def __init__(self, account, contact): BaseRow.__init__(self, account) self.type = 'read_marker' - self.timestamp = timestamp + self.timestamp = datetime.fromtimestamp(0) text = _('%s has read up to this point') % contact.name self.label.set_text(text) @@ -32,4 +34,8 @@ def __init__(self, account, contact, timestamp): self.label.get_style_context().add_class( 'conversation-read-marker') self.grid.attach(self.label, 0, 0, 1, 1) + + def set_timestamp(self, timestamp): + self.timestamp = timestamp + self.changed() self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -15,9 +15,7 @@ import logging import time -from bisect import bisect_left from bisect import bisect_right -from collections import deque from datetime import datetime from datetime import timedelta @@ -68,15 +66,15 @@ def __init__(self, account, contact, history_mode=False): self._row_count = 0 self._max_row_count = 100 + # Keeps track of date rows we have added to the list self._active_date_rows = set() - # Keeps inserted message IDs to avoid re-inserting the same message - self._message_ids_inserted = {} + # message_id -> row mapping + self._message_id_row_map = {} - # Last incoming chat message timestamp (used for ReadMarkerRows) - self._last_incoming_timestamp = datetime.fromtimestamp(0) + self._read_marker_row = ReadMarkerRow(self._account, self._contact) + self.add(self._read_marker_row) - # Insert the very first row, containing the scroll hint and load button self._scroll_hint_row = ScrollHintRow(self._account, history_mode=self._history_mode) self.add(self._scroll_hint_row) @@ -98,9 +96,7 @@ def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): - self._message_ids_inserted.clear() self._last_incoming_timestamp = datetime.fromtimestamp(0) - self._timestamps_inserted.clear() self._row_count = 0 self.clearing = False @@ -134,13 +130,6 @@ def add_message(self, other_text_tags, display_marking, additional_data, subject, marker, error, history, graphics) - if message_id: - if message_id in self._message_ids_inserted: - log.warning('Rejecting insertion of duplicate message_id %s', - str(message_id)) - return - self._message_ids_inserted[message_id] = True - if not timestamp: timestamp = time.time() @@ -189,6 +178,9 @@ def add_message(self, history_mode=self._history_mode, log_line_id=log_line_id) + if message.type == 'chat': + self._message_id_row_map[message.message_id] = message + self._insert_message(message) def _get_avatar(self, kind, name): @@ -309,10 +301,7 @@ def reduce_message_count(self): return successful def _get_row_by_message_id(self, id_): - for row in self.get_children(): - if row.message_id == id_: - return row - return None + return self._message_id_row_map.get(id_) def get_row_by_log_line_id(self, log_line_id): for row in self.get_children(): @@ -325,70 +314,14 @@ def iter_rows(self): yield row def set_read_marker(self, id_): - message_row = self._get_row_by_message_id(id_) - if message_row is None: - return - - message_row.set_displayed() - self._update_read_marker(message_row.timestamp) - - def _update_read_marker(self, current_timestamp): - marker_shown = False - - for row in self.get_children(): - if row.type == 'read_marker': - # We already have a ReadMarkerRow, decide if we keep it - marker_shown = True - - if self._last_incoming_timestamp > row.timestamp: - # Last incoming message is newer than read marker - self.remove(row) - self._timestamps_inserted.remove(row.timestamp) - marker_shown = False - break - - if self._last_incoming_timestamp > current_timestamp: - # Last incoming message is newer than current message - break - - if current_timestamp > row.timestamp: - # Message is newer than current ReadMarkerRow - current_row = self.get_row_at_index( - self._timestamps_inserted.index(current_timestamp)) - if current_row.has_displayed: - # Current row has a displayed marker, which means - # that the current ReadMarkerRow is out of date - self.remove(row) - self._timestamps_inserted.remove(row.timestamp) - marker_shown = False - break - break - - if self._last_incoming_timestamp >= current_timestamp: - # Don’t add ReadMarkerRow if last incoming message is newer - return - - if marker_shown: - # There is a ReadMarkerRow which has not been removed by previous - # rules, thus it’s the most current one (nothing more to do) + row = self._get_row_by_message_id(id_) + if row is None: return - current_row = self.get_row_at_index( - self._timestamps_inserted.index(current_timestamp)) - if current_row.type != 'chat': - return + row.set_displayed() - if current_row.has_displayed: - # Add a new ReadMarkerRow, if there is a marker for the current row - self._insert_read_marker(current_timestamp) - - def _insert_read_marker(self, timestamp): - insertion_point = bisect_right( - self._timestamps_inserted, timestamp) - read_marker_row = ReadMarkerRow( - self._account, self._contact, timestamp) - self.insert(read_marker_row, insertion_point) - self._timestamps_inserted.insert(insertion_point, timestamp) + timestamp = row.timestamp + timedelta(microseconds=1) + self._read_marker_row.set_timestamp(timestamp) def update_avatars(self): for row in self.get_children(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d652c035d9280525da8943223310e9a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d652c035d9280525da8943223310e9a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve View sorting
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 77a47d74 by lovetox at 2021-04-04T22:55:03+02:00 Improve View sorting - - - - - 5 changed files: - gajim/common/helpers.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1361,3 +1361,10 @@ def get_muc_context(jid): if (disco_info.muc_is_members_only and disco_info.muc_is_nonanonymous): return 'private' return 'public' + + +def get_start_of_day(date_time): + return date_time.replace(hour=0, + minute=0, + second=0, + microsecond=0) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -39,6 +39,7 @@ def __init__(self, account, widget='label', history_mode=False): self.message_id = None self.log_line_id = None self.text = '' + self._merged = False self.get_style_context().add_class('conversation-row') @@ -58,6 +59,10 @@ def __init__(self, account, widget='label', history_mode=False): self.label.set_line_wrap_mode( Pango.WrapMode.WORD_CHAR) + @property + def is_merged(self): + return self._merged + def update_text_tags(self): if self.textview is not None: self.textview.update_text_tags() ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -19,7 +19,7 @@ class DateRow(BaseRow): - def __init__(self, account, date_string, timestamp): + def __init__(self, account, timestamp): BaseRow.__init__(self, account) self.set_selectable(False) @@ -29,8 +29,10 @@ def __init__(self, account, date_string, timestamp): self.timestamp = timestamp self.get_style_context().add_class('conversation-date-row') - self.label.set_text(date_string) + self.label.set_text(timestamp.strftime('%a, %d %b %Y')) self.label.set_halign(Gtk.Align.CENTER) self.label.set_hexpand(True) self.label.get_style_context().add_class('conversation-meta') self.grid.attach(self.label, 0, 0, 1, 1) + + self.show_all() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from datetime import datetime +from datetime import timedelta from gi.repository import Gdk from gi.repository import GLib @@ -31,6 +32,9 @@ from ...util import format_fingerprint +MERGE_TIMEFRAME = timedelta(seconds=120) + + class MessageRow(BaseRow): def __init__(self, account, @@ -135,6 +139,18 @@ def __init__(self, self.grid.attach(self._meta_box, 1, 0, 1, 1) self.grid.attach(bottom_box, 1, 1, 1, 1) + self.show_all() + + def is_same_sender(self, message): + return message.name == self.name + + def is_mergeable(self, message): + if message.type != self.type: + return False + if not self.is_same_sender(message): + return False + return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME + def on_copy_message(self, _widget): timestamp = self.timestamp.strftime('%x, %X') clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -232,6 +248,7 @@ def update_avatar(self, avatar): self._avatar_surface.set_from_surface(avatar) def set_merged(self, merged): + self._merged = merged if merged: self.get_style_context().add_class('merged') self._avatar_surface.set_no_show_all(True) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.helpers import to_user_string +from gajim.common.helpers import get_start_of_day from .util import scroll_to_end from .conversation.rows.read_marker import ReadMarkerRow @@ -53,6 +54,7 @@ class ConversationView(Gtk.ListBox): def __init__(self, account, contact, history_mode=False): Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_sort_func(self._sort_func) self._account = account self._client = app.get_client(account) self._contact = contact @@ -62,30 +64,15 @@ def __init__(self, account, contact, history_mode=False): self.autoscroll = True self.clearing = False - # Both first and last DateRow (datetime) - self._first_date = None - self._last_date = None - # Keeps track of the number of rows shown in ConversationView self._row_count = 0 self._max_row_count = 100 + self._active_date_rows = set() + # Keeps inserted message IDs to avoid re-inserting the same message self._message_ids_inserted = {} - # We keep a sorted array of all the timestamps we've inserted, which - # have a 1-to-1 mapping to the actual child elements of this ListBox - # (*all* rows are included). - # Binary-searching this array enables us to insert a message with a - # discontinuous timestamp (not less than or greater than the first or - # last message timestamp in the list), and insert it at the correct - # place in the ListBox. - self._timestamps_inserted = deque() - - # Stores the timestamp of the first *chat* row inserted - # (not a system row or date row) - self.first_message_timestamp = None - # Last incoming chat message timestamp (used for ReadMarkerRows) self._last_incoming_timestamp = datetime.fromtimestamp(0) @@ -93,7 +80,6 @@ def __init__(self, account, contact, history_mode=False): self._scroll_hint_row = ScrollHintRow(self._account, history_mode=self._history_mode) self.add(self._scroll_hint_row) - self._timestamps_inserted.append(datetime.fromtimestamp(0)) def clear(self): self.clearing = True @@ -112,15 +98,17 @@ def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): - self._first_date = None - self._last_date = None self._message_ids_inserted.clear() - self.first_message_timestamp = None self._last_incoming_timestamp = datetime.fromtimestamp(0) self._timestamps_inserted.clear() self._row_count = 0 self.clearing = False + def _sort_func(self, row1, row2): + if row1.timestamp == row2.timestamp: + return 0 + return -1 if row1.timestamp < row2.timestamp else 1 + def add_message(self, text, kind, @@ -201,7 +189,7 @@ def add_message(self, history_mode=self._history_mode, log_line_id=log_line_id) - self._insert_message(message, kind, history) + self._insert_message(message) def _get_avatar(self, kind, name): scale = self.get_scale_factor() @@ -217,128 +205,77 @@ def _get_avatar(self, kind, name): return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) - def _insert_message(self, message, kind, history): - current_date = message.timestamp.strftime('%a, %d %b %Y') - - if self._is_out_of_order(message.timestamp, history): - insertion_point = bisect_left(self._timestamps_inserted, message.timestamp) - date_check_point = min(len( - self._timestamps_inserted) - 1, insertion_point - 1) - date_at_dcp = self._timestamps_inserted[date_check_point].strftime( - '%a, %d %b %Y') - if date_at_dcp != current_date: - associated_timestamp = message.timestamp - timedelta( - hours=message.timestamp.hour, - minutes=message.timestamp.minute, - seconds=message.timestamp.second) - date_row = DateRow( - self._account, current_date, associated_timestamp) - self.insert(date_row, insertion_point) - self._timestamps_inserted.insert( - insertion_point, associated_timestamp) - self._row_count += 1 - insertion_point += 1 - if (kind in ('incoming', 'incoming_queue') and - message.timestamp > self._last_incoming_timestamp): - self._last_incoming_timestamp = message.timestamp - self.insert(message, insertion_point) - self._timestamps_inserted.insert(insertion_point, message.timestamp) - current_timestamp = message.timestamp - self._row_count += 1 - elif history: - if current_date != self._first_date: - associated_timestamp = message.timestamp - timedelta( - hours=message.timestamp.hour, - minutes=message.timestamp.minute, - seconds=message.timestamp.second) - date_row = DateRow( - self._account, current_date, associated_timestamp) - self.insert(date_row, 1) - self._timestamps_inserted.insert(1, associated_timestamp) - self._row_count += 1 - self._first_date = current_date - if kind in ('incoming', 'incoming_queue', 'outgoing'): - self.first_message_timestamp = message.timestamp - if (kind in ('incoming', 'incoming_queue') and - message.timestamp > self._last_incoming_timestamp): - self._last_incoming_timestamp = message.timestamp - self.insert(message, 2) - self._timestamps_inserted.insert(2, message.timestamp) - if self._last_date is None: - self._last_date = current_date - current_timestamp = message.timestamp - self._row_count += 1 - else: - if current_date != self._last_date: - associated_timestamp = message.timestamp - timedelta( - hours=message.timestamp.hour, - minutes=message.timestamp.minute, - seconds=message.timestamp.second) - date_row = DateRow( - self._account, current_date, associated_timestamp) - self.add(date_row) - self._timestamps_inserted.append(associated_timestamp) - self._row_count += 1 - if self._first_date is None: - self._first_date = current_date - if (kind in ('incoming', 'incoming_queue', 'outgoing') and not - self.first_message_timestamp): - self.first_message_timestamp = message.timestamp - if (kind in ('incoming', 'incoming_queue') and - message.timestamp > self._last_incoming_timestamp): - self._last_incoming_timestamp = message.timestamp - self._last_date = current_date - self.add(message) - self._timestamps_inserted.append(message.timestamp) - current_timestamp = message.timestamp - self._row_count += 1 - - if message.type == 'chat': - self._merge_message(current_timestamp) - self._update_read_marker(current_timestamp) - - self.show_all() - - def _is_out_of_order(self, time_: datetime, history: bool) -> bool: - if history: - if self.first_message_timestamp: - return time_ > self.first_message_timestamp - return False - if len(self._timestamps_inserted) > 1: - return time_ < self._timestamps_inserted[-1] - return False - - def _merge_message(self, timestamp): - # 'Merge' message rows if they both meet certain conditions - # (see _is_mergeable). A merged message row does not display any - # avatar or meta info, and makes it look merged with the previous row. - if self._contact.is_groupchat: + def _insert_message(self, message): + self.add(message) + self._add_date_row(message.timestamp) + self._check_for_merge(message) + + def _add_date_row(self, timestamp): + start_of_day = get_start_of_day(timestamp) + if start_of_day in self._active_date_rows: return - current_index = self._timestamps_inserted.index(timestamp) - previous_row = self.get_row_at_index(current_index - 1) - current_row = self.get_row_at_index(current_index) - next_row = self.get_row_at_index(current_index + 1) - if next_row is not None: - if self._is_mergeable(current_row, next_row): - next_row.set_merged(True) - - if self._is_mergeable(current_row, previous_row): - current_row.set_merged(True) - if next_row is not None: - if self._is_mergeable(current_row, next_row): - next_row.set_merged(True) - - @staticmethod - def _is_mergeable(row1, row2): - # TODO: Check for same encryption - timestamp1 = row1.timestamp.strftime('%H:%M') - timestamp2 = row2.timestamp.strftime('%H:%M') - kind1 = row1.kind - kind2 = row2.kind - if timestamp1 == timestamp2 and kind1 == kind2: - return True - return False + date_row = DateRow(self._account, start_of_day) + self._active_date_rows.add(start_of_day) + self.add(date_row) + + row = self.get_row_at_index(date_row.get_index() + 1) + if row is None: + return + + if row.type != 'chat': + return + + row.set_merged(False) + + def _check_for_merge(self, message): + if message.type != 'chat': + return + + ancestor = self._find_ancestor(message) + if ancestor is None: + self._update_descendants(message) + else: + if message.is_mergeable(ancestor): + message.set_merged(True) + + def _find_ancestor(self, message): + index = message.get_index() + while index != 0: + index -= 1 + row = self.get_row_at_index(index) + if row is None: + return None + + if row.type != 'chat': + return None + + if not message.is_same_sender(row): + return None + + if not row.is_merged: + return row + return None + + def _update_descendants(self, message): + index = message.get_index() + while True: + index += 1 + row = self.get_row_at_index(index) + if row is None: + return + + if row.type != 'chat': + return + + if message.is_mergeable(row): + row.set_merged(True) + continue + + if message.is_same_sender(row): + row.set_merged(False) + self._update_descendants(row) + return def reduce_message_count(self): successful = False @@ -352,8 +289,6 @@ def reduce_message_count(self): # it’s safe to remove the fist row self.remove(row1) successful = True - self._timestamps_inserted.remove(row1.timestamp) - self._first_date = row2.timestamp.strftime('%a, %d %b %Y') self._row_count -= 1 continue @@ -362,14 +297,6 @@ def reduce_message_count(self): # remove the second row instead self.remove(row2) successful = True - self._timestamps_inserted.remove(row2.timestamp) - if row2.message_id: - self._message_ids_inserted.pop(row2.message_id) - chat_row = self._get_first_chat_row() - if chat_row is not None: - self.first_message_timestamp = chat_row.timestamp - else: - self.first_message_timestamp = None self._row_count -= 1 continue @@ -377,17 +304,6 @@ def reduce_message_count(self): # Not a date row, safe to remove self.remove(row1) successful = True - self._timestamps_inserted.remove(row1.timestamp) - if row1.message_id: - self._message_ids_inserted.pop(row1.message_id) - if row2.type == 'chat': - self.first_message_timestamp = row2.timestamp - else: - chat_row = self._get_first_chat_row() - if chat_row is not None: - self.first_message_timestamp = chat_row.timestamp - else: - self.first_message_timestamp = None self._row_count -= 1 return successful @@ -408,12 +324,6 @@ def iter_rows(self): for row in self.get_children(): yield row - def _get_first_chat_row(self): - for row in self.get_children(): - if row.type == 'chat': - return row - return None - def set_read_marker(self, id_): message_row = self._get_row_by_message_id(id_) if message_row is None: @@ -516,5 +426,3 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) - - # TODO: focus_out_line for group chats View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77a47d74ce985fc60a000306627363ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77a47d74ce985fc60a000306627363ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix completion state
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 56f4d5eb by lovetox at 2021-04-04T17:50:50+02:00 Fix completion state - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1413,7 +1413,7 @@ def fetch_n_lines_history(self, _scrolled, n_lines): n_lines) if not messages: - self._scrolled_view.set_history_complete() + self._scrolled_view.set_history_complete(True) return for msg in messages: ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -29,6 +29,7 @@ def __init__(self, account, history_mode=False): self.type = 'system' self.timestamp = datetime.fromtimestamp(0) + self._history_mode = history_mode self.get_style_context().add_class('conversation-system-row') @@ -36,14 +37,16 @@ def __init__(self, account, history_mode=False): self.label.set_hexpand(True) self.label.get_style_context().add_class( 'conversation-meta') + self.grid.attach(self.label, 0, 1, 1, 1) + + self.set_history_complete(False) - if history_mode: + def set_history_complete(self, complete): + if self._history_mode: self.label.set_text(_('Use the calendar to select a specific date')) - self.grid.attach(self.label, 0, 1, 1, 1) return - self.label.set_text(_('Scroll up to load more chat history…')) - self.grid.attach(self.label, 0, 1, 1, 1) - - def set_history_complete(self): - self.label.set_text(_('There is no more history')) + if complete: + self.label.set_text(_('There is no more history')) + else: + self.label.set_text(_('Scroll up to load more chat history…')) ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -56,13 +56,15 @@ def __init__(self, *args, **kwargs): vadjustment.connect('notify::upper', self._on_adj_upper_changed) vadjustment.connect('notify::value', self._on_adj_value_changed) - @property - def autoscroll(self): + def get_autoscroll(self): return self._autoscroll - def set_history_complete(self): - self._complete = True - self.get_child().get_child().set_history_complete() + def get_view(self): + return self.get_child().get_child() + + def set_history_complete(self, complete): + self._complete = complete + self.get_view().set_history_complete(complete) def _on_adj_upper_changed(self, adj, *args): upper = adj.get_upper() @@ -72,6 +74,7 @@ def _on_adj_upper_changed(self, adj, *args): self._current_upper = upper if self._autoscroll: adj.set_value(adj.get_upper() - adj.get_page_size()) + else: # Workaround # https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 ===================================== gajim/gtk/conversation/view.py ===================================== @@ -108,8 +108,8 @@ def get_first_message_row(self): return row return None - def set_history_complete(self): - self._scroll_hint_row.set_history_complete() + def set_history_complete(self, complete): + self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): self._first_date = None @@ -203,10 +203,6 @@ def add_message(self, self._insert_message(message, kind, history) - # Check for maximum message count - # if self.autoscroll and self._row_count > self._max_row_count: - # self._reduce_message_count() - def _get_avatar(self, kind, name): scale = self.get_scale_factor() if self._contact.is_groupchat: @@ -344,7 +340,8 @@ def _is_mergeable(row1, row2): return True return False - def _reduce_message_count(self): + def reduce_message_count(self): + successful = False while self._row_count > self._max_row_count: # We want to keep relevant DateRows when removing rows row1 = self.get_row_at_index(1) @@ -354,6 +351,7 @@ def _reduce_message_count(self): # First two rows are date rows, # it’s safe to remove the fist row self.remove(row1) + successful = True self._timestamps_inserted.remove(row1.timestamp) self._first_date = row2.timestamp.strftime('%a, %d %b %Y') self._row_count -= 1 @@ -363,6 +361,7 @@ def _reduce_message_count(self): # First one is a date row, keep it and # remove the second row instead self.remove(row2) + successful = True self._timestamps_inserted.remove(row2.timestamp) if row2.message_id: self._message_ids_inserted.pop(row2.message_id) @@ -377,6 +376,7 @@ def _reduce_message_count(self): if row1.type != 'date': # Not a date row, safe to remove self.remove(row1) + successful = True self._timestamps_inserted.remove(row1.timestamp) if row1.message_id: self._message_ids_inserted.pop(row1.message_id) @@ -390,6 +390,8 @@ def _reduce_message_count(self): self.first_message_timestamp = None self._row_count -= 1 + return successful + def _get_row_by_message_id(self, id_): for row in self.get_children(): if row.message_id == id_: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56f4d5ebe9fc9444b024cb921a770561… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56f4d5ebe9fc9444b024cb921a770561… You're receiving this email because of your account on dev.gajim.org.

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