Daniel Brötzmann pushed to branch master at gajim / gajim

Commits: 5784dfd4 by wurstsalat at 2022-06-02T23:24:34+02:00 fix: Remove update_text_tags method

MessageTextview will be phased out soon, and there is only URL color tags left

- - - - -

6 changed files:

- gajim/gtk/controls/base.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py

Changes:

===================================== gajim/gtk/controls/base.py ===================================== @@ -286,7 +286,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: ('ping-sent', ged.GUI1, self._nec_ping), ('ping-reply', ged.GUI1, self._nec_ping), ('ping-error', ged.GUI1, self._nec_ping), - ('style-changed', ged.GUI1, self._style_changed), ])

# This is basically a very nasty hack to surpass the inability @@ -1321,12 +1320,6 @@ def _on_formatting_menuitem_activate(self, formatting = menu_item.get_name() self.msg_textview.apply_formatting(formatting)

- def _style_changed(self, _event: events.StyleChanged) -> None: - self.update_text_tags() - - def update_text_tags(self) -> None: - self.conversation_view.update_text_tags() - def set_control_active(self, state: bool) -> None: if not self._chat_loaded: self.fetch_n_lines_history(self._scrolled_view, True, 20)

===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -93,8 +93,3 @@ def add_content(self, content: ContentT) -> None:

def clear(self) -> None: self.foreach(self.remove) - - def update_text_tags(self, *args: Any) -> None: - for widget in cast(list[MessageWidget], self.get_children()): - if not isinstance(widget, CodeWidget): - widget.update_text_tags()

===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -74,9 +74,6 @@ def add_action_phrase(self, text: str, nickname: str) -> None: text = GLib.markup_escape_text(text) self._text_widget.add_action_phrase(text)

- def update_text_tags(self) -> None: - self._text_widget.update_text_tags() -

class MessageLabel(Gtk.Label): def __init__(self, account: str, selectable: bool) -> None: @@ -125,9 +122,6 @@ def print_text_with_styling(self, block: PlainBlock) -> None: def add_action_phrase(self, text: str) -> None: self.set_markup(f'<i>{text}</i>')

- def update_text_tags(self) -> None: - pass - def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: open_uri(uri, self._account) return Gdk.EVENT_STOP @@ -201,14 +195,6 @@ def _create_url_tags(self) -> None: underline=Pango.Underline.SINGLE) tag.connect('event', self._on_uri_clicked, tag)

- def update_text_tags(self) -> None: - tag_table = self.get_buffer().get_tag_table() - url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - for tag_name in URI_TAGS: - tag = tag_table.lookup(tag_name) - assert tag is not None - tag.set_property('foreground', url_color) - def clear(self) -> None: buffer_ = self.get_buffer() start, end = buffer_.get_bounds()

===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -60,9 +60,6 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: def is_merged(self) -> bool: return self._merged

- def update_text_tags(self) -> None: - pass - @staticmethod def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: time_format = from_one_line(app.settings.get('chat_timestamp_format'))

===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -229,10 +229,6 @@ def __init__(self,

self.show_all()

- def update_text_tags(self) -> None: - if isinstance(self._message_widget, MessageWidget): - self._message_widget.update_text_tags() - def _check_for_highlight(self, text: str) -> None: assert isinstance(self._contact, GroupchatContact) if self._contact.nickname is None:

===================================== gajim/gtk/conversation/view.py ===================================== @@ -485,11 +485,6 @@ def update_avatars(self) -> None: if isinstance(row, MessageRow): row.update_avatar()

- def update_text_tags(self) -> None: - for row in cast(list[BaseRow], self.get_children()): - if isinstance(row, MessageRow): - row.update_text_tags() - def scroll_to_end(self, force: bool = False) -> None: if self.autoscroll or force: GLib.idle_add(self.emit, 'scroll-to-end')

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5784dfd43b2e54cc9554a0f27a7280591...