Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][muc-participant-menu] 7 commits: ci: Windows: Add libheif dependency
by Daniel Brötzmann (＠wurstsalat) 30 Sep '22

30 Sep '22

Daniel Brötzmann pushed to branch muc-participant-menu at gajim / gajim Commits: 2f4fc205 by wurstsalat at 2022-09-29T09:49:22+02:00 ci: Windows: Add libheif dependency This adds a GdkPixbuf loader for HEIF and AVIF images, see #11020 - - - - - c947c797 by wurstsalat at 2022-09-29T17:18:37+00:00 perf: Styling: Parse emojis for Darwin only - - - - - 9300b239 by wurstsalat at 2022-09-29T17:29:55+00:00 perf: SearchView: Speed up clearing of search results Fixes #11158 - - - - - caec3515 by Philipp Hörist at 2022-09-29T22:01:11+02:00 fix: StatusIcon: Reset unread state correctly when using Flatpak Fixes #11069 - - - - - 81436bee by wurstsalat at 2022-09-29T23:01:58+02:00 perf: SearchView: Update calendar only if widget is visible This avoids unnecessary database queries when switching chats - - - - - dd218cc3 by wurstsalat at 2022-09-30T17:50:21+02:00 perf: Remove queue_resize leftover from MessageTextView - - - - - c25b2f67 by wurstsalat at 2022-09-30T18:06:17+02:00 imprv: MUC: Add participant menu to avatar - - - - - 9 changed files: - gajim/common/styling.py - gajim/gtk/chat_page.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_roster.py - gajim/gtk/menus.py - gajim/gtk/search_view.py - gajim/gtk/status_icon.py - win/_base.sh Changes: ===================================== gajim/common/styling.py ===================================== @@ -18,6 +18,7 @@ from typing import Match import string +import sys import re from dataclasses import dataclass from dataclasses import field @@ -208,7 +209,11 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: for line in block.text.splitlines(keepends=True): block.spans += _parse_line(line, offset, offset_bytes) block.uris += _parse_uris(line, offset, offset_bytes) - block.emojis += _parse_emojis(line, offset) + if sys.platform == 'darwin': + # block.emojis is used for replacing emojis with Gtk.Images + # Necessary for MessageTextview (darwin) only + block.emojis += _parse_emojis(line, offset) + offset += len(line) offset_bytes += len(line.encode()) ===================================== gajim/gtk/chat_page.py ===================================== @@ -155,7 +155,10 @@ def _on_chat_selected(self, jid: JID) -> None: self._chat_stack.show_chat(account, jid) - self._search_view.set_context(account, jid) + + if self._search_revealer.get_reveal_child(): + self._search_view.set_context(account, jid) + self.emit('chat-selected', workspace_id, account, jid) def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: @@ -170,7 +173,6 @@ def _on_search_history(self, self._search_view.set_context(self._chat_control.contact.account, self._chat_control.contact.jid) - self._search_view.clear() self._search_revealer.set_reveal_child(True) self._search_view.set_focus() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -53,6 +53,7 @@ from ..message_widget import MessageWidget from ...dialogs import InputDialog from ...dialogs import DialogButton +from ...menus import get_groupchat_participant_menu from ...preview import PreviewWidget from ...util import format_fingerprint from ...util import get_cursor @@ -254,10 +255,43 @@ def _on_avatar_clicked(self, event: Gdk.EventButton, name: str ) -> int: - if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 1: - app.window.activate_action('mention', GLib.Variant('s', name)) + if event.type == Gdk.EventType.BUTTON_PRESS: + if event.button == 1: + app.window.activate_action('mention', GLib.Variant('s', name)) + elif event.button == 3: + rect = Gdk.Rectangle() + rect.x, rect.y = int(event.x), int(event.y) + rect.height, rect.width = 1, 1 + self._show_participant_menu(name, rect) + return Gdk.EVENT_STOP + def _show_participant_menu(self, nick: str, rect: Gdk.Rectangle) -> None: + assert isinstance(self._contact, GroupchatContact) + if not self._contact.is_joined: + return + + self_contact = self._contact.get_self() + assert self_contact is not None + + if nick == self_contact.name: + # Don’t show menu for us + return + + contact = self._contact.get_resource(nick) + menu = get_groupchat_participant_menu(self._contact.account, + self_contact, + contact) + + def destroy(popover: Gtk.Popover) -> None: + app.check_finalize(popover) + GLib.idle_add(popover.set_relative_to, None) + + popover = Gtk.Popover.new_from_model(self, menu) + popover.set_pointing_to(rect) + popover.connect('closed', destroy) + popover.popup() + @staticmethod def _on_realize(event_box: Gtk.EventBox) -> None: window = event_box.get_window() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -27,7 +27,6 @@ from datetime import datetime from datetime import timedelta -from gi.repository import GLib from gi.repository import Gtk from gi.repository import GObject from gi.repository import Gio @@ -499,8 +498,6 @@ def _insert_message(self, message: BaseRow) -> None: if message.timestamp > self._read_marker_row.timestamp: self._read_marker_row.hide() - GLib.idle_add(message.queue_resize) - def _add_date_row(self, timestamp: datetime) -> None: start_of_day = get_start_of_day(timestamp) if start_of_day in self._active_date_rows: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -38,7 +38,7 @@ from gajim.common.events import MUCNicknameChanged from gajim.common.modules.contacts import GroupchatContact -from .menus import get_groupchat_roster_menu +from .menus import get_groupchat_participant_menu from .tooltips import GCTooltip from .builder import get_builder from .util import EventHelper @@ -427,9 +427,9 @@ def _show_contact_menu(self, nick: str, rect: Gdk.Rectangle) -> None: self_contact = self._contact.get_self() assert self_contact is not None contact = self._contact.get_resource(nick) - menu = get_groupchat_roster_menu(self._contact.account, - self_contact, - contact) + menu = get_groupchat_participant_menu(self._contact.account, + self_contact, + contact) def destroy(popover: Gtk.Popover) -> None: app.check_finalize(popover) ===================================== gajim/gtk/menus.py ===================================== @@ -465,6 +465,10 @@ def get_groupchat_admin_menu(self_contact: types.GroupchatParticipant, menu = GajimMenu() + if contact.real_jid is None: + menu.add_item(_('Not Available'), 'dummy', None) + return menu + action = 'win.muc-change-affiliation' if is_affiliation_change_allowed(self_contact, contact, 'owner'): @@ -499,6 +503,10 @@ def get_groupchat_mod_menu(self_contact: types.GroupchatParticipant, menu = GajimMenu() + if not contact.is_available: + menu.add_item(_('Not Available'), 'dummy', None) + return menu + if is_role_change_allowed(self_contact, contact): value = f'"{contact.name}"' menu.add_item(_('Kick…'), 'win.muc-kick', value) @@ -519,10 +527,10 @@ def get_groupchat_mod_menu(self_contact: types.GroupchatParticipant, return menu -def get_groupchat_roster_menu(account: str, - self_contact: types.GroupchatParticipant, - contact: types.GroupchatParticipant - ) -> GajimMenu: +def get_groupchat_participant_menu(account: str, + self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant + ) -> GajimMenu: value = f'"{contact.name}"' ===================================== gajim/gtk/search_view.py ===================================== @@ -78,11 +78,10 @@ def __init__(self) -> None: app.ged.register_event_handler('account-disabled', ged.GUI1, self._on_account_state) - self._update_calendar() self.show_all() def _on_account_state(self, _event: Any) -> None: - self.clear() + self._clear() @staticmethod def _header_func(row: ResultRow, before: ResultRow) -> None: @@ -100,17 +99,22 @@ def _header_func(row: ResultRow, before: ResultRow) -> None: def _on_hide_clicked(self, _button: Gtk.Button) -> None: self.emit('hide-search') - self.clear() + self._clear() - def clear(self) -> None: + def _clear(self) -> None: self._ui.search_entry.set_text('') self._clear_results() def _clear_results(self) -> None: + # Unset the header_func to reduce load when clearing + self._ui.results_listbox.set_header_func(None) + for row in self._ui.results_listbox.get_children(): self._ui.results_listbox.remove(row) row.destroy() + self._ui.results_listbox.set_header_func(self._header_func) + def _on_search(self, entry: Gtk.Entry) -> None: self._clear_results() self._ui.date_hint.hide() @@ -352,6 +356,8 @@ def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: def set_focus(self) -> None: self._ui.search_entry.grab_focus() + self._clear() + self._update_calendar() def set_context(self, account: Optional[str], jid: Optional[JID]) -> None: self._account = account ===================================== gajim/gtk/status_icon.py ===================================== @@ -326,6 +326,7 @@ def update_state(self, init: bool = False) -> None: return if app.is_flatpak(): + self._status_icon.set_icon_full('org.gajim.Gajim', 'online') return show = get_global_show() ===================================== win/_base.sh ===================================== @@ -89,6 +89,7 @@ function install_deps { mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ + mingw-w64-"${ARCH}"-libheif \ mingw-w64-"${ARCH}"-sqlite3 \ mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c5f2d502a386523935ac664205446e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c5f2d502a386523935ac664205446e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Remove queue_resize leftover from MessageTextView
by Daniel Brötzmann (＠wurstsalat) 30 Sep '22

30 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dd218cc3 by wurstsalat at 2022-09-30T17:50:21+02:00 perf: Remove queue_resize leftover from MessageTextView - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -27,7 +27,6 @@ from datetime import datetime from datetime import timedelta -from gi.repository import GLib from gi.repository import Gtk from gi.repository import GObject from gi.repository import Gio @@ -499,8 +498,6 @@ def _insert_message(self, message: BaseRow) -> None: if message.timestamp > self._read_marker_row.timestamp: self._read_marker_row.hide() - GLib.idle_add(message.queue_resize) - def _add_date_row(self, timestamp: datetime) -> None: start_of_day = get_start_of_day(timestamp) if start_of_day in self._active_date_rows: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd218cc3e5eed3db8d56d74e7e087d61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd218cc3e5eed3db8d56d74e7e087d61… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: SearchView: Update calendar only if widget is visible
by Daniel Brötzmann (＠wurstsalat) 29 Sep '22

29 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 81436bee by wurstsalat at 2022-09-29T23:01:58+02:00 perf: SearchView: Update calendar only if widget is visible This avoids unnecessary database queries when switching chats - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -155,7 +155,10 @@ def _on_chat_selected(self, jid: JID) -> None: self._chat_stack.show_chat(account, jid) - self._search_view.set_context(account, jid) + + if self._search_revealer.get_reveal_child(): + self._search_view.set_context(account, jid) + self.emit('chat-selected', workspace_id, account, jid) def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: @@ -170,7 +173,6 @@ def _on_search_history(self, self._search_view.set_context(self._chat_control.contact.account, self._chat_control.contact.jid) - self._search_view.clear() self._search_revealer.set_reveal_child(True) self._search_view.set_focus() ===================================== gajim/gtk/search_view.py ===================================== @@ -78,11 +78,10 @@ def __init__(self) -> None: app.ged.register_event_handler('account-disabled', ged.GUI1, self._on_account_state) - self._update_calendar() self.show_all() def _on_account_state(self, _event: Any) -> None: - self.clear() + self._clear() @staticmethod def _header_func(row: ResultRow, before: ResultRow) -> None: @@ -100,9 +99,9 @@ def _header_func(row: ResultRow, before: ResultRow) -> None: def _on_hide_clicked(self, _button: Gtk.Button) -> None: self.emit('hide-search') - self.clear() + self._clear() - def clear(self) -> None: + def _clear(self) -> None: self._ui.search_entry.set_text('') self._clear_results() @@ -357,6 +356,8 @@ def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: def set_focus(self) -> None: self._ui.search_entry.grab_focus() + self._clear() + self._update_calendar() def set_context(self, account: Optional[str], jid: Optional[JID]) -> None: self._account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/81436bee717700bab968dc27f1ab6193… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/81436bee717700bab968dc27f1ab6193… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: StatusIcon: Reset unread state correctly when using Flatpak
by Philipp Hörist (＠lovetox) 29 Sep '22

29 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: caec3515 by Philipp Hörist at 2022-09-29T22:01:11+02:00 fix: StatusIcon: Reset unread state correctly when using Flatpak Fixes #11069 - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -326,6 +326,7 @@ def update_state(self, init: bool = False) -> None: return if app.is_flatpak(): + self._status_icon.set_icon_full('org.gajim.Gajim', 'online') return show = get_global_show() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/caec3515b229d5f8754694994f8dbeaa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/caec3515b229d5f8754694994f8dbeaa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch search-view-header-func
by Daniel Brötzmann (＠wurstsalat) 29 Sep '22

29 Sep '22

Daniel Brötzmann deleted branch search-view-header-func at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: SearchView: Speed up clearing of search results
by Philipp Hörist (＠lovetox) 29 Sep '22

29 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9300b239 by wurstsalat at 2022-09-29T17:29:55+00:00 perf: SearchView: Speed up clearing of search results Fixes #11158 - - - - - 1 changed file: - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/search_view.py ===================================== @@ -107,10 +107,15 @@ def clear(self) -> None: self._clear_results() def _clear_results(self) -> None: + # Unset the header_func to reduce load when clearing + self._ui.results_listbox.set_header_func(None) + for row in self._ui.results_listbox.get_children(): self._ui.results_listbox.remove(row) row.destroy() + self._ui.results_listbox.set_header_func(self._header_func) + def _on_search(self, entry: Gtk.Entry) -> None: self._clear_results() self._ui.date_hint.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9300b23922fd170e8ee759c690c4b992… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9300b23922fd170e8ee759c690c4b992… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][search-view-header-func] 3 commits: ci: Windows: Add libheif dependency
by Philipp Hörist (＠lovetox) 29 Sep '22

29 Sep '22

Philipp Hörist pushed to branch search-view-header-func at gajim / gajim Commits: 2f4fc205 by wurstsalat at 2022-09-29T09:49:22+02:00 ci: Windows: Add libheif dependency This adds a GdkPixbuf loader for HEIF and AVIF images, see #11020 - - - - - c947c797 by wurstsalat at 2022-09-29T17:18:37+00:00 perf: Styling: Parse emojis for Darwin only - - - - - 9300b239 by wurstsalat at 2022-09-29T17:29:55+00:00 perf: SearchView: Speed up clearing of search results Fixes #11158 - - - - - 3 changed files: - gajim/common/styling.py - gajim/gtk/search_view.py - win/_base.sh Changes: ===================================== gajim/common/styling.py ===================================== @@ -18,6 +18,7 @@ from typing import Match import string +import sys import re from dataclasses import dataclass from dataclasses import field @@ -208,7 +209,11 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: for line in block.text.splitlines(keepends=True): block.spans += _parse_line(line, offset, offset_bytes) block.uris += _parse_uris(line, offset, offset_bytes) - block.emojis += _parse_emojis(line, offset) + if sys.platform == 'darwin': + # block.emojis is used for replacing emojis with Gtk.Images + # Necessary for MessageTextview (darwin) only + block.emojis += _parse_emojis(line, offset) + offset += len(line) offset_bytes += len(line.encode()) ===================================== gajim/gtk/search_view.py ===================================== @@ -107,10 +107,15 @@ def clear(self) -> None: self._clear_results() def _clear_results(self) -> None: + # Unset the header_func to reduce load when clearing + self._ui.results_listbox.set_header_func(None) + for row in self._ui.results_listbox.get_children(): self._ui.results_listbox.remove(row) row.destroy() + self._ui.results_listbox.set_header_func(self._header_func) + def _on_search(self, entry: Gtk.Entry) -> None: self._clear_results() self._ui.date_hint.hide() ===================================== win/_base.sh ===================================== @@ -89,6 +89,7 @@ function install_deps { mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ + mingw-w64-"${ARCH}"-libheif \ mingw-w64-"${ARCH}"-sqlite3 \ mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a8ead3cc33f51fb0b8b4c6ee1982878… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a8ead3cc33f51fb0b8b4c6ee1982878… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch emoji-parsing-darwin
by Daniel Brötzmann (＠wurstsalat) 29 Sep '22

29 Sep '22

Daniel Brötzmann deleted branch emoji-parsing-darwin at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Styling: Parse emojis for Darwin only
by Philipp Hörist (＠lovetox) 29 Sep '22

29 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c947c797 by wurstsalat at 2022-09-29T17:18:37+00:00 perf: Styling: Parse emojis for Darwin only - - - - - 1 changed file: - gajim/common/styling.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -18,6 +18,7 @@ from typing import Match import string +import sys import re from dataclasses import dataclass from dataclasses import field @@ -208,7 +209,11 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: for line in block.text.splitlines(keepends=True): block.spans += _parse_line(line, offset, offset_bytes) block.uris += _parse_uris(line, offset, offset_bytes) - block.emojis += _parse_emojis(line, offset) + if sys.platform == 'darwin': + # block.emojis is used for replacing emojis with Gtk.Images + # Necessary for MessageTextview (darwin) only + block.emojis += _parse_emojis(line, offset) + offset += len(line) offset_bytes += len(line.encode()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c947c797637a648d22cef70f9f08c912… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c947c797637a648d22cef70f9f08c912… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][emoji-parsing-darwin] 2 commits: ci: Windows: Add libheif dependency
by Philipp Hörist (＠lovetox) 29 Sep '22

29 Sep '22

Philipp Hörist pushed to branch emoji-parsing-darwin at gajim / gajim Commits: 2f4fc205 by wurstsalat at 2022-09-29T09:49:22+02:00 ci: Windows: Add libheif dependency This adds a GdkPixbuf loader for HEIF and AVIF images, see #11020 - - - - - c947c797 by wurstsalat at 2022-09-29T17:18:37+00:00 perf: Styling: Parse emojis for Darwin only - - - - - 2 changed files: - gajim/common/styling.py - win/_base.sh Changes: ===================================== gajim/common/styling.py ===================================== @@ -18,6 +18,7 @@ from typing import Match import string +import sys import re from dataclasses import dataclass from dataclasses import field @@ -208,7 +209,11 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: for line in block.text.splitlines(keepends=True): block.spans += _parse_line(line, offset, offset_bytes) block.uris += _parse_uris(line, offset, offset_bytes) - block.emojis += _parse_emojis(line, offset) + if sys.platform == 'darwin': + # block.emojis is used for replacing emojis with Gtk.Images + # Necessary for MessageTextview (darwin) only + block.emojis += _parse_emojis(line, offset) + offset += len(line) offset_bytes += len(line.encode()) ===================================== win/_base.sh ===================================== @@ -89,6 +89,7 @@ function install_deps { mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ + mingw-w64-"${ARCH}"-libheif \ mingw-w64-"${ARCH}"-sqlite3 \ mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71010ae347ae2e70016c13733dc54c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71010ae347ae2e70016c13733dc54c7… 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