Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/python-nbxmpp][master] 3 commits: Roster: Add support for approved attribute
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4f890ee7 by lovetox at 2022-03-13T08:30:38+01:00 Roster: Add support for approved attribute - Correct the default value for subscription - - - - - 9f57399c by lovetox at 2022-03-13T08:31:51+01:00 Update .gitignore - - - - - 4a1195ce by lovetox at 2022-03-13T08:32:05+01:00 3.0.0-dev2 - - - - - 4 changed files: - .gitignore - nbxmpp/__init__.py - nbxmpp/structs.py - setup.cfg Changes: ===================================== .gitignore ===================================== @@ -5,3 +5,5 @@ nbxmpp.egg-info dist .idea *~ +*.sublime-workspace +*.sublime-project ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__: str = "3.0.0-dev1" +__version__: str = "3.0.0-dev2" ===================================== nbxmpp/structs.py ===================================== @@ -367,6 +367,7 @@ class RosterItem: name: Optional[str] = None ask: Optional[str] = None subscription: Optional[str] = None + approved: Optional[str] = None groups: Set[str] = field(default_factory=set) @classmethod @@ -382,7 +383,8 @@ class RosterItem: return cls(jid=jid, name=attrs.get('name'), ask=attrs.get('ask'), - subscription=attrs.get('subscription'), + subscription=attrs.get('subscription') or 'none', + approved=attrs.get('approved'), groups=groups) def asdict(self) -> dict[str, Any]: @@ -390,6 +392,7 @@ class RosterItem: 'name': self.name, 'ask': self.ask, 'subscription': self.subscription, + 'approved': self.approved, 'groups': self.groups} ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.0.0-dev1 +version = 3.0.0-dev2 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/d6974b2ef1b716be17f56db… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/d6974b2ef1b716be17f56db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve search performance for messages
by Daniel Brötzmann (＠wurstsalat) 12 Mar '22

12 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8b35d054 by wurstsalat at 2022-03-12T23:43:27+01:00 Improve search performance for messages Note: This also removes "has:" filters, since they are not applied on database query level. - - - - - 3 changed files: - gajim/common/const.py - gajim/common/storage/archive.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/const.py ===================================== @@ -1115,64 +1115,6 @@ def is_active(self): ) -FILE_CATEGORIES = { - 'img': [ - 'jpg', - 'jpeg', - 'jpe', - 'jif', - 'jfif', - 'jfi', - 'png', - 'gif', - 'webp', - 'tiff', - 'tif', - 'psd', - 'raw', - 'arw', - 'cr2', - 'nrw', - 'k25', - 'bmp', - 'dib', - 'heif', - 'heic', - 'ind', - 'indd', - 'indt', - 'jp2', - 'j2k', - 'jpf', - 'jpx', - 'jpm', - 'mj2', - 'svg', - 'svgz', - 'ai' - ], - 'video': [ - 'webm', - 'mpg', - 'mp2', - 'mpeg', - 'mpe', - 'mpv', - 'ogg', - 'mp4', - 'm4p', - 'm4v', - 'avi', - 'wmv', - 'mov', - 'qt', - 'flv', - 'swf', - 'avchd' - ], -} - - TRUST_SYMBOL_DATA = { Trust.UNTRUSTED: ('dialog-error-symbolic', _('Untrusted'), ===================================== gajim/common/storage/archive.py ===================================== @@ -597,7 +597,7 @@ def search_log(self, from_users: Optional[list[str]] = None, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None - ) -> list[SearchLogRow]: + ) -> Iterator[SearchLogRow]: """ Search the conversation log for messages containing the `query` string. @@ -653,12 +653,28 @@ def search_log(self, users_query=users_query_string) if from_users is None: - return self._con.execute( - sql, tuple(jids) + (query, after_ts, before_ts)).fetchall() + + cursor = self._con.execute( + sql, tuple(jids) + (query, after_ts, before_ts)) + while True: + results = cursor.fetchmany(25) + if not results: + break + for result in results: + yield result + return users = ','.join([user.upper() for user in from_users]) - return self._con.execute(sql, tuple(jids) + ( - query, users, after_ts, before_ts)).fetchall() + + cursor = self._con.execute( + sql, tuple(jids) + (query, users, after_ts, before_ts)) + while True: + results = cursor.fetchmany(25) + if not results: + break + for result in results: + yield result + @timeit def search_all_logs(self, @@ -666,7 +682,7 @@ def search_all_logs(self, from_users: Optional[list[str]] = None, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None - ) -> list[SearchLogRow]: + ) -> Iterator[SearchLogRow]: """ Search all conversation logs for messages containing the `query` string. @@ -714,12 +730,23 @@ def search_all_logs(self, users_query=users_query_string) if from_users is None: - return self._con.execute( - sql, (query, after_ts, before_ts)).fetchall() + cursor = self._con.execute(sql, (query, after_ts, before_ts)) + while True: + results = cursor.fetchmany(25) + if not results: + break + for result in results: + yield result + return users = ','.join([user.upper() for user in from_users]) - return self._con.execute( - sql, (query, users, after_ts, before_ts)).fetchall() + cursor = self._con.execute(sql, (query, users, after_ts, before_ts)) + while True: + results = cursor.fetchmany(25) + if not results: + break + for result in results: + yield result @timeit def get_days_with_logs(self, ===================================== gajim/gtk/search_view.py ===================================== @@ -15,10 +15,11 @@ from __future__ import annotations from typing import Any -from typing import Union +from typing import Iterator from typing import Optional import datetime +import itertools import logging import time import re @@ -33,8 +34,6 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant -from gajim.common.const import FILE_CATEGORIES -from gajim.common.i18n import _ from gajim.common.storage.archive import SearchLogRow from .conversation.message_widget import MessageWidget @@ -57,7 +56,7 @@ def __init__(self) -> None: self._account: Optional[str] = None self._jid: Optional[JID] = None - self._results: list[SearchLogRow] = [] + self._results_iterator: Optional[Iterator[SearchLogRow]] = None self._scope: str = 'everywhere' self._ui = get_builder('search_view.ui') @@ -78,18 +77,10 @@ def _on_account_state(self, _event: Any) -> None: self.clear() @staticmethod - def _header_func(row: Union[CounterRow, ResultRow], - before: Optional[Union[CounterRow, ResultRow]]) -> None: - + def _header_func(row: ResultRow, before: ResultRow) -> None: if before is None: - if isinstance(row, CounterRow): - row.set_header(None) - else: - row.set_header(RowHeader(row.account, row.jid, row.time)) + row.set_header(RowHeader(row.account, row.jid, row.time)) else: - if isinstance(row, CounterRow): - row.set_header(None) - return date1 = time.strftime('%x', time.localtime(row.time)) date2 = time.strftime('%x', time.localtime(before.time)) if before.jid != row.jid: @@ -101,6 +92,7 @@ def _header_func(row: Union[CounterRow, ResultRow], def _on_hide_clicked(self, _button: Gtk.Button) -> None: self.emit('hide-search') + self.clear() def clear(self) -> None: self._ui.search_entry.set_text('') @@ -149,22 +141,19 @@ def _on_search(self, entry: Gtk.Entry) -> None: self._ui.date_hint.show() return - # has:'file'|'img'|'video'|filetype - text, has_filters = self._strip_filters(text, 'has') - everywhere = self._ui.search_checkbutton.get_active() context = self._account is not None and self._jid is not None if not context or everywhere: self._scope = 'everywhere' - self._results = app.storage.archive.search_all_logs( + self._results_iterator = app.storage.archive.search_all_logs( text, from_users=from_filters, before=before_filters, after=after_filters) else: self._scope = 'contact' - self._results = app.storage.archive.search_log( + self._results_iterator = app.storage.archive.search_log( self._account, self._jid, text, @@ -172,38 +161,8 @@ def _on_search(self, entry: Gtk.Entry) -> None: before=before_filters, after=after_filters) - if has_filters is not None: - filetypes: list[str] = [] - for filetype in has_filters: - types = FILE_CATEGORIES.get(filetype) - if types is None: - filetypes.append(filetype) - else: - for type_ in types: - filetypes.append(type_) - self._filter_results_for_files(filetypes) - - self._add_counter() self._add_results() - def _filter_results_for_files(self, filetypes: list[str]) -> None: - if 'file' in filetypes: - results: list[SearchLogRow] = [] - for result in self._results: - if result.additional_data.get_value('gajim', 'oob_url'): - results.append(result) - self._results = results - else: - results: list[SearchLogRow] = [] - for result in self._results: - url = result.additional_data.get_value('gajim', 'oob_url') - if url is None: - continue - extension = str(url).rsplit('.', maxsplit=1)[-1] - if extension in filetypes: - results.append(result) - self._results = results - @staticmethod def _strip_filters(text: str, filter_name: str) -> tuple[str, Optional[list[str]]]: @@ -218,14 +177,10 @@ def _strip_filters(text: str, new_text += text[start:] return new_text, filters or None - def _add_counter(self) -> None: - results_count = len(self._results) - if results_count: - self._ui.results_listbox.add(CounterRow(results_count)) - def _add_results(self) -> None: accounts = self._get_accounts() - for msg in self._results[:25]: + assert self._results_iterator is not None + for msg in itertools.islice(self._results_iterator, 25): if self._scope == 'everywhere': archive_jid = app.storage.archive.get_jid_from_id(msg.jid_id) result_row = ResultRow( @@ -238,7 +193,6 @@ def _add_results(self) -> None: result_row = ResultRow(msg, self._account, self._jid) self._ui.results_listbox.add(result_row) - self._results = self._results[25:] def _on_edge_reached(self, _scrolledwin: Gtk.ScrolledWindow, @@ -300,24 +254,6 @@ def __init__(self, account: str, jid: JID, timestamp: float) -> None: self.show_all() -class CounterRow(Gtk.ListBoxRow): - def __init__(self, count: int) -> None: - Gtk.ListBoxRow.__init__(self) - self.set_activatable(False) - 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: - counter_text = _('1 result') - else: - counter_text = _('%s results') % count - label = Gtk.Label(label=counter_text) - self.add(label) - self.show_all() - - class ResultRow(Gtk.ListBoxRow): def __init__(self, msg: SearchLogRow, account: str, jid: JID) -> None: Gtk.ListBoxRow.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b35d0545287d8778f9fcc6f4a27e9f3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b35d0545287d8778f9fcc6f4a27e9f3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] TCP: Set read priority to low
by Philipp Hörist (＠lovetox) 12 Mar '22

12 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d6974b2e by lovetox at 2022-03-12T20:06:35+01:00 TCP: Set read priority to low PRIORITY_DEFAULT is used for example for X Server events or other UI tasks. This should help to prefer UI events before network events. - - - - - 1 changed file: - nbxmpp/tcp.py Changes: ===================================== nbxmpp/tcp.py ===================================== @@ -188,7 +188,7 @@ class TCPConnection(Connection): self._con.get_input_stream().read_bytes_async( READ_BUFFER_SIZE, - GLib.PRIORITY_DEFAULT, + GLib.PRIORITY_LOW, self._read_cancellable, self._on_read_async_finish, None) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d6974b2ef1b716be17f56db3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d6974b2ef1b716be17f56db3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: HistoryExport: Add better solution for storing plaintext files
by Philipp Hörist (＠lovetox) 12 Mar '22

12 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a97dd86d by lovetox at 2022-03-12T16:45:38+01:00 HistoryExport: Add better solution for storing plaintext files JIDs can be long, and have characters which are not allowed in the filesystem. This splits the jid on domain / localpart / resource and generates a folder structure. Further each part is limited in length. - - - - - fa18adc6 by lovetox at 2022-03-12T17:06:14+01:00 Use correct type hints - - - - - 5 changed files: - gajim/common/helpers.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/view.py - gajim/gtk/history_export.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1399,3 +1399,16 @@ def get_start_of_day(date_time: datetime) -> datetime: minute=0, second=0, microsecond=0) + + +def make_path_from_jid(base_path: Path, jid: JID) -> Path: + assert jid.domain is not None + domain = jid.domain[:50] + + if jid.localpart is None: + return base_path / domain + + path = base_path / domain / jid.localpart[:50] + if jid.resource is not None: + return path / jid.resource[:30] + return path ===================================== gajim/gtk/controls/base.py ===================================== @@ -1404,7 +1404,7 @@ def scroll_to_end(self, force: bool = False) -> None: self.reset_view() self.conversation_view.scroll_to_end(force) - def scroll_to_message(self, log_line_id: str, timestamp: float) -> None: + def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: row = self.conversation_view.get_row_by_log_line_id(log_line_id) if row is None: # Clear view and reload conversation around timestamp ===================================== gajim/gtk/conversation/view.py ===================================== @@ -430,7 +430,7 @@ def _reduce_messages_after(self) -> None: row = self.get_row_at_index(len(self.get_children()) - 1) row.destroy() - def scroll_to_message_and_highlight(self, log_line_id: str) -> None: + def scroll_to_message_and_highlight(self, log_line_id: int) -> None: highlight_row = None for row in cast(list[BaseRow], self.get_children()): row.get_style_context().remove_class( @@ -447,7 +447,7 @@ def scroll_to_message_and_highlight(self, log_line_id: str) -> None: def _get_row_by_message_id(self, id_: str) -> Optional[MessageRow]: return self._message_id_row_map.get(id_) - def get_row_by_log_line_id(self, log_line_id: str) -> Optional[MessageRow]: + def get_row_by_log_line_id(self, log_line_id: int) -> Optional[MessageRow]: for row in cast(list[BaseRow], self.get_children()): if not isinstance(row, MessageRow): continue ===================================== gajim/gtk/history_export.py ===================================== @@ -27,6 +27,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common.const import KindConstant +from gajim.common.helpers import make_path_from_jid from gajim.common.i18n import _ from gajim.common.storage.archive import MessageExportRow @@ -106,8 +107,7 @@ def _on_export(self) -> None: current_time = datetime.now() time_str = current_time.strftime('%Y-%m-%d-%H-%M-%S') - path = Path(directory) / f'export_{time_str}' - path.mkdir() + export_dir = Path(directory) / f'export_{time_str}' jids = app.storage.archive.get_conversation_jids(account) @@ -116,7 +116,10 @@ def _on_export(self) -> None: if not messages: continue - with open(path / f'{jid}.txt', 'w', encoding='utf-8') as file: + file_path = make_path_from_jid(export_dir, jid) + file_path.mkdir(parents=True, exist_ok=True) + with open(file_path / 'history.txt', 'w', encoding='utf-8') as file: + file.write(f'History for {jid}\n\n') for message in messages: file.write(self._get_export_line(message)) ===================================== gajim/gtk/search_view.py ===================================== @@ -319,7 +319,7 @@ def __init__(self, count: int) -> None: class ResultRow(Gtk.ListBoxRow): - def __init__(self, msg: Any, account: str, jid: JID) -> None: + def __init__(self, msg: SearchLogRow, account: str, jid: JID) -> None: Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/48e1df4517bdd2f00548c2d27fa1812… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/48e1df4517bdd2f00548c2d27fa1812… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve history export
by Philipp Hörist (＠lovetox) 12 Mar '22

12 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 48e1df45 by lovetox at 2022-03-12T13:52:10+01:00 Improve history export - Create file per jid - Fix FileChooserButton not correctly returning the selected directory in some circumstances - - - - - 3 changed files: - gajim/common/storage/archive.py - gajim/gtk/history_export.py - pyrightconfig.json Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -22,6 +22,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any +from typing import Iterator from typing import KeysView from typing import NamedTuple from typing import Optional @@ -1313,16 +1314,39 @@ def reset_archive_infos(self, jid: str) -> None: log.info('Reset message archive info: %s', jid) self._delayed_commit() + def get_conversation_jids(self, account: str) -> list[JID]: + account_id = self.get_account_id(account) + sql = '''SELECT DISTINCT jid as "jid [jid]" + FROM logs + NATURAL JOIN jids jid_id + WHERE account_id = ?''' + rows = self._con.execute(sql, (account_id, )).fetchall() + return [row.jid for row in rows] + def get_messages_for_export(self, - account: str - ) -> list[MessageExportRow]: + account: str, + jid: JID + ) -> Iterator[MessageExportRow]: + + kinds = map(str, [KindConstant.CHAT_MSG_RECV, + KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT, + KindConstant.GC_MSG]) + account_id = self.get_account_id(account) sql = '''SELECT jid, time, kind, message, contact_name FROM logs NATURAL JOIN jids jid_id - WHERE account_id = ? - ORDER BY jid_id, time''' - return self._con.execute(sql, (account_id, )).fetchall() + WHERE account_id = ? AND kind in ({kinds}) AND jid = ? + ORDER BY time'''.format(kinds=', '.join(kinds)) + + cursor = self._con.execute(sql, (account_id, jid)) + while True: + results = cursor.fetchmany(10) + if not results: + break + for result in results: + yield result def remove_history(self, account: str, jid: JID) -> None: """ ===================================== gajim/gtk/history_export.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import configpaths from gajim.common.const import KindConstant from gajim.common.i18n import _ +from gajim.common.storage.archive import MessageExportRow from .assistant import Assistant from .assistant import Page @@ -102,41 +103,46 @@ def _on_button_clicked(self, def _on_export(self) -> None: start_page = cast(SelectAccountDir, self.get_page('start')) account, directory = start_page.get_account_and_directory() - messages = app.storage.archive.get_messages_for_export(account) current_time = datetime.now() time_str = current_time.strftime('%Y-%m-%d-%H-%M-%S') - filename = Path(directory) / f'export_{time_str}.txt' - - with open(filename, 'w', encoding='utf-8') as out_file: - conversation = '' - for message in messages: - if message.kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV): - name = message.jid - elif message.kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): - name = _('You') - elif message.kind == KindConstant.GC_MSG: - name = message.contact_name - else: - continue - - timestamp = '' - try: - timestamp = time.strftime( - '%Y-%m-%d %H:%M:%S', time.localtime(message.time)) - except ValueError: - pass - - if conversation != message.jid: - # Different conversation - out_file.write(f'\n{"=" * 80}\n{message.jid}\n\n') - conversation = message.jid - out_file.write(f'{timestamp} {name}: {message.message}\n') + path = Path(directory) / f'export_{time_str}' + path.mkdir() + + jids = app.storage.archive.get_conversation_jids(account) + + for jid in jids: + messages = app.storage.archive.get_messages_for_export(account, jid) + if not messages: + continue + + with open(path / f'{jid}.txt', 'w', encoding='utf-8') as file: + for message in messages: + file.write(self._get_export_line(message)) self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) + def _get_export_line(self, message: MessageExportRow) -> str: + if message.kind in (KindConstant.SINGLE_MSG_RECV, + KindConstant.CHAT_MSG_RECV): + name = message.jid + elif message.kind in (KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT): + name = _('You') + elif message.kind == KindConstant.GC_MSG: + name = message.contact_name + else: + raise ValueError('Unknown kind: %s' % message.kind) + + timestamp = '' + try: + timestamp = time.strftime( + '%Y-%m-%d %H:%M:%S', time.localtime(message.time)) + except ValueError: + pass + + return f'{timestamp} {name}: {message.message}\n' + class SelectAccountDir(Page): def __init__(self, account: Optional[str]) -> None: @@ -178,7 +184,9 @@ def _set_complete(self) -> None: self.update_page_complete() def _on_file_set(self, button: Gtk.FileChooserButton) -> None: - self._export_directory = button.get_current_folder() + uri = button.get_uri() + assert uri is not None + self._export_directory = uri.removeprefix('file://') def get_account_and_directory(self) -> tuple[str, str]: assert self._account is not None ===================================== pyrightconfig.json ===================================== @@ -57,6 +57,7 @@ "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", + "gajim/gtk/history_export.py", "gajim/gtk/main_stack.py", "gajim/gtk/main.py", "gajim/gtk/mam_preferences.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48e1df4517bdd2f00548c2d27fa18128… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48e1df4517bdd2f00548c2d27fa18128… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: EmojiData: Typing
by Daniel Brötzmann (＠wurstsalat) 10 Mar '22

10 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8974f2ca by wurstsalat at 2022-03-10T23:27:33+01:00 EmojiData: Typing - - - - - 6747e016 by wurstsalat at 2022-03-10T23:27:33+01:00 PlainWidget: Add missing emoji replace method - - - - - 2d598a7b by wurstsalat at 2022-03-10T23:27:33+01:00 Remove obsolete HTMLTextView - - - - - 3 changed files: - gajim/gtk/conversation/plain_widget.py - gajim/gtk/emoji_data.py - − gajim/gtk/htmltextview.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -21,6 +21,7 @@ from gi.repository import Gtk from gi.repository import Pango from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import GObject @@ -65,7 +66,7 @@ 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 = text.replace('/me', f'* {nickname}', 1) text = GLib.markup_escape_text(text) self._text_widget.add_action_phrase(text) @@ -255,6 +256,25 @@ def print_text_with_styling(self, block: PlainBlock) -> None: emoji_pixbufs.append_marks( self, start_mark, end_mark, emoji.text) + def replace_emoji(self, + start_mark: Gtk.TextMark, + end_mark: Gtk.TextMark, + pixbuf: GdkPixbuf.Pixbuf, + codepoint: str + ) -> None: + buffer_ = self.get_buffer() + start_iter = buffer_.get_iter_at_mark(start_mark) + end_iter = buffer_.get_iter_at_mark(end_mark) + buffer_.delete(start_iter, end_iter) + + anchor = buffer_.create_child_anchor(start_iter) + anchor.plaintext = codepoint # type: ignore + img = Gtk.Image.new_from_pixbuf(pixbuf) + img.show() + self.add_child_at_anchor(img, anchor) + buffer_.delete_mark(start_mark) + buffer_.delete_mark(end_mark) + def add_action_phrase(self, text: str) -> None: buffer_ = self.get_buffer() buffer_.insert(buffer_.get_start_iter(), text.strip()) @@ -268,7 +288,7 @@ def _query_tooltip(self, x_pos: int, y_pos: int, _keyboard_mode: bool, - tooltip: Gtk.Tooltip + _tooltip: Gtk.Tooltip ) -> bool: window = widget.get_window(Gtk.TextWindowType.TEXT) ===================================== gajim/gtk/emoji_data.py ===================================== @@ -14,12 +14,15 @@ # pylint: disable=too-many-lines +from typing import Optional + import re import weakref from enum import IntEnum from collections import OrderedDict from gi.repository import GdkPixbuf +from gi.repository import Gtk _MODIFIERS = ['\U0001F3FB', '\U0001F3FC', @@ -36,7 +39,7 @@ class Emoji(IntEnum): PARSE_COLUMNS = 20 -def is_emoji(codepoints): +def is_emoji(codepoints: str) -> bool: if codepoints in emoji_data: return True if codepoints in emoji_ascii_data: @@ -44,7 +47,7 @@ def is_emoji(codepoints): return False -def get_emoji_pixbuf(codepoints): +def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: ascii_codepoint = emoji_ascii_data.get(codepoints, None) if ascii_codepoint is not None: codepoints = ascii_codepoint @@ -75,7 +78,7 @@ def __contains__(self, item): except KeyError: return False - def get_regex(self): + def get_regex(self) -> str: emojis = [] for codepoint, attrs in self.items(): if attrs.get('variations', False): @@ -92,38 +95,49 @@ class EmojiPixbufs(dict): def __init__(self): dict.__init__(self) - self._marks = weakref.WeakKeyDictionary() + self._marks: weakref.WeakKeyDictionary[ + Gtk.TextView, + list[tuple[ + weakref.ReferenceType[Gtk.TextMark], + weakref.ReferenceType[Gtk.TextMark], + str]] + ] = weakref.WeakKeyDictionary() @property - def complete(self): + def complete(self) -> bool: return self._complete @complete.setter - def complete(self, value): - if value is True: + def complete(self, value: bool) -> None: + if value: self._replace_emojis() self._marks.clear() self._complete = value - def clear(self): + def clear(self) -> None: self.complete = False self._marks.clear() dict.clear(self) - def append_marks(self, textview, start, end, codepoint): + def append_marks(self, + textview: Gtk.TextView, + start: Gtk.TextMark, + end: Gtk.TextMark, + codepoint: str + ) -> None: # We have to assign some dummy data to the mark, or else # pygobject will not keep the python wrapper alive, which in turn # makes the weakref invalid as soon as the method ends - start.dummy = 'x' - start = weakref.ref(start) - end.dummy = 'x' - end = weakref.ref(end) + start.dummy = 'x' # type: ignore + start_ref = weakref.ref(start) + end.dummy = 'x' # type: ignore + end_ref = weakref.ref(end) if textview in self._marks: - self._marks[textview].append((start, end, codepoint)) + self._marks[textview].append((start_ref, end_ref, codepoint)) else: - self._marks[textview] = [(start, end, codepoint)] + self._marks[textview] = [(start_ref, end_ref, codepoint)] - def _replace_emojis(self): + def _replace_emojis(self) -> None: for textview, emojis in self._marks.items(): for emoji in emojis: start, end, codepoint = emoji @@ -140,7 +154,7 @@ def _replace_emojis(self): pixbuf = pixbuf.scale_simple(Emoji.TEXT_SIZE, Emoji.TEXT_SIZE, GdkPixbuf.InterpType.HYPER) - textview.replace_emojis( + textview.replace_emoji( start(), end(), pixbuf.copy(), codepoint) @@ -148,7 +162,7 @@ def _replace_emojis(self): # pylint: disable=line-too-long -emoji_ascii_data = dict([ +emoji_ascii_data: dict[str, str] = dict([ ("':-D", '\U0001F605'), (':)', '\U0001F642'), (':-O', '\U0001F62e'), ===================================== gajim/gtk/htmltextview.py deleted ===================================== @@ -1,897 +0,0 @@ -# Copyright (C) 2005 Gustavo J. A. M. Carneiro -# Copyright (C) 2006 Santiago Gala -# Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Nikos Kouremenos <kourem AT gmail.com> -# 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/>. - -""" -A Gtk.TextView-based renderer for XHTML-IM, as described in: - http://xmpp.org/extensions/xep-0071.html - -Starting with the version posted by Gustavo Carneiro, -I (Santiago Gala) am trying to make it more compatible -with the markup that docutils generate, and also more -modular. -""" - -import re -import logging -import xml.sax -import xml.sax.handler -from io import StringIO - -from gi.repository import GObject -from gi.repository import Pango -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib - -from gajim.common import app -from gajim.common.const import StyleAttr -from gajim.common.helpers import open_uri -from gajim.common.helpers import parse_uri - -from .menus import get_conv_context_menu -from .util import get_cursor - -log = logging.getLogger('gajim.htmlview') - -whitespace_rx = re.compile('\\s+') -allwhitespace_rx = re.compile('^\\s*$') - -# embryo of CSS classes -classes = { - #'system-message':';display: none', - 'problematic': ';color: red', -} - -# styles for elements -_element_styles = { - 'u' : ';text-decoration: underline', - 'em' : ';font-style: oblique', - 'cite' : '; background-color:rgb(170,190,250);' - 'font-style: oblique', - 'li' : '; margin-left: 1em; margin-right: 10%', - 'strong' : ';font-weight: bold', - 'pre' : '; background-color:rgb(190,190,190);' - 'font-family: monospace; white-space: pre;' - 'margin-left: 1em; margin-right: 10%', - 'kbd' : ';background-color:rgb(210,210,210);' - 'font-family: monospace', - 'blockquote' : '; background-color:rgb(170,190,250);' - 'margin-left: 2em; margin-right: 10%', - 'dt' : ';font-weight: bold; font-style: oblique', - 'dd' : ';margin-left: 2em; font-style: oblique' -} -# no difference for the moment -_element_styles['dfn'] = _element_styles['em'] -_element_styles['var'] = _element_styles['em'] -# deprecated, legacy, presentational -_element_styles['tt'] = _element_styles['kbd'] -_element_styles['i'] = _element_styles['em'] -_element_styles['b'] = _element_styles['strong'] - -_supported_style_attrs = [ - 'background-color', 'color', 'font-family', 'font-size', 'font-style', - 'font-weight', 'margin-left', 'margin-right', 'text-align', - 'text-decoration', 'white-space', 'display', 'width', 'height' -] - -# ========== -# XEP-0071 -# ========== -# -# This Integration Set includes a subset of the modules defined for -# XHTML 1.0 but does not redefine any existing modules, nor -# does it define any new modules. Specifically, it includes the -# following modules only: -# -# - Structure -# - Text -# -# * Block -# -# phrasal -# addr, blockquote, pre -# Struct -# div,p -# Heading -# h1, h2, h3, h4, h5, h6 -# -# * Inline -# -# phrasal -# abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var -# structural -# br, span -# -# - Hypertext (a) -# - List (ul, ol, dl) -# - Image (img) -# - Style Attribute -# -# Therefore XHTML-IM uses the following content models: -# -# Block.mix -# Block-like elements, e.g., paragraphs -# Flow.mix -# Any block or inline elements -# Inline.mix -# Character-level elements -# InlineNoAnchor.class -# Anchor element -# InlinePre.mix -# Pre element -# -# XHTML-IM also uses the following Attribute Groups: -# -# Core.extra.attrib -# TBD -# I18n.extra.attrib -# TBD -# Common.extra -# style -# -# -# ... -# block level: -# Heading h -# ( head = h1 | h2 | h3 | h4 | h5 | h6 ) -# Block ( phrasal = address | blockquote | pre ) -# NOT ( presentational = hr ) -# ( structural = div | p ) -# other: section -# Inline ( phrasal = abbr | acronym | cite | code | dfn | em | -# kbd | q | samp | strong | var ) -# NOT ( presentational = b | big | i | small | sub | sup | tt ) -# ( structural = br | span ) -# Param/Legacy param, font, basefont, center, s, strike, u, dir, menu, -# isindex - -BLOCK_HEAD = set(('h1', 'h2', 'h3', 'h4', 'h5', 'h6',)) -BLOCK_PHRASAL = set(('address', 'blockquote', 'pre',)) -BLOCK_PRES = set(('hr', )) #not in xhtml-im -BLOCK_STRUCT = set(('div', 'p', )) -BLOCK_HACKS = set(('table', 'tr')) # at the very least, they will start line ;) -BLOCK = BLOCK_HEAD | BLOCK_PHRASAL | BLOCK_STRUCT | BLOCK_PRES | BLOCK_HACKS - -INLINE_PHRASAL = set(['abbr', 'acronym', 'cite', 'code', 'dfn', 'em', - 'kbd', 'q', 'samp', 'strong', 'var']) -INLINE_PRES = set(['b', 'i', 'u', 'tt']) #not in xhtml-im -INLINE_STRUCT = set(['br', 'span']) -INLINE = INLINE_PHRASAL | INLINE_PRES | INLINE_STRUCT - -LIST_ELEMS = set(['dl', 'ol', 'ul']) - -for _name in BLOCK_HEAD: - _num = int(_name[1]) - _header_size = (_num - 1) // 2 - _weight = (_num - 1) % 2 - _element_styles[_name] = '; font-size: %s; %s' % ( - ('large', 'medium', 'small')[_header_size], - ('font-weight: bold', 'font-style: oblique')[_weight]) - -def _parse_css_color(color): - rgba = Gdk.RGBA() - success = rgba.parse(color) - if not success: - log.warning('Can\'t parse color: %s', color) - return rgba - -def style_iter(style): - for item in style.split(';'): - if item.strip(): - yield [x.strip() for x in item.split(':', 1)] - - -class HtmlHandler(xml.sax.handler.ContentHandler): - """ - A handler to display html to a gtk textview - - It keeps a stack of "style spans" (start/end element pairs) and a stack of - list counters, for nested lists. - """ - def __init__(self, textview, startiter): - xml.sax.handler.ContentHandler.__init__(self) - self.textbuf = textview.get_buffer() - self.textview = textview - self.iter = startiter - self.text = '' - self.starting = True - self.preserve = False - self.styles = [] # a Gtk.TextTag or None, for each span level - self.list_counters = [] # stack (top at head) of list - # counters, or None for unordered list - - # build a dictionary mapping styles to methods - self.__style_methods = {} - for style in _supported_style_attrs: - method_names = '_parse_style_%s' % style.replace('-', '_') - self.__style_methods[style] = method_names - - def _get_points_from_pixels(self, pixels): - resolution = self.textview.get_screen().get_resolution() - # points = pixels * 72 / resolution - return pixels * 72 / resolution - - @staticmethod - def _parse_style_color(tag, value): - color = _parse_css_color(value) - tag.set_property('foreground-rgba', color) - - @staticmethod - def _parse_style_background_color(tag, value): - color = _parse_css_color(value) - tag.set_property('background-rgba', color) - tag.set_property('paragraph-background-rgba', color) - - @staticmethod - def __parse_length_frac_size_allocate(_textview, allocation, frac, - callback, args): - callback(allocation.width*frac, *args) - - def _parse_length(self, value, font_relative, block_relative, minl, maxl, - callback, *args): - """ - Parse/calc length, converting to pixels, calls callback(length, *args) - when the length is first computed or changes - """ - if value.endswith('%'): - val = float(value[:-1]) - if val > 0: - sign = 1 - elif val < 0: - sign = -1 - else: - sign = 0 - # limits: 1% to 500% - val = sign*max(1, min(abs(val), 500)) - frac = val/100 - if font_relative: - callback(frac, '%', *args) - elif block_relative: - # CSS says 'Percentage values: refer to width of the closest - # block-level ancestor' - # This is difficult/impossible to implement, so we use - # textview width instead; a reasonable approximation.. - alloc = self.textview.get_allocation() - self.__parse_length_frac_size_allocate( - self.textview, alloc, frac, callback, args) - self.textview.connect('size-allocate', - self.__parse_length_frac_size_allocate, - frac, callback, args) - else: - callback(frac, *args) - return - - def get_val(min_val=minl, max_val=maxl): - try: - val = float(value[:-2]) - except Exception: - log.warning('Unable to parse length value "%s"', value) - return None - if val > 0: - sign = 1 - elif val < 0: - sign = -1 - else: - sign = 0 - # validate length - return sign*max(min_val, min(abs(val), max_val)) - if value.endswith('pt'): # points - size = get_val(5, 50) - if size is None: - return - callback(size, 'pt', *args) - - elif value.endswith('em'): - size = get_val(0.3, 4) - if size is None: - return - callback(size, 'em', *args) - - elif value.endswith('px'): # pixels - size = get_val(5, 50) - if size is None: - return - callback(size, 'px', *args) - - else: - try: - # TODO: isn't "no units" interpreted as pixels? - val = int(value) - if val > 0: - sign = 1 - elif val < 0: - sign = -1 - else: - sign = 0 - # validate length - val = sign*max(5, min(abs(val), 70)) - callback(val, 'px', *args) - except Exception: - log.warning('Unable to parse length value "%s"', value) - - def __parse_font_size_cb(self, size, type_, tag): - if type_ in ('em', '%'): - tag.set_property('scale', size) - elif type_ == 'pt': - tag.set_property('size-points', size) - elif type_ == 'px': - tag.set_property('size-points', self._get_points_from_pixels(size)) - - @staticmethod - def _parse_style_display(tag, value): - if value == 'none': - tag.set_property('invisible', 'true') - # FIXME: display: block, inline - - def _parse_style_font_size(self, tag, value): - try: - scale = { - 'xx-small': 0.5787037037037, - 'x-small': 0.6444444444444, - 'small': 0.8333333333333, - 'medium': 1.0, - 'large': 1.2, - 'x-large': 1.4399999999999, - 'xx-large': 1.728, - }[value] - except KeyError: - pass - else: - tag.set_property('scale', scale) - return - if value == 'smaller': - tag.set_property('scale', 0.8333333333333) - return - if value == 'larger': - tag.set_property('scale', 1.2) - return - # font relative (5 ~ 4pt, 110 ~ 72pt) - self._parse_length( - value, True, False, 5, 110, self.__parse_font_size_cb, tag) - - @staticmethod - def _parse_style_font_style(tag, value): - try: - style = { - 'normal': Pango.Style.NORMAL, - 'italic': Pango.Style.ITALIC, - 'oblique': Pango.Style.OBLIQUE, - }[value] - except KeyError: - log.warning('unknown font-style %s', value) - else: - tag.set_property('style', style) - - def __frac_length_tag_cb(self, length, tag, propname): - styles = self._get_style_tags() - if styles: - length += styles[-1].get_property(propname) - tag.set_property(propname, length) - - def _parse_style_margin_left(self, tag, value): - # block relative - self._parse_length(value, False, True, 1, 1000, - self.__frac_length_tag_cb, tag, 'left-margin') - - def _parse_style_margin_right(self, tag, value): - # block relative - self._parse_length(value, False, True, 1, 1000, - self.__frac_length_tag_cb, tag, 'right-margin') - - @staticmethod - def _parse_style_font_weight(tag, value): - # TODO: missing 'bolder' and 'lighter' - try: - weight = { - '100': Pango.Weight.ULTRALIGHT, - '200': Pango.Weight.ULTRALIGHT, - '300': Pango.Weight.LIGHT, - '400': Pango.Weight.NORMAL, - '500': Pango.Weight.NORMAL, - '600': Pango.Weight.BOLD, - '700': Pango.Weight.BOLD, - '800': Pango.Weight.ULTRABOLD, - '900': Pango.Weight.HEAVY, - 'normal': Pango.Weight.NORMAL, - 'bold': Pango.Weight.BOLD, - }[value] - except KeyError: - log.warning('unknown font-style %s', value) - else: - tag.set_property('weight', weight) - - @staticmethod - def _parse_style_font_family(tag, value): - tag.set_property('family', value) - - @staticmethod - def _parse_style_text_align(tag, value): - try: - align = { - 'left': Gtk.Justification.LEFT, - 'right': Gtk.Justification.RIGHT, - 'center': Gtk.Justification.CENTER, - 'justify': Gtk.Justification.FILL, - }[value] - except KeyError: - log.warning('Invalid text-align: %s requested', value) - else: - tag.set_property('justification', align) - - @staticmethod - def _parse_style_text_decoration(tag, value): - values = value.split(' ') - if 'none' in values: - tag.set_property('underline', Pango.Underline.NONE) - tag.set_property('strikethrough', False) - if 'underline' in values: - tag.set_property('underline', Pango.Underline.SINGLE) - else: - tag.set_property('underline', Pango.Underline.NONE) - if 'line-through' in values: - tag.set_property('strikethrough', True) - else: - tag.set_property('strikethrough', False) - if 'blink' in values: - log.warning('text-decoration:blink not implemented') - if 'overline' in values: - log.warning('text-decoration:overline not implemented') - - @staticmethod - def _parse_style_white_space(tag, value): - if value == 'pre': - tag.set_property('wrap_mode', Gtk.WrapMode.NONE) - elif value == 'normal': - tag.set_property('wrap_mode', Gtk.WrapMode.WORD) - elif value == 'nowrap': - tag.set_property('wrap_mode', Gtk.WrapMode.NONE) - - @staticmethod - def __length_tag_cb(value, tag, propname): - try: - tag.set_property(propname, value) - except Exception: - log.warning('Error with prop: %s for tag: %s', propname, str(tag)) - - def _parse_style_width(self, tag, value): - if value == 'auto': - return - self._parse_length(value, False, False, 1, 1000, - self.__length_tag_cb, tag, "width") - def _parse_style_height(self, tag, value): - if value == 'auto': - return - self._parse_length(value, False, False, 1, 1000, - self.__length_tag_cb, tag, "height") - - def _get_style_tags(self): - return [tag for tag in self.styles if tag is not None] - - def _create_url(self, href, title, type_, id_): - '''Process a url tag. - ''' - tag = self.textbuf.create_tag(id_) - if href and href[0] != '#': - tag.href = href - tag.type_ = type_ # to be used by the URL handler - tag.connect('event', self.textview.hyperlink_handler, 'url') - tag.set_property('foreground', - app.css_config.get_value('.gajim-url', - StyleAttr.COLOR)) - tag.set_property('underline', Pango.Underline.SINGLE) - tag.is_anchor = True - if title: - tag.title = title - return tag - - def _begin_span(self, style, tag=None, id_=None): - if style is None: - self.styles.append(tag) - return - if tag is None: - if id_: - tag = self.textbuf.create_tag(id_) - else: - tag = self.textbuf.create_tag() # we create anonymous tag - for attr, val in style_iter(style): - attr = attr.lower() - try: - getattr(self, self.__style_methods[attr])(tag, val) - except KeyError: - log.warning('Style attribute "%s" requested ' - 'but not yet implemented', attr) - self.styles.append(tag) - - def _end_span(self): - self.styles.pop() - - def _jump_line(self): - self.textbuf.insert_with_tags_by_name(self.iter, '\n', 'eol') - self.starting = True - - def _insert_text(self, text, working_iter=None): - if working_iter is None: - working_iter = self.iter - if self.starting and text != '\n': - self.starting = (text[-1] == '\n') - tags = self._get_style_tags() - if tags: - self.textbuf.insert_with_tags(working_iter, text, *tags) - else: - self.textbuf.insert(working_iter, text) - - def _starts_line(self): - return self.starting or self.iter.starts_line() - - def _flush_text(self): - if not self.text: - return - text, self.text = self.text, '' - if not self.preserve: - text = text.replace('\n', ' ') - self.handle_specials(whitespace_rx.sub(' ', text)) - else: - self._insert_text(text.strip('\n')) - - def _anchor_event(self, _tag, _textview, event, _iter, href, type_): - if event.type == Gdk.EventType.BUTTON_PRESS: - self.textview.emit('url-clicked', href, type_) - return True - return False - - def handle_specials(self, 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: - self.text += content - return - if allwhitespace_rx.match(content) is not None and self._starts_line(): - return - self.text += content - self.starting = False - - def startElement(self, name, attrs): - self._flush_text() - klass = [i for i in attrs.get('class', ' ').split(' ') if i] - style = '' - #Add styles defined for classes - for k in klass: - if k in classes: - style += classes[k] - - tag = None - #FIXME: if we want to use id, it needs to be unique across - # the whole textview, so we need to add something like the - # message-id to it. - #id_ = attrs.get('id',None) - id_ = None - if name == 'a': - #TODO: accesskey, charset, hreflang, rel, rev, tabindex, type - href = attrs.get('href', None) - if not href: - href = attrs.get('HREF', None) - # Gaim sends HREF instead of href - title = attrs.get('title', attrs.get('rel', href)) - type_ = attrs.get('type', None) - tag = self._create_url(href, title, type_, id_) - elif name == 'blockquote': - cite = attrs.get('cite', None) - if cite: - tag = self.textbuf.create_tag(id_) - tag.title = attrs.get('title', None) - tag.is_anchor = True - elif name in LIST_ELEMS: - style += ';margin-left: 2em' - - if name in _element_styles: - style += _element_styles[name] - # so that explicit styles override implicit ones, - # we add the attribute last - style += ";"+attrs.get('style', '') - if style == '': - style = None - self._begin_span(style, tag, id_) - - if name == 'br': - pass # handled in endElement - elif name == 'hr': - pass # handled in endElement - elif name in BLOCK: - if not self._starts_line(): - self._jump_line() - if name == 'pre': - self.preserve = True - elif name == 'span': - pass - elif name in ('dl', 'ul'): - if not self._starts_line(): - self._jump_line() - self.list_counters.append(None) - elif name == 'ol': - if not self._starts_line(): - self._jump_line() - self.list_counters.append(0) - elif name == 'li': - if self.list_counters[-1] is None: - li_head = chr(0x2022) - else: - self.list_counters[-1] += 1 - li_head = '%i.' % self.list_counters[-1] - self.text = ' '*len(self.list_counters)*4 + li_head + ' ' - self._flush_text() - self.starting = True - elif name == 'dd': - self._jump_line() - elif name == 'dt': - if not self.starting: - self._jump_line() - elif name in ('a', 'img', 'body', 'html'): - pass - elif name in INLINE: - pass - else: - log.warning('Unhandled element "%s"', name) - - def endElement(self, name): - end_preserving = False - newline = False - if name == 'br': - newline = True - elif name == 'hr': - #FIXME: plenty of unused attributes (width, height,...) :) - self._jump_line() - self._insert_text('\u2015'*40) - self._jump_line() - elif name in LIST_ELEMS: - self.list_counters.pop() - elif name == 'li': - newline = True - elif name == 'img': - pass - elif name in ('body', 'html'): - pass - elif name == 'a': - pass - elif name in INLINE: - pass - elif name in ('dd', 'dt', ): - pass - elif name in BLOCK: - if name == 'pre': - end_preserving = True - elif name in BLOCK_STRUCT: - newline = True - else: - log.warning("Unhandled element '%s'", name) - self._flush_text() - if end_preserving: - self.preserve = False - if newline: - self._jump_line() - self._end_span() - - -class HtmlTextView(Gtk.TextView): - - _tags = ['url', 'mail', 'xmpp', 'sth_at_sth'] - - def __init__(self, account, standalone=False): - Gtk.TextView.__init__(self) - - self.set_has_tooltip(True) - self.set_border_width(1) - self.set_accepts_tab(True) - self.set_editable(False) - self.set_cursor_visible(False) - self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self.set_left_margin(2) - self.set_right_margin(2) - - self.drag_dest_unset() - - self.connect('copy-clipboard', self._on_copy_clipboard) - self.connect('destroy', self._on_destroy) - self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') - - self.account = account - self.plugin_modified = False - self._cursor_changed = False - - if standalone: - self.connect('query-tooltip', self._query_tooltip) - self.create_tags() - - def _on_destroy(self, *args): - # We restore the TextView’s drag destination to avoid a GTK warning - # when closing the control. BaseControl.shutdown() calls destroy() - # on the control’s main box, causing GTK to recursively destroy the - # child widgets. GTK then tries to set a target list on the TextView, - # resulting in a warning because the Widget has no drag destination. - self.drag_dest_set( - Gtk.DestDefaults.ALL, - None, - Gdk.DragAction.DEFAULT) - - def create_tags(self): - color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - - attrs = {'foreground': color, - 'underline': Pango.Underline.SINGLE} - - for tag in self._tags: - tag_ = self.get_buffer().create_tag(tag, **attrs) - tag_.connect('event', self.hyperlink_handler, 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 self._tags: - tag_table.lookup(tag).set_property('foreground', color) - - 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(): - 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 - - tag_name = tag.get_property('name') - 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 show_context_menu(self, uri): - menu = get_conv_context_menu(self.account, uri) - if menu is None: - log.warning('No handler for URI type: %s', uri) - return - - def destroy(menu, _pspec): - visible = menu.get_property('visible') - if not visible: - GLib.idle_add(menu.destroy) - - menu.attach_to_widget(self, None) - menu.connect('notify::visible', destroy) - menu.popup_at_pointer() - - def hyperlink_handler(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 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, eob)) - parser.parse(StringIO(html)) - # If the xhtml ends with a BLOCK element we have to remove - # the \n we add after BLOCK elements - self._delete_last_char(buffer_, eob) - - @staticmethod - def _delete_last_char(buffer_, iter_): - start_iter = iter_.copy() - start_iter.backward_char() - text = buffer_.get_text(start_iter, iter_, True) - if text == '\n': - buffer_.delete(start_iter, iter_) - - @staticmethod - def _on_copy_clipboard(textview): - clipboard = textview.get_clipboard(Gdk.SELECTION_CLIPBOARD) - selected = textview.get_selected_text() - clipboard.set_text(selected, -1) - GObject.signal_stop_emission_by_name(textview, 'copy-clipboard') - - def get_selected_text(self): - bounds = self.get_buffer().get_selection_bounds() - selection = '' - if bounds: - (search_iter, end) = bounds - - while search_iter.compare(end): - character = search_iter.get_char() - if character == '\ufffc': - anchor = search_iter.get_child_anchor() - if anchor: - text = anchor.plaintext - if text: - selection += text - else: - selection += character - else: - selection += character - search_iter.forward_char() - return selection - - def replace_emojis(self, start_mark, end_mark, pixbuf, codepoint): - buffer_ = self.get_buffer() - start_iter = buffer_.get_iter_at_mark(start_mark) - end_iter = buffer_.get_iter_at_mark(end_mark) - buffer_.delete(start_iter, end_iter) - - anchor = buffer_.create_child_anchor(start_iter) - anchor.plaintext = codepoint - emoji = Gtk.Image.new_from_pixbuf(pixbuf) - emoji.show() - self.add_child_at_anchor(emoji, anchor) - buffer_.delete_mark(start_mark) - buffer_.delete_mark(end_mark) - - def unselect(self): - buffer_ = self.get_buffer() - insert_iter = buffer_.get_iter_at_mark(buffer_.get_insert()) - buffer_.select_range(insert_iter, insert_iter) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a9c5691a5c83775a997e55803db8430… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a9c5691a5c83775a997e55803db8430… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Account: Privacy: Update module states on switch
by Daniel Brötzmann (＠wurstsalat) 08 Mar '22

08 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a9c5691a by André Apitzsch at 2022-03-08T08:21:12+00:00 Account: Privacy: Update module states on switch - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -723,15 +723,18 @@ def __init__(self, account: str) -> None: settings = [ Setting(SettingKind.SWITCH, _('Idle Time'), SettingType.ACCOUNT_CONFIG, 'send_idle_time', + callback=self._send_idle_time, desc=_('Disclose the time of your last activity')), Setting(SettingKind.SWITCH, _('Local System Time'), SettingType.ACCOUNT_CONFIG, 'send_time_info', + callback=self._send_time_info, desc=_('Disclose the local system time of the ' 'device Gajim runs on')), Setting(SettingKind.SWITCH, _('Client / Operating System'), SettingType.ACCOUNT_CONFIG, 'send_os_info', + callback=self._send_os_info, desc=_('Disclose information about the client ' 'and operating system you currently use')), @@ -813,6 +816,15 @@ def _reset_gc_send_chatstate(button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_group_chat_settings('send_chatstate', None) + def _send_idle_time(self, state: bool, _data: Any) -> None: + app.connections[self._account].get_module('LastActivity').set_enabled(state) + + def _send_time_info(self, state: bool, _data: Any) -> None: + app.connections[self._account].get_module('EntityTime').set_enabled(state) + + def _send_os_info(self, state: bool, _data: Any) -> None: + app.connections[self._account].get_module('SoftwareVersion').set_enabled(state) + def _publish_tune(self, state: bool, _data: Any) -> None: app.connections[self._account].get_module('UserTune').set_enabled(state) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9c5691a5c83775a997e55803db84306… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9c5691a5c83775a997e55803db84306… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ContactInfo: Fix settings layout
by Daniel Brötzmann (＠wurstsalat) 08 Mar '22

08 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f0edb10d by wurstsalat at 2022-03-08T09:01:37+01:00 ContactInfo: Fix settings layout - - - - - 457d3d26 by wurstsalat at 2022-03-08T09:01:50+01:00 GroupchatDetails: Fix settings layout - - - - - 2 changed files: - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -429,6 +429,7 @@ <object class="GtkBox" id="settings_box"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="halign">center</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -113,6 +113,7 @@ <object class="GtkBox" id="settings_box"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="halign">center</property> <property name="orientation">vertical</property> <child> <placeholder/> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/655d41cf2a5f553a9977284d01f85e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/655d41cf2a5f553a9977284d01f85e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Refactor showing new contact rows
by Philipp Hörist (＠lovetox) 06 Mar '22

06 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 655d41cf by lovetox at 2022-03-06T17:29:15+01:00 StartChat: Refactor showing new contact rows - Create the rows only once and use _filter_func() to show/hide - Fix searching for text which is not a valid JID - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -92,8 +92,8 @@ def __init__(self) -> None: # Helper for the case where we don't receive a disco info self._new_chat_row: Optional[ContactRow] = None + self._search_is_valid_jid = False - self.new_contact_row_visible = False self.new_contact_rows: dict[str, Optional[ContactRow]] = {} self._accounts = app.get_enabled_accounts_with_labels() @@ -101,6 +101,7 @@ def __init__(self) -> None: self._add_accounts() self._add_contacts(rows) self._add_groupchats(rows) + self._add_new_contact_rows(rows) self._ui.search_entry.connect( 'search-changed', self._on_search_changed) @@ -160,7 +161,6 @@ def _add_accounts(self) -> None: def _add_contacts(self, rows: list[ContactRow]): show_account = len(self._accounts) > 1 for account, _label in self._accounts: - self.new_contact_rows[account] = None client = app.get_client(account) for jid, _data in client.get_module('Roster').iter(): contact = client.get_module('Contacts').get_contact(jid) @@ -192,6 +192,13 @@ def _add_groupchats(self, rows: list[ContactRow]) -> None: show_account, groupchat=True)) + def _add_new_contact_rows(self, rows: list[ContactRow]) -> None: + for account, _ in self._accounts: + show_account = len(self._accounts) > 1 + row = ContactRow(account, None, None, None, show_account) + self.new_contact_rows[account] = row + rows.append(row) + def _load_contacts(self, rows: list[ContactRow]) -> None: for row in rows: self._ui.listbox.add(row) @@ -514,7 +521,6 @@ def _on_global_search_toggle(self, button: Gtk.ToggleButton) -> None: self._set_listbox(self._global_search_listbox) if self._ui.search_entry.get_text(): self._start_search() - self._remove_new_jid_row() self._ui.listbox.invalidate_filter() else: self._ui.filter_bar_toggle.set_sensitive(True) @@ -525,28 +531,21 @@ def _on_global_search_toggle(self, button: Gtk.ToggleButton) -> None: def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: self._show_search_entry_error(False) + self._search_is_valid_jid = False if self._global_search_active(): return search_text = search_entry.get_text() - if not search_text: - self._remove_new_jid_row() - self._ui.listbox.invalidate_filter() - return - - try: - validate_jid(search_text) - except ValueError: - self._show_search_entry_error(True) - self._remove_new_jid_row() - return - if '@' in search_text: - self._add_new_jid_row() - self._update_new_jid_rows(search_text) - else: - self._remove_new_jid_row() + try: + validate_jid(search_text) + except ValueError: + self._show_search_entry_error(True) + else: + self._update_new_contact_rows(search_text) + self._search_is_valid_jid = True + self._ui.listbox.invalidate_filter() def _show_search_entry_error(self, state: bool): @@ -558,28 +557,7 @@ def _show_search_entry_error(self, state: bool): Gtk.EntryIconPosition.SECONDARY, _('Invalid Address')) - def _add_new_jid_row(self) -> None: - if self.new_contact_row_visible: - return - for account in self.new_contact_rows: - show_account = len(self._accounts) > 1 - row = ContactRow(account, None, None, None, show_account) - self.new_contact_rows[account] = row - self._ui.listbox.add(row) - listbox = cast(Gtk.ListBox, row.get_parent()) - listbox.show_all() - self.new_contact_row_visible = True - - def _remove_new_jid_row(self) -> None: - if not self.new_contact_row_visible: - return - - for row in self.new_contact_rows.values(): - if row is not None: - row.destroy() - self.new_contact_row_visible = False - - def _update_new_jid_rows(self, search_text: str) -> None: + def _update_new_contact_rows(self, search_text: str) -> None: for row in self.new_contact_rows.values(): if row is not None: row.update_jid(JID.from_string(search_text)) @@ -620,6 +598,10 @@ def _scroll_to_first_row(self) -> None: self._ui.scrolledwindow.get_vadjustment().set_value(0) def _filter_func(self, row: ContactRow, _user_data: Any) -> bool: + if row.contact is None: + # new contact row + return self._search_is_valid_jid + search_text = self._ui.search_entry.get_text().lower() search_text_list = search_text.split() row_text = row.get_search_text().lower() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/655d41cf2a5f553a9977284d01f85e64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/655d41cf2a5f553a9977284d01f85e64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Invalidate filter when search is empty
by Philipp Hörist (＠lovetox) 06 Mar '22

06 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5b224977 by lovetox at 2022-03-06T14:33:55+01:00 StartChat: Invalidate filter when search is empty - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -532,6 +532,7 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: search_text = search_entry.get_text() if not search_text: self._remove_new_jid_row() + self._ui.listbox.invalidate_filter() return try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b224977865deca38b0bd16e518e1d8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b224977865deca38b0bd16e518e1d8b… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022