Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Preview: Reduce logging verbosity for URI checking
by Daniel Brötzmann (＠wurstsalat) 18 Dec '21

18 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7f8c7990 by wurstsalat at 2021-12-18T13:56:13+01:00 Preview: Reduce logging verbosity for URI checking - - - - - 17b37003 by wurstsalat at 2021-12-18T13:57:29+01:00 ChatList: Process /me messages - - - - - 2 changed files: - gajim/common/preview.py - gajim/gtk/chat_list.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -229,7 +229,6 @@ def is_previewable(self, additional_data: AdditionalDataDict) -> bool: if len(text.split(' ')) > 1: # urlparse doesn't recognise spaces as URL delimiter - log.debug('Text is not an uri: %s...', text[:15]) return False uri = text ===================================== gajim/gtk/chat_list.py ===================================== @@ -53,14 +53,14 @@ class ChatList(Gtk.ListBox, EventHelper): - def __init__(self, workspace_id): + def __init__(self, workspace_id: str) -> None: Gtk.ListBox.__init__(self) EventHelper.__init__(self) + self._workspace_id = workspace_id self._chats: Dict[Tuple[str, JID], Any] = {} self._current_filter: str = 'all' self._current_filter_text: str = '' - self._workspace_id: str = workspace_id self.get_style_context().add_class('chatlist') self.set_filter_func(self._filter_func) @@ -386,7 +386,9 @@ def _on_message_received(self, event): row.set_stanza_id(stanza_id) row.set_message_id(event.unique_id) row.set_message_text( - event.msgtxt, additional_data=event.additional_data) + event.msgtxt, + nickname=nick, + additional_data=event.additional_data) self._add_unread(row, event.properties, event.msgtxt) self.invalidate_sort() @@ -420,23 +422,25 @@ def _on_message_sent(self, event): if own_jid.bare_match(event.jid): nick = '' else: - nick = _('Me: ') + nick = _('Me') row.set_nick(nick) # Set timestamp if it's None (outgoing MUC messages) row.set_timestamp(event.timestamp or time.time()) row.set_message_text( - event.message, additional_data=event.additional_data) + event.message, + nickname=app.nicks[event.account], + additional_data=event.additional_data) self.invalidate_sort() @staticmethod def _get_nick_for_received_message(event): - nick = _('Me: ') + nick = _('Me') if event.properties.type.is_groupchat: event_nick = event.properties.muc_nickname our_nick = get_group_chat_nick(event.account, event.jid) if event_nick != our_nick: - nick = _('%(incoming_nick)s: ') % {'incoming_nick': event_nick} + nick = event_nick else: con = app.get_client(event.account) own_jid = con.get_own_jid() @@ -569,21 +573,24 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, message_text = get_retraction_text( self.account, retracted_by, reason) - self.set_message_text( - message_text, additional_data=line.additional_data) if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): - self._ui.nick_label.set_text(_('Me:')) - self._ui.nick_label.show() + self.set_nick(_('Me')) + me_nickname = app.nicks[account] if line.kind == KindConstant.GC_MSG: our_nick = get_group_chat_nick(account, jid) if line.contact_name == our_nick: - self._ui.nick_label.set_text(_('Me:')) + self.set_nick(_('Me')) + me_nickname = our_nick else: - self._ui.nick_label.set_text(_('%(muc_nick)s:') % { - 'muc_nick': line.contact_name}) - self._ui.nick_label.show() + self.set_nick(line.contact_name) + me_nickname = line.contact_name + + self.set_message_text( + message_text, + nickname=me_nickname, + additional_data=line.additional_data) self.timestamp = line.time uf_timestamp = get_uf_relative_time(line.time) @@ -821,9 +828,13 @@ def update_time(self) -> None: def set_nick(self, nickname: str) -> None: self._ui.nick_label.set_visible(bool(nickname)) - self._ui.nick_label.set_text(nickname) + self._ui.nick_label.set_text( + _('%(nickname)s:') % {'nickname': nickname}) - def set_message_text(self, text: str, icon_name: Optional[str] = None, + def set_message_text(self, + text: str, + nickname: Optional[str] = None, + icon_name: Optional[str] = None, additional_data: Optional[AdditionalDataDict] = None ) -> None: icon = None @@ -836,10 +847,16 @@ def set_message_text(self, text: str, icon_name: Optional[str] = None, icon, file_type = guess_simple_file_type(text) text = f'{file_type} ({file_name})' + text = GLib.markup_escape_text(text) + if text.startswith('/me') and nickname is not None: + nickname = GLib.markup_escape_text(nickname) + text = text.replace('/me', f'* {nickname}', 1) + text = f'<i>{text}</i>' + # Split by newline and display last line lines = text.split('\n') text = lines[-1] - self._ui.message_label.set_text(text) + self._ui.message_label.set_markup(text) if icon is None: self._ui.message_icon.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/489659dfe37d8e31618aab363f08ca6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/489659dfe37d8e31618aab363f08ca6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: CodeWidget: Set monospace
by Philipp Hörist (＠lovetox) 17 Dec '21

17 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f22acaa by lovetox at 2021-12-18T00:42:36+01:00 CodeWidget: Set monospace - - - - - fa918de2 by lovetox at 2021-12-18T00:42:36+01:00 Move Builder to own module - Add type hints - - - - - 489659df by lovetox at 2021-12-18T00:42:36+01:00 SearchView: Use type aware builder - - - - - 5 changed files: - + gajim/gtk/builder.py - + gajim/gtk/builder.pyi - gajim/gtk/conversation/code_widget.py - gajim/gtk/search_view.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/builder.py ===================================== @@ -0,0 +1,90 @@ +# 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 typing import Any +from typing import Optional + +import sys +import functools +import xml.etree.ElementTree as ET + +from gi.repository import Gtk +from gi.repository import Gio + +from gajim.common import i18n +from gajim.common.i18n import _ +from gajim.common import configpaths + + +class Builder: + + filename = '' + + def __init__(self, + filename: Optional[str] = None, + widgets: Optional[list[str]] = None, + domain: Optional[str] = None, + gettext_: Optional[Any] = None) -> None: + + if filename is None: + filename = self.filename + + self._builder = Gtk.Builder() + + if domain is None: + domain = i18n.DOMAIN + self._builder.set_translation_domain(domain) + + if gettext_ is None: + gettext_ = _ + + xml_text = self._load_string_from_filename(filename, gettext_) + + if widgets is not None: + self._builder.add_objects_from_string(xml_text, widgets) + else: + self._builder.add_from_string(xml_text) + + @staticmethod + @functools.lru_cache(maxsize=None) + def _load_string_from_filename(filename: str, gettext_: Any) -> str: + file_path = str(configpaths.get('GUI') / filename) + + if sys.platform == "win32": + # This is a workaround for non working translation on Windows + tree = ET.parse(file_path) + for node in tree.iter(): + if 'translatable' in node.attrib and node.text is not None: + node.text = gettext_(node.text) + + return ET.tostring(tree.getroot(), + encoding='unicode', + method='xml') + + file = Gio.File.new_for_path(file_path) + content = file.load_contents(None) + return content[1].decode() + + def __getattr__(self, name: str) -> Any: + try: + return getattr(self._builder, name) + except AttributeError: + return self._builder.get_object(name) + + def get(self, name: str) -> Any: + return self._builder.get_object(name) + + +class SearchViewBuilder(Builder): + filename = 'search_view.ui' ===================================== gajim/gtk/builder.pyi ===================================== @@ -0,0 +1,42 @@ + +from typing import Any +from typing import Literal +from typing import overload + +from gi.repository import Gtk + + + +class Builder: ... + + +class SearchViewBuilder(Builder): + + filename: str = ... + + @overload + def get(self, name: Literal['search_entry']) -> Gtk.Entry: ... + @overload + def get(self, name: Literal['date_hint']) -> Gtk.Label: ... + @overload + def get(self, name: Literal['search_checkbutton']) -> Gtk.CheckButton: ... + @overload + def get(self, name: Literal['header_box']) -> Gtk.ListBox: ... + @overload + def get(self, name: Literal['header_name_label']) -> Gtk.Label: ... + @overload + def get(self, name: Literal['header_date_label']) -> Gtk.Label: ... + @overload + def get(self, name: Literal['result_row_grid']) -> Gtk.Grid: ... + @overload + def get(self, name: Literal['row_name_label']) -> Gtk.Label: ... + @overload + def get(self, name: Literal['row_avatar']) -> Gtk.Image: ... + @overload + def get(self, name: Literal['row_time_label']) -> Gtk.Label: ... + @overload + def get(self, name: Literal['results_listbox']) -> Gtk.ListBox: ... + @overload + def get(self, name: Literal['search_box']) -> Gtk.Box: ... + def get(self, name: str) -> Any: + pass ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -98,6 +98,7 @@ def __init__(self) -> None: self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) self.set_top_margin(2) self.set_bottom_margin(2) + self.set_monospace(True) self._source_manager = GtkSource.LanguageManager.get_default() self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() ===================================== gajim/gtk/search_view.py ===================================== @@ -12,16 +12,16 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Dict -from typing import List +from __future__ import annotations + +from typing import Any +from typing import Union from typing import Optional -from typing import Tuple import datetime import logging import time import re -from collections import namedtuple from gi.repository import GObject from gi.repository import Gtk @@ -37,7 +37,7 @@ from gajim.common.i18n import _ from .conversation.message_widget import MessageWidget -from .util import get_builder +from .builder import SearchViewBuilder log = logging.getLogger('gajim.gui.search_view') @@ -56,12 +56,12 @@ def __init__(self) -> None: self._account: Optional[str] = None self._jid: Optional[JID] = None - self._results: List[str] = [] + self._results: list[str] = [] self._scope: Optional[str] = None - self._ui = get_builder('search_view.ui') - self._ui.results_listbox.set_header_func(self._header_func) - self.add(self._ui.search_box) + self._ui = SearchViewBuilder() + self._ui.get('results_listbox').set_header_func(self._header_func) + self.add(self._ui.get('search_box')) self._ui.connect_signals(self) @@ -73,13 +73,15 @@ def __init__(self) -> None: self._on_account_state) self.show_all() - def _on_account_state(self, _event): + def _on_account_state(self, _event: Any) -> None: self.clear() @staticmethod - def _header_func(row, before): + def _header_func(row: Union[CounterRow, ResultRow], + before: Optional[Union[CounterRow, ResultRow]]) -> None: + if before is None: - if row.type == 'counter': + if isinstance(row, CounterRow): row.set_header(None) else: row.set_header(RowHeader(row.account, row.jid, row.time)) @@ -97,17 +99,17 @@ def _on_hide_clicked(self, _button: Gtk.Button) -> None: self.emit('hide-search') def clear(self) -> None: - self._ui.search_entry.set_text('') + self._ui.get('search_entry').set_text('') self._clear_results() def _clear_results(self) -> None: - for row in self._ui.results_listbox.get_children(): - self._ui.results_listbox.remove(row) + for row in self._ui.get('results_listbox').get_children(): + self._ui.get('results_listbox').remove(row) row.destroy() def _on_search(self, entry: Gtk.Entry) -> None: self._clear_results() - self._ui.date_hint.hide() + self._ui.get('date_hint').hide() text = entry.get_text() if not text: return @@ -124,7 +126,7 @@ def _on_search(self, entry: Gtk.Entry) -> None: before_filters = min([datetime.datetime.fromisoformat(date) for date in before_filters]) except ValueError: - self._ui.date_hint.show() + self._ui.get('date_hint').show() return # after:date @@ -140,13 +142,13 @@ def _on_search(self, entry: Gtk.Entry) -> None: if after_filters.hour == after_filters.minute == 0: after_filters += datetime.timedelta(days=1) except ValueError: - self._ui.date_hint.show() + self._ui.get('date_hint').show() return # has:'file'|'img'|'video'|filetype text, has_filters = self._strip_filters(text, 'has') - everywhere = self._ui.search_checkbutton.get_active() + everywhere = self._ui.get('search_checkbutton').get_active() context = self._account is not None and self._jid is not None if not context or everywhere: @@ -167,7 +169,7 @@ def _on_search(self, entry: Gtk.Entry) -> None: after=after_filters) if has_filters is not None: - filetypes = [] + filetypes: list[str] = [] for filetype in has_filters: types = FILE_CATEGORIES.get(filetype) if types is None: @@ -180,9 +182,7 @@ def _on_search(self, entry: Gtk.Entry) -> None: self._add_counter() self._add_results() - def _filter_results_for_files(self, - filetypes: List[str] - ) -> None: + def _filter_results_for_files(self, filetypes: list[str]) -> None: if 'file' in filetypes: results = [] for result in self._results: @@ -202,9 +202,8 @@ def _filter_results_for_files(self, @staticmethod def _strip_filters(text: str, - filter_name: str - ) -> Tuple[str, Optional[List[str]]]: - filters = [] + filter_name: str) -> tuple[str, Optional[list[str]]]: + filters: list[str] = [] start = 0 new_text = '' for search_filter in re.finditer(filter_name + r':(\S+)\s?', text): @@ -218,7 +217,7 @@ def _strip_filters(text: str, def _add_counter(self) -> None: results_count = len(self._results) if results_count: - self._ui.results_listbox.add(CounterRow(results_count)) + self._ui.get('results_listbox').add(CounterRow(results_count)) def _add_results(self) -> None: accounts = self._get_accounts() @@ -231,31 +230,27 @@ def _add_results(self) -> None: else: result_row = ResultRow(msg, self._account, self._jid) - self._ui.results_listbox.add(result_row) + self._ui.get('results_listbox').add(result_row) self._results = self._results[25:] def _on_edge_reached(self, _scrolledwin: Gtk.ScrolledWindow, - pos: Gtk.PositionType - ) -> None: + pos: Gtk.PositionType) -> None: if pos != Gtk.PositionType.BOTTOM: return self._add_results() @staticmethod - def _get_accounts() -> Dict[str, str]: - accounts = {} + def _get_accounts() -> dict[str, str]: + accounts: dict[str, str] = {} for account in app.settings.get_accounts(): account_id = app.storage.archive.get_account_id(account) accounts[account_id] = account return accounts @staticmethod - def _on_row_activated(_listbox: Gtk.ListBox, row: Gtk.ListBoxRow) -> None: - if row.type == 'counter': - return - + def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: control = app.window.get_active_control() if control is not None: if control.contact.jid == row.jid: @@ -271,12 +266,12 @@ def _on_row_activated(_listbox: Gtk.ListBox, row: Gtk.ListBoxRow) -> None: control.scroll_to_message(row.log_line_id, row.timestamp) def set_focus(self) -> None: - self._ui.search_entry.grab_focus() + self._ui.get('search_entry').grab_focus() def set_context(self, account: str, jid: JID) -> None: self._account = account self._jid = jid - self._ui.search_checkbutton.set_active(jid is None) + self._ui.get('search_checkbutton').set_active(jid is None) class RowHeader(Gtk.Box): @@ -284,16 +279,16 @@ def __init__(self, account: str, jid: JID, timestamp: float) -> None: Gtk.Box.__init__(self) self.set_hexpand(True) - self._ui = get_builder('search_view.ui') - self.add(self._ui.header_box) + self._ui = SearchViewBuilder() + self.add(self._ui.get('header_box')) client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - self._ui.header_name_label.set_text(contact.name or '') + self._ui.get('header_name_label').set_text(contact.name or '') local_time = time.localtime(timestamp) date = time.strftime('%x', local_time) - self._ui.header_date_label.set_text(date) + self._ui.get('header_date_label').set_text(date) self.show_all() @@ -302,9 +297,9 @@ class CounterRow(Gtk.ListBoxRow): def __init__(self, count: int) -> None: Gtk.ListBoxRow.__init__(self) self.set_activatable(False) - self.type: str = 'counter' - self.jid: str = '' # Has to be there for header_func - self.time: float = 0.0 + self.type = 'counter' + self.jid = '' # Has to be there for header_func + self.time = 0.0 self.get_style_context().add_class('search-view-counter') if count == 1: @@ -317,7 +312,7 @@ def __init__(self, count: int) -> None: class ResultRow(Gtk.ListBoxRow): - def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: + def __init__(self, msg: Any, account: str, jid: JID) -> None: Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid @@ -335,8 +330,8 @@ def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: self.contact = self._client.get_module('Contacts').get_contact( jid, groupchat=self.type == 'groupchat') - self._ui = get_builder('search_view.ui') - self.add(self._ui.result_row_grid) + self._ui = SearchViewBuilder() + self.add(self._ui.get('result_row_grid')) kind = 'status' contact_name = msg.contact_name @@ -350,25 +345,25 @@ def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): kind = 'outgoing' contact_name = app.nicks[account] - self._ui.row_name_label.set_text(contact_name) + self._ui.get('row_name_label').set_text(contact_name) avatar = self._get_avatar(kind, contact_name) - self._ui.row_avatar.set_from_surface(avatar) + self._ui.get('row_avatar').set_from_surface(avatar) local_time = time.localtime(msg.time) date = time.strftime('%H:%M', local_time) - self._ui.row_time_label.set_label(date) + self._ui.get('row_time_label').set_label(date) message_widget = MessageWidget(account, selectable=False) message_widget.add_with_styling(msg.message, nickname=contact_name) - self._ui.result_row_grid.attach(message_widget, 1, 1, 2, 1) + self._ui.get('result_row_grid').attach(message_widget, 1, 1, 2, 1) self.show_all() def _get_avatar(self, kind: str, - name: str - ) -> Optional[cairo.ImageSurface]: + name: str) -> Optional[cairo.ImageSurface]: + scale = self.get_scale_factor() if self.contact.is_groupchat: contact = self.contact.get_resource(name) ===================================== gajim/gtk/util.py ===================================== @@ -21,14 +21,11 @@ from typing import Optional from typing import Union -import sys import logging import math import textwrap -import functools from io import BytesIO from importlib import import_module -import xml.etree.ElementTree as ET from functools import wraps from functools import lru_cache @@ -40,7 +37,6 @@ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib -from gi.repository import Gio from gi.repository import Pango from gi.repository import GdkPixbuf import nbxmpp @@ -48,7 +44,6 @@ from gajim.common import app from gajim.common import configpaths -from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import URL_REGEX from gajim.common.const import LOCATION_DATA @@ -59,11 +54,13 @@ from .const import GajimIconSet from .const import WINDOW_MODULES +from .builder import Builder _icon_theme = Gtk.IconTheme.get_default() if _icon_theme is not None: _icon_theme.append_search_path(str(configpaths.get('ICONS'))) + log = logging.getLogger('gajim.gui.util') @@ -150,55 +147,6 @@ def nick_matching(nick: str) -> bool: return matches + other_nicks -class Builder: - def __init__(self, - filename: str, - widgets: List[str] = None, - domain: str = None, - gettext_: Any = None) -> None: - self._builder = Gtk.Builder() - - if domain is None: - domain = i18n.DOMAIN - self._builder.set_translation_domain(domain) - - if gettext_ is None: - gettext_ = _ - - xml_text = self._load_string_from_filename(filename, gettext_) - - if widgets is not None: - self._builder.add_objects_from_string(xml_text, widgets) - else: - self._builder.add_from_string(xml_text) - - @staticmethod - @functools.lru_cache(maxsize=None) - def _load_string_from_filename(filename, gettext_): - file_path = str(configpaths.get('GUI') / filename) - - if sys.platform == "win32": - # This is a workaround for non working translation on Windows - tree = ET.parse(file_path) - for node in tree.iter(): - if 'translatable' in node.attrib and node.text is not None: - node.text = gettext_(node.text) - - return ET.tostring(tree.getroot(), - encoding='unicode', - method='xml') - - file = Gio.File.new_for_path(file_path) - content = file.load_contents(None) - return content[1].decode() - - def __getattr__(self, name): - try: - return getattr(self._builder, name) - except AttributeError: - return self._builder.get_object(name) - - def get_builder(file_name: str, widgets: List[str] = None) -> Builder: return Builder(file_name, widgets) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2cb70610dda63a25b011b206da19575… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2cb70610dda63a25b011b206da19575… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: AudioPreview: Typing
by Daniel Brötzmann (＠wurstsalat) 17 Dec '21

17 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 068551db by wurstsalat at 2021-12-17T23:59:43+01:00 AudioPreview: Typing - - - - - e7331833 by wurstsalat at 2021-12-18T00:00:23+01:00 App: Init Gst while checking dependencies - - - - - c5cc0fe4 by wurstsalat at 2021-12-18T00:16:38+01:00 WorkspaceSidebar: Typing - - - - - 2cb70610 by wurstsalat at 2021-12-18T00:24:36+01:00 Windows: Let message input grab focus after inserting Emoji - - - - - 4 changed files: - gajim/common/app.py - gajim/gtk/emoji_chooser.py - gajim/gtk/preview_audio.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/common/app.py ===================================== @@ -206,7 +206,8 @@ def detect_dependencies() -> None: gi.require_version('GstPbutils', '1.0') from gi.repository import Gst from gi.repository import GstPbutils # pylint: disable=unused-import - _dependencies['GST'] = True + success, _argv = Gst.init_check(None) + _dependencies['GST'] = success except Exception: pass ===================================== gajim/gtk/emoji_chooser.py ===================================== @@ -400,6 +400,7 @@ def _on_emoticon_press(self, flowbox, child): GLib.timeout_add(100, flowbox.unselect_child, child) codepoint, pixbuf = child.get_emoji() self._text_widget().insert_emoji(codepoint, pixbuf) + self._text_widget().grab_focus() def do_destroy(self): # Remove the references we hold to other objects ===================================== gajim/gtk/preview_audio.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Optional + import logging from pathlib import Path @@ -28,22 +30,24 @@ class AudioWidget(Gtk.Box): def __init__(self, file_path: Path) -> None: - Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.HORIZONTAL, spacing=6) - self._playbin = Gst.ElementFactory.make('playbin', 'bin') + self._playbin: Optional[Gst.Element] = Gst.ElementFactory.make( + 'playbin', 'bin') if self._playbin is None: label = Gtk.Label(label=_('Audio preview is not available')) self.add(label) log.debug('Could not create GST playbin') return - self._query = Gst.Query.new_position(Gst.Format.TIME) + self._query: Gst.Query = Gst.Query.new_position(Gst.Format.TIME) self._has_timeout: bool = False self._build_audio_widget() self._setup_audio_player(file_path) - def _build_audio_widget(self): + def _build_audio_widget(self) -> None: play_button = Gtk.Button() play_button.get_style_context().add_class('flat') play_button.get_style_context().add_class('preview-button') @@ -81,11 +85,14 @@ def _setup_audio_player(self, file_path: Path) -> None: log.debug('Could not setup GST playbin') return - bus = self._playbin.get_bus() + bus: Optional[Gst.Bus] = self._playbin.get_bus() + if bus is None: + log.debug('Could not get GST Bus') + return bus.add_signal_watch() bus.connect('message', self._on_bus_message) - def _on_bus_message(self, _bus, message): + def _on_bus_message(self, _bus: Gst.Bus, message: Gst.Message) -> None: if message.type == Gst.MessageType.EOS: self._set_pause(True) self._playbin.seek_simple( @@ -102,12 +109,16 @@ def _on_bus_message(self, _bus, message): GLib.timeout_add(500, self._update_seek_bar) self._has_timeout = True - def _on_seek(self, _range, _scroll, value): + def _on_seek(self, + _range: Gtk.Range, + _scroll: Gtk.ScrollType, + value: float + ) -> bool: self._playbin.seek_simple( Gst.Format.TIME, Gst.SeekFlags.FLUSH, value) return False - def _on_play_clicked(self, _button): + def _on_play_clicked(self, _button: Gtk.Button) -> None: self._set_pause(not self._get_paused()) def _on_destroy(self, _widget): @@ -140,7 +151,7 @@ def _update_seek_bar(self) -> bool: return True @staticmethod - def _format_audio_timestamp(_widget: Gtk.Widget, ns: int) -> str: + def _format_audio_timestamp(_widget: Gtk.Scale, ns: float) -> str: seconds = ns / 1000000000 minutes = seconds / 60 hours = minutes / 60 @@ -154,5 +165,5 @@ def _format_audio_timestamp(_widget: Gtk.Widget, ns: int) -> str: return f'{i_minutes:d}:{i_seconds:02d}' @staticmethod - def _on_realize(event_box): + def _on_realize(event_box: Gtk.EventBox) -> None: event_box.get_window().set_cursor(get_cursor('pointer')) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -12,8 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any from typing import List +from typing import Optional import logging @@ -26,13 +29,15 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ +from .chat_list_stack import ChatListStack +from .chat_page import ChatPage from .util import open_window log = logging.getLogger('gajim.gui.workspace_sidebar') class WorkspaceSideBar(Gtk.ListBox): - def __init__(self, chat_page): + def __init__(self, chat_page: ChatPage) -> None: Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_valign(Gtk.Align.START) @@ -54,7 +59,7 @@ def __init__(self, chat_page): entries, Gdk.DragAction.MOVE) - self.drag_row = None + self.drag_row: Optional[Workspace] = None self.row_before = None self.row_after = None @@ -152,14 +157,18 @@ def _get_row_before(self, row): def _get_row_after(self, row): return self.get_row_at_index(row.get_index() + 1) - def _get_last_workspace_row(self): + def _get_last_workspace_row(self) -> Workspace: # Calling len(children) would include AddWorkspace return self.get_row_at_index(len(self.get_children()) - 1) - def set_drag_row(self, row): + def set_drag_row(self, row: Workspace) -> None: self.drag_row = row - def _on_unread_count_changed(self, _chat_list_stack, workspace_id, count): + def _on_unread_count_changed(self, + _chat_list_stack: ChatListStack, + workspace_id: str, + count: int + ) -> None: workspace = self._workspaces[workspace_id] workspace.set_unread_count(count) @@ -173,25 +182,25 @@ def _on_row_activated(_listbox, row): else: app.window.activate_workspace(row.workspace_id) - def add_workspace(self, workspace_id): + def add_workspace(self, workspace_id: str) -> None: row = Workspace(workspace_id) self._workspaces[workspace_id] = row # Insert row before AddWorkspace row self.insert(row, len(self.get_children()) - 1) - def store_workspace_order(self): + def store_workspace_order(self) -> None: order = [row.workspace_id for row in self.get_children()] order.remove('add') app.settings.set_app_setting('workspace_order', order) - def remove_workspace(self, workspace_id): + def remove_workspace(self, workspace_id: str) -> bool: if len(self._workspaces) == 1: return False row = self._workspaces.pop(workspace_id) self.remove(row) return True - def activate_workspace(self, workspace_id): + def activate_workspace(self, workspace_id: str) -> None: row = self.get_selected_row() if row is not None and row.workspace_id == workspace_id: return @@ -199,23 +208,23 @@ def activate_workspace(self, workspace_id): row = self._workspaces[workspace_id] self.select_row(row) - def get_active_workspace(self): + def get_active_workspace(self) -> str: row = self.get_selected_row() if row is None: return None return row.workspace_id - def get_first_workspace(self): + def get_first_workspace(self) -> str: for row in self.get_children(): return row.workspace_id - def get_workspace_by_id(self, workspace_id): + def get_workspace_by_id(self, workspace_id: str) -> Optional[Workspace]: for row in self.get_children(): if row.workspace_id == workspace_id: return row return None - def update_avatar(self, workspace_id): + def update_avatar(self, workspace_id: str) -> None: row = self._workspaces[workspace_id] row.update_avatar() @@ -227,7 +236,7 @@ def __init__(self, workspace_id): class Workspace(CommonWorkspace): - def __init__(self, workspace_id): + def __init__(self, workspace_id: str) -> None: CommonWorkspace.__init__(self, workspace_id) self.get_style_context().add_class('workspace-sidebar-item') @@ -270,7 +279,7 @@ def __init__(self, workspace_id): self.add(eventbox) self.show_all() - def _popup_menu(self, _widget, event): + def _popup_menu(self, _widget: Gtk.Widget, event: Gdk.EventButton) -> None: if event.button != 3: # right click return @@ -301,17 +310,20 @@ def _get_workspace_menu(self) -> Gio.Menu: menu.append_item(menuitem) return menu - def update_avatar(self): + def update_avatar(self) -> None: self._image.update() - def set_unread_count(self, count): + def set_unread_count(self, count: int) -> None: if count < 1000: self._unread_label.set_text(str(count)) else: self._unread_label.set_text('999+') self._unread_label.set_visible(bool(count)) - def _on_drag_begin(self, _widget, drag_context): + def _on_drag_begin(self, + _widget: Gtk.Widget, + drag_context: Gdk.DragContext + ) -> None: scale = self.get_scale_factor() surface = app.interface.avatar_storage.get_workspace_surface( self.workspace_id, AvatarSize.WORKSPACE, scale) @@ -320,15 +332,20 @@ def _on_drag_begin(self, _widget, drag_context): listbox = self.get_parent() listbox.set_drag_row(self) - def _on_drag_data_get(self, _widget, _drag_context, selection_data, - _info, _time): + def _on_drag_data_get(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: drop_type = Gdk.Atom.intern_static_string('WORKSPACE_SIDEBAR_ITEM') data = self.workspace_id.encode('utf-8') selection_data.set(drop_type, 32, data) class AddWorkspace(CommonWorkspace): - def __init__(self, workspace_id): + def __init__(self, workspace_id: str) -> None: CommonWorkspace.__init__(self, workspace_id) self.set_selectable(False) self.set_tooltip_text(_('Add Workspace')) @@ -340,17 +357,17 @@ def __init__(self, workspace_id): self.show_all() @staticmethod - def _on_add_clicked(_button): + def _on_add_clicked(_button: Gtk.Button) -> None: open_window('WorkspaceDialog') class WorkspaceAvatar(Gtk.Image): - def __init__(self, workspace_id): + def __init__(self, workspace_id: str) -> None: Gtk.Image.__init__(self) self._workspace_id = workspace_id self.update() - def update(self): + def update(self) -> None: app.interface.avatar_storage.invalidate_cache(self._workspace_id) scale = self.get_scale_factor() surface = app.interface.avatar_storage.get_workspace_surface( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d345f92fbdfa78afd6e0c000044962a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d345f92fbdfa78afd6e0c000044962a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Control: Use GLib for format HTTP Upload file size
by Daniel Brötzmann (＠wurstsalat) 17 Dec '21

17 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 085331f9 by wurstsalat at 2021-12-17T22:16:58+01:00 Control: Use GLib for format HTTP Upload file size - - - - - d345f92f by wurstsalat at 2021-12-17T22:17:19+01:00 Notification: Don't fail on missing JID - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/groupchat.py - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -137,6 +137,11 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.control_id: str = str(uuid.uuid4()) self.session = None + if app.settings.get('use_kib_mib'): + self._units = GLib.FormatSizeFlags.IEC_UNITS + else: + self._units = GLib.FormatSizeFlags.DEFAULT + self.xml = get_builder(f'{widget_name}.ui') self.xml.connect_signals(self) self.widget = self.xml.get_object(f'{widget_name}_hbox') ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -341,8 +341,8 @@ def update_actions(self, *args): tooltip_text = _('Send File…') max_file_size = self._client.get_module('HTTPUpload').max_file_size if max_file_size is not None: - max_file_size = max_file_size / (1024 * 1024) - tooltip_text = _('Send File (max. %s MiB)…') % max_file_size + max_file_size = GLib.format_size_full(max_file_size, self._units) + tooltip_text = _('Send File (max. %s)…') % max_file_size else: tooltip_text = _('No File Transfer available') self.xml.sendfile_button.set_tooltip_text(tooltip_text) ===================================== gajim/gtk/notification.py ===================================== @@ -117,6 +117,10 @@ def on_proxy_ready(_source: GObject.Object, on_proxy_ready) def _on_notification(self, event): + if hasattr(event, 'jid'): + jid = str(event.jid) + else: + jid = None if hasattr(event, 'command'): # Used by Triggers plugin try: @@ -152,7 +156,7 @@ def _on_notification(self, event): self._issue_notification( event.notif_type, event.account, - str(event.jid), + jid, notif_detail=notif_detail, title=event.title, text=event.text, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/699d7e6c8d2e19d10d828f573ea1bd5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/699d7e6c8d2e19d10d828f573ea1bd5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] BaseError: Use correct method signature for get_text()
by Philipp Hörist (＠lovetox) 17 Dec '21

17 Dec '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1a359df9 by lovetox at 2021-12-17T21:08:35+01:00 BaseError: Use correct method signature for get_text() - - - - - 1 changed file: - nbxmpp/errors.py Changes: ===================================== nbxmpp/errors.py ===================================== @@ -32,7 +32,7 @@ class BaseError(Exception): def __str__(self): return self.text - def get_text(self): + def get_text(self, pref_lang=None): return self.text View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1a359df9c6433ffaeb725cd1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1a359df9c6433ffaeb725cd1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: ChatList: Fix nick spacing
by Daniel Brötzmann (＠wurstsalat) 16 Dec '21

16 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5ffba61d by wurstsalat at 2021-12-16T20:53:59+01:00 ChatList: Fix nick spacing - - - - - d907f1b8 by wurstsalat at 2021-12-16T20:53:59+01:00 Notifications: Markup escape title and text - - - - - e4e58e7c by wurstsalat at 2021-12-16T21:05:59+01:00 Settings: Remove show_ascii_formatting_chars - - - - - c92f686e by wurstsalat at 2021-12-16T21:14:04+01:00 Settings: Remove opened_chat_controls account setting - - - - - 699d7e6c by wurstsalat at 2021-12-16T21:18:00+01:00 Settings: Remove collapsed_rows - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/chat_list.py - gajim/gtk/notification.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -32,7 +32,6 @@ class _ACCOUNT_DEFAULT: 'trayicon': 'always', 'allow_hide_roster': False, 'iconset': 'dcraven', - 'collapsed_rows': '', 'roster_theme': 'default', 'sort_by_show_in_roster': True, 'sort_by_show_in_muc': False, @@ -41,7 +40,6 @@ class _ACCOUNT_DEFAULT: 'speller_language': '', 'emoticons_theme': 'noto-emoticons', 'ascii_formatting': True, - 'show_ascii_formatting_chars': True, 'sounds_on': True, 'gc_refer_to_nick_char': ',', 'mainwin_x_position': 0, @@ -201,7 +199,6 @@ class _ACCOUNT_DEFAULT: 'roster_version': '', 'subscription_request_msg': '', 'ft_send_local_ips': True, - 'opened_chat_controls': '', 'recent_groupchats': '', 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', @@ -332,7 +329,6 @@ class _ACCOUNT_DEFAULT: 'app': { 'allow_hide_roster': _('Allow to hide the contact list window even if the notification area icon is not shown.'), 'ascii_formatting': _('Treat * / _ pairs as possible formatting characters.'), - 'show_ascii_formatting_chars': _('If enabled, do not remove */_ . So *abc* will be bold but with * * not removed.'), 'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'), ===================================== gajim/gtk/chat_list.py ===================================== @@ -581,7 +581,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, if line.contact_name == our_nick: self._ui.nick_label.set_text(_('Me:')) else: - self._ui.nick_label.set_text(_('%(muc_nick)s: ') % { + self._ui.nick_label.set_text(_('%(muc_nick)s:') % { 'muc_nick': line.contact_name}) self._ui.nick_label.show() ===================================== gajim/gtk/notification.py ===================================== @@ -206,6 +206,9 @@ def _issue_notification(self, if timeout < 0: timeout = app.settings.get('notification_timeout') + title = GLib.markup_escape_text(title) + text = GLib.markup_escape_text(text) + if sys.platform == 'win32': self._withdraw() self._win32_active_popup = PopupNotification( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fea3b71a2ed85a25000e7d5d42fc81d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fea3b71a2ed85a25000e7d5d42fc81d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CodeWidget: Add type annotations
by Philipp Hörist (＠lovetox) 16 Dec '21

16 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: fea3b71a by lovetox at 2021-12-16T20:51:15+01:00 CodeWidget: Add type annotations - - - - - 1 changed file: - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/gtk/conversation/code_widget.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 typing import Any from typing import Tuple from typing import Optional @@ -25,6 +26,8 @@ from gajim.common import ged from gajim.common.i18n import _ +from gajim.common.styling import PreBlock + log = logging.getLogger('gajim.gui.conversation.code_widget') @@ -61,12 +64,12 @@ def __init__(self, account: str) -> None: self.add(self._scrolled) - def _on_copy(self, _button): + def _on_copy(self, _button: Gtk.Button) -> None: text = self._textview.get_code() clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clipboard.set_text(text, -1) - def add_content(self, block): + def add_content(self, block: PreBlock): code, lang = self._prepare_code(block.text) lang_name = self._textview.set_language(lang) if lang is None: @@ -107,7 +110,7 @@ def __init__(self) -> None: if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) - def _get_style_scheme(self): + def _get_style_scheme(self) -> Optional[GtkSource.StyleScheme]: if app.css_config.prefer_dark: style_scheme = self._style_scheme_manager.get_scheme( 'solarized-dark') @@ -116,12 +119,12 @@ def _get_style_scheme(self): 'solarized-light') return style_scheme - def _on_style_changed(self, *args): + def _on_style_changed(self, *args: Any) -> None: style_scheme = self._get_style_scheme() if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) - def set_language(self, language_string: Optional[str]) -> None: + def set_language(self, language_string: Optional[str]) -> str: if language_string is None: language_string = 'python3' @@ -129,6 +132,8 @@ def set_language(self, language_string: Optional[str]) -> None: if lang is None: lang = self._source_manager.get_language('python3') + assert lang is not None + log.debug('Code snippet lang: %s', lang.get_name()) self.get_buffer().set_language(lang) return lang.get_name() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fea3b71a2ed85a25000e7d5d42fc81d6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fea3b71a2ed85a25000e7d5d42fc81d6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CodeWidget: Handle not available languages
by Philipp Hörist (＠lovetox) 16 Dec '21

16 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9f8e2bda by lovetox at 2021-12-16T20:02:31+01:00 CodeWidget: Handle not available languages Fixes #10726 - - - - - 1 changed file: - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -123,9 +123,12 @@ def _on_style_changed(self, *args): def set_language(self, language_string: Optional[str]) -> None: if language_string is None: + language_string = 'python3' + + lang = self._source_manager.get_language(language_string) + if lang is None: lang = self._source_manager.get_language('python3') - else: - lang = self._source_manager.get_language(language_string) + log.debug('Code snippet lang: %s', lang.get_name()) self.get_buffer().set_language(lang) return lang.get_name() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9f8e2bda648f0b66f33221e37b4b0552… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9f8e2bda648f0b66f33221e37b4b0552… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint errors
by Philipp Hörist (＠lovetox) 15 Dec '21

15 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0f479459 by lovetox at 2021-12-15T23:04:07+01:00 Fix pylint errors - - - - - 2 changed files: - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -62,7 +62,6 @@ def _add_action_phrase(self, text: str, nickname: str): widget = PlainWidget(self._account, self._selectable) widget.add_action_phrase(text, nickname) self.add(widget) - return def add_content(self, content: ContentT) -> None: self.clear() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -39,7 +39,6 @@ from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string -from gajim.common.styling import ParsingResult from gajim.common.i18n import _ from gajim.common.i18n import Q_ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f479459a66bb2503571a94d6edce842… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f479459a66bb2503571a94d6edce842… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add back styling of /me command
by Philipp Hörist (＠lovetox) 15 Dec '21

15 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: e3fd830a by lovetox at 2021-12-15T22:59:29+01:00 Add back styling of /me command - - - - - 4 changed files: - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Optional from typing import Union from typing import cast @@ -46,10 +47,23 @@ def get_content(self) -> ContentT: def get_text(self) -> str: return self._content.text - def add_with_styling(self, text: str) -> None: + def add_with_styling(self, + text: str, + nickname: Optional[str] = None) -> None: + + if text.startswith('/me') and nickname is not None: + self._add_action_phrase(text, nickname) + return + result = process(text) self.add_content(result) + def _add_action_phrase(self, text: str, nickname: str): + widget = PlainWidget(self._account, self._selectable) + widget.add_action_phrase(text, nickname) + self.add(widget) + return + def add_content(self, content: ContentT) -> None: self.clear() self._content = content ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -62,6 +62,11 @@ def __init__(self, account: str, selectable: bool) -> None: def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) + def add_action_phrase(self, text: str, nickname: str) -> None: + text = text.replace('/me', '* %s' % nickname, 1) + 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() @@ -107,6 +112,9 @@ def print_text_with_styling(self, block: PlainBlock) -> None: self.set_markup(text) self.set_attributes(make_pango_attributes(block)) + def add_action_phrase(self, text: str) -> None: + self.set_markup(f'<i>{text}</i>') + def update_text_tags(self) -> None: pass @@ -197,6 +205,14 @@ def print_text_with_styling(self, block: PlainBlock) -> None: end_iter = buffer_.get_iter_at_offset(uri.end) buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) + def add_action_phrase(self, text: str) -> None: + buffer_ = self.get_buffer() + buffer_.insert(buffer_.get_start_iter(), text.strip()) + + start_iter = buffer_.get_start_iter() + end_iter = buffer_.get_end_iter() + buffer_.apply_tag_by_name('emphasis', start_iter, end_iter) + def _query_tooltip(self, widget: Any, x_pos: int, y_pos: int, _keyboard_mode: bool, tooltip: Gtk.Tooltip) -> bool: window = widget.get_window(Gtk.TextWindowType.TEXT) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -110,12 +110,12 @@ def __init__(self, text, self._message_widget, context) else: self._message_widget = MessageWidget(account) - self._message_widget.add_with_styling(text) + self._message_widget.add_with_styling(text, nickname=name) if self._is_groupchat: our_nick = get_group_chat_nick( self._account, self._contact.jid) if name != our_nick: - self._check_for_highlight(self._message_widget.content) + self._check_for_highlight(text) if self._is_groupchat: our_nick = get_group_chat_nick(self._account, self._contact.jid) @@ -211,9 +211,9 @@ def update_text_tags(self) -> None: if isinstance(self._message_widget, MessageWidget): self._message_widget.update_text_tags() - def _check_for_highlight(self, content: ParsingResult) -> None: + def _check_for_highlight(self, text: str) -> None: needs_highlight = message_needs_highlight( - content.text, + text, self._contact.nickname, self._client.get_own_jid().bare) if needs_highlight: ===================================== gajim/gtk/search_view.py ===================================== @@ -360,7 +360,7 @@ def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: self._ui.row_time_label.set_label(date) message_widget = MessageWidget(account, selectable=False) - message_widget.add_with_styling(msg.message_widget) + message_widget.add_with_styling(msg.message, nickname=contact_name) self._ui.result_row_grid.attach(message_widget, 1, 1, 2, 1) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3fd830ab8f2aee912e3894361d303fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3fd830ab8f2aee912e3894361d303fe… 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