Commits December 2021

commits@gajim.org

1 participants
197 discussions

[Git][gajim/gajim][master] 2 commits: WorkspaceSidebar: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Dec '21

26 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dcf0ed9f by wurstsalat at 2021-12-26T17:44:55+01:00 WorkspaceSidebar: Typing - - - - - 0f72a7d2 by wurstsalat at 2021-12-26T17:57:07+01:00 ResourceSelector: Typing - - - - - 2 changed files: - gajim/gtk/resource_selector.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/resource_selector.py ===================================== @@ -12,7 +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 List +from __future__ import annotations from typing import Optional from typing import Tuple @@ -27,6 +27,7 @@ from nbxmpp.structs import DiscoInfo from gajim.common import app +from gajim.common import types from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import ResourceContact @@ -43,8 +44,9 @@ class ResourceSelector(Gtk.ScrolledWindow): (bool, )), } - def __init__(self, contact: BareContact, - constraints: List[_Namespaces] = None) -> None: + def __init__(self, + contact: BareContact, + constraints: Optional[list[_Namespaces]] = None) -> None: Gtk.ScrolledWindow.__init__(self) self.set_shadow_type(Gtk.ShadowType.IN) self.set_size_request(-1, 200) @@ -68,11 +70,14 @@ def __init__(self, contact: BareContact, self.show_all() @staticmethod - def _sort_func(row1, row2): + def _sort_func(row1: ResourceRow, row2: ResourceRow) -> int: return locale.strcoll( row1.device_text.lower(), row2.device_text.lower()) - def _on_row_selected(self, _listbox, row): + def _on_row_selected(self, + _listbox: Gtk.ListBox, + row: ResourceRow + ) -> None: state = bool(row is not None) self.emit('selection-changed', state) @@ -92,7 +97,10 @@ def _add_entries(self) -> None: for resource in self._contact.iter_resources(): self._listbox.add(ResourceRow(resource, self._constraints)) - def _on_update(self, _contact, _signal_name): + def _on_update(self, + _contact: types.ResourceContact, + _signal_name: str + ) -> None: for child in self._listbox.get_children(): self._listbox.remove(child) self._add_entries() @@ -102,15 +110,17 @@ def get_jid(self) -> JID: class ResourceRow(Gtk.ListBoxRow): - def __init__(self, resource_contact: ResourceContact, - constraints: List[_Namespaces]) -> None: + def __init__(self, + resource_contact: ResourceContact, + constraints: list[_Namespaces] + ) -> None: Gtk.ListBoxRow.__init__(self) self.jid = resource_contact.jid icon_name = 'computer-symbolic' tooltip_text = _('Computer') - self.device_text = resource_contact.jid.resource + self.device_text = resource_contact.jid.resource or '' disco_info = app.storage.cache.get_last_disco_info( resource_contact.jid) @@ -135,7 +145,7 @@ def __init__(self, resource_contact: ResourceContact, box.add(name_label) for constraint in constraints: - if not resource_contact.supports(constraint): + if not resource_contact.supports(str(constraint)): self.set_sensitive(False) self.set_tooltip_text(_('This devices is not compatible.')) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -17,6 +17,7 @@ from typing import Any from typing import List from typing import Optional +from typing import Union import logging @@ -60,8 +61,8 @@ def __init__(self, chat_page: ChatPage) -> None: Gdk.DragAction.MOVE) self.drag_row: Optional[Workspace] = None - self.row_before = None - self.row_after = None + self.row_before: Optional[Workspace] = None + self.row_after: Union[Workspace, AddWorkspace, None] = None self.connect('drag-motion', self._on_drag_motion) self.connect('drag-data-received', self._on_drag_data_received) @@ -74,7 +75,7 @@ def __init__(self, chat_page: ChatPage) -> None: self._on_unread_count_changed) chat_list_stack.connect('chat-selected', self._on_chat_selected) - self._workspaces = {} + self._workspaces: dict[str, Workspace] = {} def _on_drag_motion(self, _widget: Gtk.Widget, @@ -82,7 +83,7 @@ def _on_drag_motion(self, _x_coord: int, y_coord: int, _time: int - ) -> None: + ) -> bool: row = self.get_row_at_y(y_coord) if row: @@ -172,11 +173,16 @@ def _on_unread_count_changed(self, workspace = self._workspaces[workspace_id] workspace.set_unread_count(count) - def _on_chat_selected(self, _chat_list_stack, workspace_id, *args): + def _on_chat_selected(self, + _chat_list_stack: ChatListStack, + workspace_id: str, + *args: Any) -> None: self.activate_workspace(workspace_id) @staticmethod - def _on_row_activated(_listbox, row): + def _on_row_activated(_listbox: Gtk.ListBox, + row: Union[Workspace, AddWorkspace] + ) -> None: if row.workspace_id == 'add': open_window('WorkspaceDialog') else: @@ -208,7 +214,7 @@ def activate_workspace(self, workspace_id: str) -> None: row = self._workspaces[workspace_id] self.select_row(row) - def get_active_workspace(self) -> str: + def get_active_workspace(self) -> Optional[str]: row = self.get_selected_row() if row is None: return None @@ -230,7 +236,7 @@ def update_avatar(self, workspace_id: str) -> None: class CommonWorkspace(Gtk.ListBoxRow): - def __init__(self, workspace_id): + def __init__(self, workspace_id: str) -> None: Gtk.ListBoxRow.__init__(self) self.workspace_id = workspace_id View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f03998805709844034b4065f3145b27… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f03998805709844034b4065f3145b27… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f0399880 by lovetox at 2021-12-26T14:52:05+01:00 Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -15,6 +15,8 @@ "include": [ "gajim/gtk/chat_filter.py", "gajim/gtk/app_side_bar.py", + "gajim/gtk/status_selector.py", + "gajim/gtk/status_message_selector.py", "gajim/common/cert_store.py" ], } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f03998805709844034b4065f3145b27e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f03998805709844034b4065f3145b27e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Tooltips: Add type annotations
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: d1005551 by lovetox at 2021-12-26T14:47:25+01:00 Tooltips: Add type annotations - - - - - 1218e6e4 by lovetox at 2021-12-26T14:47:25+01:00 Structs: Add type annotations - - - - - b95664f4 by lovetox at 2021-12-26T14:47:25+01:00 Contacts: Add type annotations - - - - - 8a2bccca by lovetox at 2021-12-26T14:47:25+01:00 Controls: Remove unused code - - - - - 91bbd15f by lovetox at 2021-12-26T14:47:25+01:00 GroupchatRoster: Refactor - Add type annotations - Refactor code so it works better with typing - Remove unused methods - - - - - 1710897f by lovetox at 2021-12-26T14:47:25+01:00 Update pylint tests - Disable checks which we cover with pyright - - - - - 8 changed files: - gajim/common/modules/contacts.py - gajim/common/structs.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - gajim/gtk/groupchat_roster.py - gajim/gtk/tooltips.py - pylintrc - scripts/ci/pylint.sh Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -31,6 +31,7 @@ from gajim.common.const import SimpleClientState from gajim.common.structs import UNKNOWN_PRESENCE from gajim.common.structs import UNKNOWN_MUC_PRESENCE +from gajim.common.structs import MUCPresenceData from gajim.common.helpers import Observable from gajim.common.modules.base import BaseModule from gajim.common.helpers import get_groupchat_name @@ -573,10 +574,10 @@ def is_in_roster(self) -> bool: return False @property - def presence(self): + def presence(self) -> MUCPresenceData: return self._presence - def set_presence(self, presence): + def set_presence(self, presence: MUCPresenceData) -> None: self._presence = presence @property @@ -631,7 +632,10 @@ def get_avatar(self, return app.interface.avatar_storage.get_surface( self, size, scale, show, style=style) - def update_presence(self, presence, *args, notify: bool = True) -> None: + def update_presence(self, + presence: MUCPresenceData, + *args: Any, + notify: bool = True) -> None: if not notify: self._presence = presence return @@ -661,7 +665,7 @@ def update_presence(self, presence, *args, notify: bool = True) -> None: for signal in signals: self.notify(signal, *args) - def set_state(self, state, presence) -> None: + def set_state(self, state, presence: MUCPresenceData) -> None: self._presence = presence self.notify(state) ===================================== gajim/common/structs.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp.protocol import JID from nbxmpp.const import Role from nbxmpp.const import Affiliation +from nbxmpp.const import PresenceShow from gajim.common.const import MUCJoinedState from gajim.common.const import KindConstant @@ -207,13 +208,13 @@ def from_presence(cls, properties): @dataclass(frozen=True) class MUCPresenceData: - show: str + show: PresenceShow status: str - idle_time: str + idle_time: Optional[float] available: bool - affiliation: str - role: str - real_jid: JID + affiliation: Affiliation + role: Role + real_jid: Optional[JID] @classmethod def from_presence(cls, properties): ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -703,9 +703,6 @@ def draw_banner_text(self) -> None: """ self.xml.banner_name_label.set_text(self.contact.name) - def _on_update_gc_avatar(self, event): - self.roster.process_avatar_update(event) - def _on_bookmarks_received(self, _event): self.draw_banner_text() ===================================== gajim/gtk/controls/private.py ===================================== @@ -52,9 +52,6 @@ def __init__(self, account: str, jid: JID) -> None: ChatControl.__init__(self, account, jid) - # self.register_events([ - # ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), - def _connect_contact_signals(self) -> None: self.contact.multi_connect({ 'user-avatar-update': self._on_user_avatar_update, ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -13,10 +13,10 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations + from typing import Any -from typing import cast from typing import Optional -from typing import Tuple +from typing import cast import locale from enum import IntEnum @@ -26,7 +26,6 @@ from gi.repository import GLib from gi.repository import GObject from nbxmpp.const import Affiliation -from nbxmpp.const import Role from nbxmpp.structs import MessageProperties from gajim.common import app @@ -37,6 +36,7 @@ from gajim.common.helpers import jid_is_blocked from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from gajim.common.nec import NetworkEvent from gajim.gui_menu_builder import get_groupchat_roster_menu from .tooltips import GCTooltip @@ -84,9 +84,8 @@ def __init__(self, self.room_jid = room_jid self._control = control self._control_id = control.control_id - self._show_roles = True self._tooltip = GCTooltip() - self._group_chat_contact = control.contact + self._group_chat_contact = cast(types.GroupchatContact, control.contact) self._group_chat_contact.connect( 'user-avatar-update', self._on_user_avatar_update) self._group_chat_contact.connect('user-joined', self._on_user_joined) @@ -99,22 +98,18 @@ def __init__(self, 'user-status-show-changed', self._on_user_status_show_changed) self._group_chat_contact.connect( 'user-nickname-changed', self._on_user_nickname_changed) - # self._group_chat_contact.connect('muc-user-presence-update', - # self._on_muc_user_presence_update) self._ui = get_builder('groupchat_roster.ui') self._ui.roster_treeview.set_model(None) self.add(self._ui.roster_treeview) - # Holds the Gtk.TreeRowReference for each contact self._contact_refs: dict[str, Gtk.TreeRowReference] = {} - # Holds the Gtk.TreeRowReference for each group self._group_refs: dict[str, Gtk.TreeRowReference] = {} - self._store = cast(Gtk.TreeStore, self._ui.participant_store) + self._store = self._ui.participant_store self._store.set_sort_func(Column.TEXT, self._tree_compare_iters) - self._roster = cast(Gtk.TreeView, self._ui.roster_treeview) + self._roster = self._ui.roster_treeview self._roster.set_search_equal_func(self._search_func) self._roster.set_has_tooltip(True) self._roster.connect('query-tooltip', self._query_tooltip) @@ -135,12 +130,9 @@ def __init__(self, def _on_focus_out(treeview: Gtk.TreeView, _param: Gdk.EventFocus) -> None: treeview.get_selection().unselect_all() - def set_model(self) -> None: + def _set_model(self) -> None: self._roster.set_model(self._store) - def set_show_roles(self, enabled: bool) -> None: - self._show_roles = enabled - def _query_tooltip(self, widget: Gtk.Widget, x_pos: int, @@ -148,18 +140,20 @@ def _query_tooltip(self, _keyboard_mode: bool, tooltip: Gtk.Tooltip ) -> bool: - try: - row = self._roster.get_path_at_pos(x_pos, y_pos)[0] - except TypeError: + + row = self._roster.get_path_at_pos(x_pos, y_pos) + if row is None: self._tooltip.clear_tooltip() return False - if not row: + + path, _, _, _ = row + if path is None: self._tooltip.clear_tooltip() return False iter_ = None try: - iter_ = self._store.get_iter(row) + iter_ = self._store.get_iter(path) except Exception: self._tooltip.clear_tooltip() return False @@ -223,7 +217,7 @@ def _add_contact(self, contact: types.GroupchatParticipant) -> None: role_path = None if not group_iter: group_iter = self._store.append( - None, (None, group_text, None, False, group_name)) + None, [None, group_text, None, False, group_name]) role_path = self._store.get_path(group_iter) group_ref = Gtk.TreeRowReference(self._store, role_path) self._group_refs[group_name] = group_ref @@ -233,12 +227,12 @@ def _add_contact(self, contact: types.GroupchatParticipant) -> None: self.get_scale_factor()) iter_ = self._store.append(group_iter, - (surface, nick, None, True, nick)) + [surface, nick, None, True, nick]) self._contact_refs[nick] = Gtk.TreeRowReference( self._store, self._store.get_path(iter_)) - self.draw_groups() - self.draw_contact(nick) + self._draw_groups() + self._draw_contact(nick) if (role_path is not None and self._roster.get_model() is not None): @@ -251,7 +245,7 @@ def _on_user_left(self, *args: Any ) -> None: self._remove_contact(user_contact) - self.draw_groups() + self._draw_groups() def _update_contact(self, _contact: types.GroupchatContact, @@ -279,7 +273,7 @@ def _on_user_status_show_changed(self, user_contact: types.GroupchatParticipant, *args: Any ) -> None: - self.draw_contact(user_contact.name) + self._draw_contact(user_contact.name) def _remove_contact(self, contact: types.GroupchatParticipant) -> None: nick = contact.name @@ -300,7 +294,7 @@ def _remove_contact(self, contact: types.GroupchatParticipant) -> None: @staticmethod def _get_group_from_contact(contact: types.GroupchatParticipant - ) -> Tuple[str, str]: + ) -> tuple[str, str]: if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): return contact.affiliation.value, get_uf_affiliation( contact.affiliation, plural=True) @@ -357,6 +351,9 @@ def _on_roster_button_press_event(self, return path, _, _, _ = pos + if path is None: + return + iter_ = self._store.get_iter(path) if self._store.iter_parent(iter_) is None: # Group row @@ -380,7 +377,7 @@ def _show_contact_menu(self, nick: str) -> None: self_contact, contact) - def destroy(menu, _pspec): + def destroy(menu: Gtk.Menu, _pspec: GObject.ParamSpec) -> None: visible = menu.get_property('visible') if not visible: GLib.idle_add(menu.destroy) @@ -438,22 +435,22 @@ def invalidate_sort(self) -> None: def initial_draw(self) -> None: self.enable_sort(True) - self.set_model() + self._set_model() self._roster.expand_all() - def redraw(self) -> None: + def _redraw(self) -> None: self._roster.set_model(None) self._roster.set_model(self._store) self._roster.expand_all() - def draw_contact(self, nick: str) -> None: + def _draw_contact(self, nick: str) -> None: iter_ = self._get_contact_iter(nick) if not iter_: return contact = self._group_chat_contact.get_resource(nick) - self.draw_avatar(contact) + self._draw_avatar(contact) self._store[iter_][Column.EVENT] = False @@ -480,9 +477,13 @@ def draw_contact(self, nick: str) -> None: def draw_contacts(self) -> None: for nick in self._contact_refs: - self.draw_contact(nick) + self._draw_contact(nick) + + def _draw_groups(self) -> None: + for group in self._group_refs: + self._draw_group(group) - def draw_group(self, group: str) -> None: + def _draw_group(self, group: str) -> None: group_iter = self._get_group_iter(group) if not group_iter: return @@ -499,11 +500,7 @@ def draw_group(self, group: str) -> None: self._store[group_iter][Column.TEXT] = group_text - def draw_groups(self) -> None: - for group in self._group_refs: - self.draw_group(group) - - def draw_avatar(self, contact: types.GroupchatParticipant) -> None: + def _draw_avatar(self, contact: types.GroupchatParticipant) -> None: iter_ = self._get_contact_iter(contact.name) if iter_ is None: return @@ -512,8 +509,11 @@ def draw_avatar(self, contact: types.GroupchatParticipant) -> None: self.get_scale_factor()) self._store[iter_][Column.AVATAR] = surface - def _on_user_avatar_update(self, _contact, _signal_name, user_contact): - self.draw_avatar(user_contact) + def _on_user_avatar_update(self, + _contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant): + self._draw_avatar(user_contact) def _get_total_user_count(self) -> int: count = 0 @@ -521,15 +521,8 @@ def _get_total_user_count(self) -> int: count += self._store.iter_n_children(group_row.iter) return count - def get_role(self, nick: str) -> Role: - contact = self._group_chat_contact.get_resource(nick) - return contact.role - - def _on_theme_update(self, _event): - self.redraw() - - def process_avatar_update(self, event): - self.draw_avatar(event.contact) + def _on_theme_update(self, _event: NetworkEvent) -> None: + self._redraw() def clear(self) -> None: self._contact_refs = {} @@ -538,16 +531,15 @@ def clear(self) -> None: def _on_destroy(self, _roster: Any) -> None: self._group_chat_contact.disconnect(self) - self._contact_refs = {} self._group_refs = {} - self._control = None self._roster.set_model(None) - self._roster = None self._store.clear() # Store keeps a ref on the object if we dont unset the sort func self._store.set_sort_func(Column.TEXT, print) - self._store = None self._tooltip.destroy() - self._tooltip = None + del self._roster + del self._store + del self._control + del self._tooltip app.check_finalize(self) ===================================== gajim/gtk/tooltips.py ===================================== @@ -35,7 +35,7 @@ from nbxmpp import JID -from gajim.common import app +from gajim.common import app, types from gajim.common import helpers from gajim.common.const import AvatarSize from gajim.common.const import PEPEventType @@ -51,15 +51,18 @@ class GCTooltip: - def __init__(self): + def __init__(self) -> None: self._contact = None self._ui = get_builder('groupchat_roster_tooltip.ui') - def clear_tooltip(self): + def clear_tooltip(self) -> None: self._contact = None - def get_tooltip(self, contact): + def get_tooltip(self, + contact: types.GroupchatParticipant + ) -> tuple[bool, Gtk.Grid]: + if self._contact == contact: return True, self._ui.tooltip_grid @@ -67,14 +70,14 @@ def get_tooltip(self, contact): self._contact = contact return False, self._ui.tooltip_grid - def _hide_grid_children(self): + def _hide_grid_children(self) -> None: """ Hide all Elements of the Tooltip Grid """ for child in self._ui.tooltip_grid.get_children(): child.hide() - def _populate_grid(self, contact): + def _populate_grid(self, contact: types.GroupchatParticipant) -> None: """ Populate the Tooltip Grid with data of from the contact """ @@ -119,18 +122,20 @@ def destroy(self): class RosterTooltip: - def __init__(self): + def __init__(self) -> None: self._row = None self._ui = get_builder('roster_tooltip.ui') - def clear_tooltip(self): + def clear_tooltip(self) -> None: self._row = None for widget in self._ui.resources_box.get_children(): widget.destroy() for widget in self._ui.tooltip_grid.get_children(): widget.hide() - def get_tooltip(self, row, contact): + def get_tooltip(self, + row: Gtk.TreePath, + contact: types.BareContact) -> tuple[bool, Gtk.Grid]: if self._row == row: return True, self._ui.tooltip_grid @@ -138,7 +143,7 @@ def get_tooltip(self, row, contact): self._row = row return False, self._ui.tooltip_grid - def _populate_grid(self, contact): + def _populate_grid(self, contact: types.BareContact) -> None: self.clear_tooltip() scale = self._ui.tooltip_grid.get_scale_factor() @@ -184,7 +189,7 @@ def _populate_grid(self, contact): break last_widget.set_vexpand(True) - def _add_resources(self, contact): + def _add_resources(self, contact: types.BareContact) -> None: for resource in contact.iter_resources(): resource_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) @@ -241,7 +246,7 @@ def _add_resources(self, contact): self._ui.resources_box.show_all() - def _append_pep_info(self, contact): + def _append_pep_info(self, contact: types.BareContact) -> None: if PEPEventType.TUNE in contact.pep: tune = format_tune(*contact.pep[PEPEventType.TUNE]) self._ui.tune.set_markup(tune) @@ -256,7 +261,7 @@ def _append_pep_info(self, contact): class FileTransfersTooltip: - def __init__(self): + def __init__(self) -> None: self.sid = None self.widget = None if app.settings.get('use_kib_mib'): @@ -264,11 +269,11 @@ def __init__(self): else: self.units = GLib.FormatSizeFlags.DEFAULT - def clear_tooltip(self): + def clear_tooltip(self) -> None: self.sid = None self.widget = None - def get_tooltip(self, file_props, sid): + def get_tooltip(self, file_props, sid) -> tuple[bool, Gtk.Widget]: if self.sid == sid: return True, self.widget @@ -276,7 +281,7 @@ def get_tooltip(self, file_props, sid): self.sid = sid return False, self.widget - def _create_tooltip(self, file_props, _sid): + def _create_tooltip(self, file_props, _sid) -> None: ft_grid = Gtk.Grid.new() ft_grid.insert_column(0) ft_grid.set_row_spacing(6) @@ -336,7 +341,7 @@ def _create_tooltip(self, file_props, _sid): return ft_grid @staticmethod - def _get_current_status(file_props): + def _get_current_status(file_props) -> None: if file_props.stopped: return Q_('?transfer status:Aborted') if file_props.completed: ===================================== pylintrc ===================================== @@ -50,9 +50,12 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" +# +# Most errors here are disabled because they are covered by pyright # C0111 missing-docstring # W0511 fix-me -disable=C0111,W0511 +# +disable=C0111,W0511,E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1136,E1137,E1138,E1139,E1140,E1141,E1142,I1101,W0212,W1113,W1114,W1115,W1116 # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option ===================================== scripts/ci/pylint.sh ===================================== @@ -5,18 +5,54 @@ set -e PYLINT=${PYLINT:-pylint} +# Errors which are covered by pyright +# +# E1101 no-member +# E1102 not-callable +# E1111 assignment-from-no-return +# E1120 no-value-for-parameter +# E1121 too-many-function-args +# E1123 unexpected-keyword-arg +# E1124 redundant-keyword-arg +# E1125 missing-kwoa +# E1126 invalid-sequence-index +# E1127 invalid-slice-index +# E1128 assignment-from-none +# E1129 not-context-manager +# E1130 invalid-unary-operand-type +# E1131 unsupported-binary-operation +# E1132 repeated-keyword +# E1133 not-an-iterable +# E1134 not-a-mapping +# E1135 unsupported-membership-test +# E1136 unsubscriptable-object +# E1137 unsupported-assignment-operation +# E1138 unsupported-delete-operation +# E1139 invalid-metaclass +# E1140 unhashable-dict-key +# E1141 dict-iter-missing-items +# E1142 await-outside-async +# I1101 c-extension-no-member +# W0212 protected-access +# W1113 keyword-arg-before-vararg +# W1114 arguments-out-of-order +# W1115 non-str-assignment-to-dunder-name +# W1116 isinstance-second-argument-not-valid-type + +IGNORE_PYRIGHT='E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1136,E1137,E1138,E1139,E1140,E1141,E1142,I1101,W0212,W1113,W1114,W1115,W1116' + IGNORE_ALWAYS='R0801,C0209,W0237,W0707,R1732,W1404,W1406,R1725' -IGNORE_ERRORS=C0103,C0302,C0301,C0330,C0411,C0415,E0401,E0611,E1101,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 +IGNORE_ERRORS=C0103,C0302,C0301,C0330,C0411,C0415,E0401,E0611,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0221,W0223,W0231,W0233,W0603,W0613 -IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R0201,R0904,R0915,R1710,W0201,W0212,W0233,W0221,W0613 +IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,R0201,R0904,R0915,R1710,W0201,W0233,W0221,W0613 "$PYLINT" --version -"$PYLINT" --disable="$IGNORE_ALWAYS,$IGNORE_ERRORS" --ignore=modules,dbus,gtk "$@" -"$PYLINT" --disable="$IGNORE_ALWAYS,$IGNORE_GTK_MODULE_ERRORS" "$@/gtk" -"$PYLINT" --disable="$IGNORE_ALWAYS,E0401,C0415" "$@/common/modules" -"$PYLINT" --disable=$IGNORE_ALWAYS "$@/common/dbus" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_ERRORS" --ignore=modules,dbus,gtk "$@" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_GTK_MODULE_ERRORS" "$@/gtk" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,E0401,C0415" "$@/common/modules" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS" "$@/common/dbus" # C0103 invalid-name # C0209 use-f-string @@ -26,9 +62,6 @@ IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R # C0415 import-outside-toplevel # E0401 import-error # E0611 no-name-in-module -# E1101 no-member -# E1133 not-an-iterable -# E1136 unsubscriptable-object # R0201 no-self-use # R0801 duplicat-code # R0901 too-many-ancestors @@ -43,7 +76,6 @@ IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R # R1732 consider-using-with # R1725 super-with-arguments # W0201 attribute-defined-outside-init -# W0212 protected-access # W0221 arguments-differ # W0223 abstract-method # W0231 super-init-not-called View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/47d66504f3aafaa02e9039f279712a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/47d66504f3aafaa02e9039f279712a2… You're receiving this email because of your account on dev.gajim.org.

1 0

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

26 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 47d66504 by wurstsalat at 2021-12-26T01:11:03+01:00 AudioPreview: Typing - - - - - 1 changed file: - gajim/gtk/preview_audio.py Changes: ===================================== gajim/gtk/preview_audio.py ===================================== @@ -115,13 +115,13 @@ def _on_seek(self, value: float ) -> bool: self._playbin.seek_simple( - Gst.Format.TIME, Gst.SeekFlags.FLUSH, value) + Gst.Format.TIME, Gst.SeekFlags.FLUSH, int(value)) return False def _on_play_clicked(self, _button: Gtk.Button) -> None: self._set_pause(not self._get_paused()) - def _on_destroy(self, _widget): + def _on_destroy(self, _widget: Gtk.Widget) -> None: self._playbin.set_state(Gst.State.NULL) def _get_paused(self) -> bool: @@ -147,7 +147,8 @@ def _update_seek_bar(self) -> bool: if self._playbin.query(self._query): _fmt, cur_pos = self._query.parse_position() - self._seek_bar.set_value(cur_pos) + if cur_pos is not None: + self._seek_bar.set_value(cur_pos) return True @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47d66504f3aafaa02e9039f279712a2a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47d66504f3aafaa02e9039f279712a2a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusMessageSelector: Typing
by Daniel Brötzmann (＠wurstsalat) 25 Dec '21

25 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f22d5b5d by wurstsalat at 2021-12-25T21:49:08+01:00 StatusMessageSelector: Typing - - - - - 2 changed files: - gajim/common/client.py - gajim/gtk/status_message_selector.py Changes: ===================================== gajim/common/client.py ===================================== @@ -361,7 +361,7 @@ def get_own_jid(self) -> JID: # This returns the bare jid return nbxmpp.JID.from_string(app.get_jid_from_account(self._account)) - def change_status(self, show, message): + def change_status(self, show: str, message: str) -> None: if not message: message = '' ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -12,6 +12,9 @@ # 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 + from gi.repository import Gtk from gajim.common import app @@ -22,7 +25,7 @@ class StatusMessageSelector(Gtk.Box): - def __init__(self, account=None): + def __init__(self, account: Optional[str] = None) -> None: Gtk.Box.__init__(self) self.get_style_context().add_class('linked') self._account = account @@ -43,10 +46,10 @@ def __init__(self, account=None): self.show_all() app.ged.register_event_handler('our-show', ged.POSTGUI, self.update) - def _on_changed(self, _entry): + def _on_changed(self, _entry: Gtk.Entry) -> None: self._button.set_sensitive(True) - def _set_status_message(self, *args): + def _set_status_message(self, *args: Any) -> None: self._button.set_sensitive(False) message = self._entry.get_text() message = to_one_line(message) @@ -61,7 +64,7 @@ def _set_status_message(self, *args): client = app.get_client(account) client.change_status(client.status, message) - def update(self, *args): + def update(self, *args: Any) -> None: if self._account is None: message = get_global_status_message() else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f22d5b5df2761a8c6745ee7bdf40153f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f22d5b5df2761a8c6745ee7bdf40153f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preview: Improve simple mime type helper
by Daniel Brötzmann (＠wurstsalat) 25 Dec '21

25 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 02798e7d by wurstsalat at 2021-12-25T12:30:48+01:00 Preview: Improve simple mime type helper - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -417,6 +417,8 @@ def guess_simple_file_type(file_path: str, data: Optional[bytes] = None ) -> tuple[Gio.Icon, str]: mime_type = guess_mime_type(file_path, data) + if mime_type == 'application/octet-stream': + mime_type = '' icon = get_icon_for_mime_type(mime_type) if file_path.startswith('geo:'): return icon, _('Location') @@ -432,6 +434,6 @@ def guess_simple_file_type(file_path: str, def get_icon_for_mime_type(mime_type: str) -> Gio.Icon: - if mime_type is None: + if mime_type == '': return Gio.Icon.new_for_string('mail-attachment') return Gio.content_type_get_icon(mime_type) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02798e7da45b1df8d5ec1ce945b90604… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02798e7da45b1df8d5ec1ce945b90604… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatInviter: Improvements
by Daniel Brötzmann (＠wurstsalat) 24 Dec '21

24 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 398678cd by wurstsalat at 2021-12-25T00:45:30+01:00 GroupChatInviter: Improvements - - - - - 2 changed files: - gajim/gtk/contacts_flowbox.py - gajim/gtk/groupchat_inviter.py Changes: ===================================== gajim/gtk/contacts_flowbox.py ===================================== @@ -23,26 +23,33 @@ class ContactItem(Gtk.FlowBoxChild): - def __init__(self, account: str, jid: str) -> None: + def __init__(self, account: str, jid: str, is_new: bool = False) -> None: Gtk.FlowBoxChild.__init__(self) self.set_size_request(150, -1) self.account = account self.jid = jid + self.is_new = is_new - client = app.get_client(account) - contact = client.get_module('Contacts').get_contact(jid) - - surface = contact.get_avatar( - AvatarSize.ROSTER, self.get_scale_factor()) - avatar_image = Gtk.Image.new_from_surface(surface) - - name_label = Gtk.Label(label=contact.name) - name_label.set_tooltip_text(contact.name) + name_label = Gtk.Label() name_label.set_ellipsize(Pango.EllipsizeMode.END) name_label.set_max_width_chars(12) name_label.get_style_context().add_class('bold') + if is_new: + avatar_image = Gtk.Image.new_from_icon_name( + 'avatar-default', Gtk.IconSize.DND) + name_label.set_text(jid) + name_label.set_tooltip_text(jid) + else: + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + surface = contact.get_avatar( + AvatarSize.ROSTER, self.get_scale_factor()) + avatar_image = Gtk.Image.new_from_surface(surface) + name_label.set_text(contact.name) + name_label.set_tooltip_text(contact.name) + remove_button = Gtk.Button.new_from_icon_name( 'window-close', Gtk.IconSize.BUTTON) remove_button.set_valign(Gtk.Align.CENTER) @@ -68,7 +75,11 @@ def _on_remove(self, _button: Gtk.Button) -> None: class ContactsFlowBox(Gtk.FlowBox): __gsignals__ = { - 'contact-removed': (GObject.SignalFlags.RUN_LAST, None, (str, str)) + 'contact-removed': ( + GObject.SignalFlags.RUN_LAST, + None, + (str, str, bool) + ) } def __init__(self) -> None: @@ -85,8 +96,12 @@ def _remove(item): item.destroy() self.foreach(_remove) - def add_contact(self, account: str, jid: str) -> None: - contact_item = ContactItem(account, jid) + def add_contact(self, + account: str, + jid: str, + is_new: bool = False + ) -> None: + contact_item = ContactItem(account, jid, is_new=is_new) self.add(contact_item) def has_contacts(self) -> bool: @@ -101,5 +116,6 @@ def get_contact_jids(self) -> List[str]: def on_contact_removed(self, row: ContactItem) -> None: account = row.account jid = row.jid + is_new = row.is_new row.destroy() - self.emit('contact-removed', account, jid) + self.emit('contact-removed', account, jid, is_new) ===================================== gajim/gtk/groupchat_inviter.py ===================================== @@ -101,8 +101,10 @@ def __init__(self, self.add(grid) self.show_all() - def _get_avatar_image(self, contact: types.BareContact) -> Gtk.Image: - if self.is_new: + def _get_avatar_image(self, + contact: Optional[types.BareContact] + ) -> Gtk.Image: + if contact is None: icon_name = 'avatar-default' return Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DND) @@ -189,7 +191,7 @@ def _add_contacts(self) -> None: def _on_contacts_row_activated(self, listbox: Gtk.ListBox, - row: Gtk.ListBoxRow + row: ContactRow ) -> None: if row.is_new: jid = row.jid @@ -207,7 +209,7 @@ def _on_contacts_row_activated(self, Gtk.EntryIconPosition.SECONDARY, None) self._remove_new_contact_row() - self._invitees_box.add_contact(row.account, row.jid) + self._invitees_box.add_contact(row.account, row.jid, is_new=row.is_new) if not row.is_new: listbox.remove(row) @@ -223,17 +225,19 @@ def _on_contacts_row_activated(self, def _on_invitee_removed(self, flowbox: ContactsFlowBox, account: str, - jid: str + jid: str, + is_new: bool ) -> None: - show_account = len(self._accounts) > 1 - client = app.get_client(account) - contact = client.get_module('Contacts').get_contact(jid) - row = ContactRow(account, - contact, - str(contact.jid), - contact.name, - show_account) - self._ui.contacts_listbox.add(row) + if not is_new: + show_account = len(self._accounts) > 1 + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + row = ContactRow(account, + contact, + str(contact.jid), + contact.name, + show_account) + self._ui.contacts_listbox.add(row) self._ui.search_entry.grab_focus() self.emit('listbox-changed', flowbox.has_contacts()) @@ -279,11 +283,10 @@ def _add_new_contact_row(self) -> None: row = ContactRow(account, None, '', - None, + _('New Contact'), show_account) self._new_contact_rows[account] = row self._ui.contacts_listbox.add(row) - row.get_parent().show_all() self._new_contact_row_visible = True def _remove_new_contact_row(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/398678cdbb977f05d130c1406341cf9d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/398678cdbb977f05d130c1406341cf9d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AV: Add silence to ringer sounds
by Daniel Brötzmann (＠wurstsalat) 24 Dec '21

24 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 68eb1422 by wurstsalat at 2021-12-24T12:28:50+01:00 AV: Add silence to ringer sounds - - - - - 2 changed files: - gajim/data/sounds/call_incoming.wav - gajim/data/sounds/call_outgoing.wav Changes: ===================================== gajim/data/sounds/call_incoming.wav ===================================== Binary files a/gajim/data/sounds/call_incoming.wav and b/gajim/data/sounds/call_incoming.wav differ ===================================== gajim/data/sounds/call_outgoing.wav ===================================== Binary files a/gajim/data/sounds/call_outgoing.wav and b/gajim/data/sounds/call_outgoing.wav differ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/68eb1422545dabffce397895387132e3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/68eb1422545dabffce397895387132e3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Helpers: Typing
by Daniel Brötzmann (＠wurstsalat) 24 Dec '21

24 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b212d481 by wurstsalat at 2021-12-24T00:39:40+01:00 Helpers: Typing - - - - - eb7237d6 by wurstsalat at 2021-12-24T01:50:27+01:00 GroupchatRoster: Typing - - - - - b4147774 by wurstsalat at 2021-12-24T01:56:17+01:00 CallRow: Remove superfluous sound.stop() - - - - - 4 changed files: - gajim/common/helpers.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/groupchat_roster.py - gajim/gtk/types.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -373,7 +373,10 @@ def get_uf_chatstate(chatstate: str) -> str: return _('has closed the chat window or tab') return '' -def exec_command(command, use_shell=False, posix=True): +def exec_command(command: str, + use_shell: bool = False, + posix: bool = True + ) -> None: """ execute a command. if use_shell is True, we run the command as is it was typed in a console. So it may be dangerous if you are not sure about what @@ -455,7 +458,7 @@ def _cut_if_long(string_): return reduced_text -def get_contact_dict_for_account(account): +def get_contact_dict_for_account(account: str) -> Dict[str, types.BareContact]: """ Creates a dict of jid -> contact with all contacts of account Can be used for completion lists @@ -533,7 +536,7 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return name return file_ -def play_sound_file(path_to_soundfile: str, loop: bool = False): +def play_sound_file(path_to_soundfile: str, loop: bool = False) -> None: path_to_soundfile = check_soundfile_path(path_to_soundfile) if path_to_soundfile is None: return @@ -647,7 +650,7 @@ def get_os_info() -> str: return info -def message_needs_highlight(text, nickname, own_jid): +def message_needs_highlight(text: str, nickname: str, own_jid: str) -> bool: """ Check text to see whether any of the words in (muc_highlight_words and nick) appear @@ -697,7 +700,7 @@ def allow_sound_notification(account: str, sound_event: str) -> bool: return False -def get_optional_features(account): +def get_optional_features(account: str) -> List[Namespace]: features = [] if app.settings.get_account_setting(account, 'request_user_data'): @@ -720,7 +723,7 @@ def get_optional_features(account): app.plugin_manager.extension_point('update_caps', account, features) return features -def jid_is_blocked(account, jid): +def jid_is_blocked(account: str, jid: str) -> bool: con = app.connections[account] return jid in con.get_module('Blocking').blocked @@ -773,7 +776,7 @@ def version_condition(current_version, required_version): return False return True -def get_available_emoticon_themes(): +def get_available_emoticon_themes() -> List[str]: files = [] for folder in configpaths.get('EMOTICONS').iterdir(): if not folder.is_dir(): @@ -811,7 +814,7 @@ def load_json(path: Path, return json_dict.get(key, default) -def ignore_contact(account, jid): +def ignore_contact(account: str, jid: JID) -> bool: client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) @@ -1097,7 +1100,7 @@ def geo_provider_from_location(lat: str, lon: str) -> str: return f'https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom=16' -def get_resource(account): +def get_resource(account: str) -> Optional[str]: resource = app.settings.get_account_setting(account, 'resource') if not resource: return None @@ -1129,7 +1132,7 @@ def get_default_muc_config() -> Dict[str, Union[bool, str]]: } -def validate_jid(jid, type_=None): +def validate_jid(jid: Union[str, JID], type_: Optional[str] = None) -> JID: try: jid = JID.from_string(str(jid)) except InvalidJid as error: ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -24,7 +24,6 @@ from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.jingle_session import JingleSession -from gajim.common import sound from .widgets import SimpleLabel from .base import BaseRow @@ -96,7 +95,6 @@ def _on_accept(self, button): self.get_parent().accept_call(self._session) def _on_decline(self, _button): - sound.stop() # dialing/ringing if self._event is not None: session = self._client.get_module('Jingle').get_jingle_session( self._event.fjid, self._event.sid) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -12,18 +12,26 @@ # 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 cast from typing import Optional +from typing import Tuple import locale from enum import IntEnum +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject from nbxmpp.const import Affiliation +from nbxmpp.const import Role +from nbxmpp.structs import MessageProperties from gajim.common import app from gajim.common import ged +from gajim.common import types from gajim.common.helpers import get_uf_role from gajim.common.helpers import get_uf_affiliation from gajim.common.helpers import jid_is_blocked @@ -33,6 +41,7 @@ from gajim.gui_menu_builder import get_groupchat_roster_menu from .tooltips import GCTooltip from .builder import get_builder +from .types import GroupchatControlType from .util import EventHelper @@ -62,7 +71,11 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): (str, )) # arguments } - def __init__(self, account, room_jid, control): + def __init__(self, + account: str, + room_jid: str, + control: GroupchatControlType + ) -> None: Gtk.ScrolledWindow.__init__(self) EventHelper.__init__(self) self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) @@ -74,14 +87,18 @@ def __init__(self, account, room_jid, control): self._show_roles = True self._tooltip = GCTooltip() self._group_chat_contact = control.contact - self._group_chat_contact.connect('user-avatar-update', - self._on_user_avatar_update) + self._group_chat_contact.connect( + 'user-avatar-update', self._on_user_avatar_update) self._group_chat_contact.connect('user-joined', self._on_user_joined) self._group_chat_contact.connect('user-left', self._on_user_left) - self._group_chat_contact.connect('user-affiliation-changed', self._update_contact) - self._group_chat_contact.connect('user-role-changed', self._update_contact) - self._group_chat_contact.connect('user-status-show-changed', self._on_user_status_show_changed) - self._group_chat_contact.connect('user-nickname-changed', self._on_user_nickname_changed) + self._group_chat_contact.connect( + 'user-affiliation-changed', self._update_contact) + self._group_chat_contact.connect( + 'user-role-changed', self._update_contact) + self._group_chat_contact.connect( + 'user-status-show-changed', self._on_user_status_show_changed) + self._group_chat_contact.connect( + 'user-nickname-changed', self._on_user_nickname_changed) # self._group_chat_contact.connect('muc-user-presence-update', # self._on_muc_user_presence_update) @@ -90,14 +107,14 @@ def __init__(self, account, room_jid, control): self.add(self._ui.roster_treeview) # Holds the Gtk.TreeRowReference for each contact - self._contact_refs = {} + self._contact_refs: dict[str, Gtk.TreeRowReference] = {} # Holds the Gtk.TreeRowReference for each group - self._group_refs = {} + self._group_refs: dict[str, Gtk.TreeRowReference] = {} - self._store = self._ui.participant_store + self._store = cast(Gtk.TreeStore, self._ui.participant_store) self._store.set_sort_func(Column.TEXT, self._tree_compare_iters) - self._roster = self._ui.roster_treeview + self._roster = cast(Gtk.TreeView, self._ui.roster_treeview) self._roster.set_search_equal_func(self._search_func) self._roster.set_has_tooltip(True) self._roster.connect('query-tooltip', self._query_tooltip) @@ -115,16 +132,22 @@ def __init__(self, account, room_jid, control): ]) @staticmethod - def _on_focus_out(treeview, _param): + def _on_focus_out(treeview: Gtk.TreeView, _param: Gdk.EventFocus) -> None: treeview.get_selection().unselect_all() - def set_model(self): + def set_model(self) -> None: self._roster.set_model(self._store) - def set_show_roles(self, enabled): + def set_show_roles(self, enabled: bool) -> None: self._show_roles = enabled - def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): + def _query_tooltip(self, + widget: Gtk.Widget, + x_pos: int, + y_pos: int, + _keyboard_mode: bool, + tooltip: Gtk.Tooltip + ) -> bool: try: row = self._roster.get_path_at_pos(x_pos, y_pos)[0] except TypeError: @@ -154,7 +177,11 @@ def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): return value @staticmethod - def _search_func(model, _column, search_text, iter_): + def _search_func(model: Gtk.TreeModel, + _column: int, + search_text: str, + iter_: Gtk.TreeIter + ) -> bool: return search_text.lower() not in model[iter_][1].lower() def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: @@ -179,10 +206,15 @@ def _get_contact_iter(self, nick: str) -> Optional[Gtk.TreeIter]: return None return self._store.get_iter(path) - def _on_user_joined(self, _contact, _signal_name, user_contact, *args): + def _on_user_joined(self, + _contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant, + *args: Any + ) -> None: self._add_contact(user_contact) - def _add_contact(self, contact): + def _add_contact(self, contact: types.GroupchatParticipant) -> None: group_name, group_text = self._get_group_from_contact(contact) nick = contact.name @@ -212,24 +244,44 @@ def _add_contact(self, contact): self._roster.get_model() is not None): self._roster.expand_row(role_path, False) - def _on_user_left(self, _contact, _signal_name, user_contact, *args): + def _on_user_left(self, + _contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant, + *args: Any + ) -> None: self._remove_contact(user_contact) self.draw_groups() - def _update_contact(self, _contact, _signal_name, user_contact, *args): + def _update_contact(self, + _contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant, + *args: Any + ) -> None: self._remove_contact(user_contact) self._add_contact(user_contact) - def _on_user_nickname_changed(self, contact, _signal_name, user_contact, properties): + def _on_user_nickname_changed(self, + contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant, + properties: MessageProperties + ) -> None: self._remove_contact(user_contact) user_contact = contact.get_resource(properties.muc_user.nick) self._add_contact(user_contact) - def _on_user_status_show_changed(self, _contact, _signal_name, user_contact, *args): + def _on_user_status_show_changed(self, + _contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant, + *args: Any + ) -> None: self.draw_contact(user_contact.name) - def _remove_contact(self, contact): + def _remove_contact(self, contact: types.GroupchatParticipant) -> None: nick = contact.name iter_ = self._get_contact_iter(nick) if not iter_: @@ -247,33 +299,43 @@ def _remove_contact(self, contact): self._store.remove(group_iter) @staticmethod - def _get_group_from_contact(contact): + def _get_group_from_contact(contact: types.GroupchatParticipant + ) -> Tuple[str, str]: if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): return contact.affiliation.value, get_uf_affiliation( contact.affiliation, plural=True) return contact.role.value, get_uf_role(contact.role, plural=True) @staticmethod - def _text_cell_data_func(_column, renderer, model, iter_, _user_data): + def _text_cell_data_func(_column: Gtk.TreeViewColumn, + renderer: Gtk.CellRenderer, + model: Gtk.TreeModel, + iter_: Gtk.TreeIter, + _user_data: Optional[object] + ) -> None: has_parent = bool(model.iter_parent(iter_)) style = 'contact' if has_parent else 'group' - bgcolor = app.css_config.get_value('.gajim-%s-row' % style, + bgcolor = app.css_config.get_value(f'.gajim-{style}-row', StyleAttr.BACKGROUND) renderer.set_property('cell-background', bgcolor) - color = app.css_config.get_value('.gajim-%s-row' % style, + color = app.css_config.get_value(f'.gajim-{style}-row', StyleAttr.COLOR) renderer.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-%s-row' % style) + desc = app.css_config.get_font(f'.gajim-{style}-row') renderer.set_property('font-desc', desc) if not has_parent: renderer.set_property('weight', 600) renderer.set_property('ypad', 6) - def _on_roster_row_activated(self, _treeview, path, _column): + def _on_roster_row_activated(self, + _treeview: Gtk.TreeView, + path: Gtk.TreePath, + _column: Gtk.TreeViewColumn + ) -> None: iter_ = self._store.get_iter(path) if self._store.iter_parent(iter_) is None: # This is a group row @@ -283,7 +345,10 @@ def _on_roster_row_activated(self, _treeview, path, _column): return self.emit('row-activated', nick) - def _on_roster_button_press_event(self, treeview, event): + def _on_roster_button_press_event(self, + treeview: Gtk.TreeView, + event: Gdk.EventButton + ) -> None: if event.button not in (2, 3): return @@ -307,7 +372,7 @@ def _on_roster_button_press_event(self, treeview, event): if event.button == 2: # middle click self.emit('row-activated', nick) - def _show_contact_menu(self, nick): + def _show_contact_menu(self, nick: str) -> None: self_contact = self._group_chat_contact.get_self() contact = self._group_chat_contact.get_resource(nick) menu = get_groupchat_roster_menu(self._account, @@ -324,11 +389,15 @@ def destroy(menu, _pspec): menu.connect('notify::visible', destroy) menu.popup_at_pointer() - def _tree_compare_iters(self, model, iter1, iter2, _user_data): + def _tree_compare_iters(self, + model: Gtk.TreeModel, + iter1: Gtk.TreeIter, + iter2: Gtk.TreeIter, + _user_data: Optional[object] + ) -> int: """ Compare two iterators to sort them """ - is_contact = model.iter_parent(iter1) if is_contact: # Sort contacts with pending events to top @@ -356,28 +425,28 @@ def _tree_compare_iters(self, model, iter1, iter2, _user_data): group2_index = AffiliationRoleSortOrder[group2] return -1 if group1_index < group2_index else 1 - def enable_sort(self, enable): + def enable_sort(self, enable: bool) -> None: column = Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID if enable: column = Column.TEXT self._store.set_sort_column_id(column, Gtk.SortType.ASCENDING) - def invalidate_sort(self): + def invalidate_sort(self) -> None: self.enable_sort(False) self.enable_sort(True) - def initial_draw(self): + def initial_draw(self) -> None: self.enable_sort(True) self.set_model() self._roster.expand_all() - def redraw(self): + def redraw(self) -> None: self._roster.set_model(None) self._roster.set_model(self._store) self._roster.expand_all() - def draw_contact(self, nick): + def draw_contact(self, nick: str) -> None: iter_ = self._get_contact_iter(nick) if not iter_: return @@ -391,9 +460,9 @@ def draw_contact(self, nick): name = GLib.markup_escape_text(contact.name) # Strike name if blocked - fjid = self.room_jid + '/' + nick + fjid = f'{self.room_jid}/{nick}' if jid_is_blocked(self._account, fjid): - name = '%s' % name + name = f'{name}' # add status msg, if not empty, under contact name status = contact.status @@ -404,16 +473,16 @@ def draw_contact(self, nick): # Display only first line status = status.split('\n', 1)[0] # escape markup entities and make them small italic and fg color - name += ('\n' - '{}'.format(GLib.markup_escape_text(status))) + name += (f'\n' + f'{GLib.markup_escape_text(status)}') self._store[iter_][Column.TEXT] = name - def draw_contacts(self): + def draw_contacts(self) -> None: for nick in self._contact_refs: self.draw_contact(nick) - def draw_group(self, group): + def draw_group(self, group: str) -> None: group_iter = self._get_group_iter(group) if not group_iter: return @@ -426,15 +495,15 @@ def draw_group(self, group): total_users = self._get_total_user_count() group_users = self._store.iter_n_children(group_iter) - group_text += ' (%s/%s)' % (group_users, total_users) + group_text += f' ({group_users}/{total_users})' self._store[group_iter][Column.TEXT] = group_text - def draw_groups(self): + def draw_groups(self) -> None: for group in self._group_refs: self.draw_group(group) - def draw_avatar(self, contact): + def draw_avatar(self, contact: types.GroupchatParticipant) -> None: iter_ = self._get_contact_iter(contact.name) if iter_ is None: return @@ -446,13 +515,13 @@ def draw_avatar(self, contact): def _on_user_avatar_update(self, _contact, _signal_name, user_contact): self.draw_avatar(user_contact) - def _get_total_user_count(self): + def _get_total_user_count(self) -> int: count = 0 for group_row in self._store: count += self._store.iter_n_children(group_row.iter) return count - def get_role(self, nick): + def get_role(self, nick: str) -> Role: contact = self._group_chat_contact.get_resource(nick) return contact.role @@ -462,12 +531,12 @@ def _on_theme_update(self, _event): def process_avatar_update(self, event): self.draw_avatar(event.contact) - def clear(self): + def clear(self) -> None: self._contact_refs = {} self._group_refs = {} self._store.clear() - def _on_destroy(self, _roster): + def _on_destroy(self, _roster: Any) -> None: self._group_chat_contact.disconnect(self) self._contact_refs = {} ===================================== gajim/gtk/types.py ===================================== @@ -55,3 +55,5 @@ 'PrivateChatControl', 'GroupchatControl' ] + +GroupchatControlType = Union['GroupchatControl'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4fdf993e6732382dbe837583136646e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4fdf993e6732382dbe837583136646e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Calls: Add DSP
by Philipp Hörist (＠lovetox) 23 Dec '21

23 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5e9c8e3 by emil at 2021-12-24T00:13:16+01:00 Calls: Add DSP - - - - - 4fdf993e by emil at 2021-12-24T00:27:35+01:00 Calls: Add ringing/dialing sound - - - - - 9 changed files: - gajim/common/helpers.py - gajim/common/jingle_rtp.py - gajim/common/setting_values.py - + gajim/data/sounds/CREDITS - + gajim/data/sounds/call_incoming.wav - + gajim/data/sounds/call_outgoing.wav - gajim/gtk/call_widget.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/manage_sounds.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -467,13 +467,16 @@ def get_contact_dict_for_account(account): return contacts_dict -def play_sound(sound_event: str, account: str, - force: bool = False) -> None: +def play_sound(sound_event: str, + account: str, + force: bool = False, + loop: bool = False) -> None: + if sound_event is None: return if force or allow_sound_notification(account, sound_event): play_sound_file( - app.settings.get_soundevent_settings(sound_event)['path']) + app.settings.get_soundevent_settings(sound_event)['path'], loop) def check_soundfile_path(file_, dirs=None): @@ -530,13 +533,13 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return name return file_ -def play_sound_file(path_to_soundfile): +def play_sound_file(path_to_soundfile: str, loop: bool = False): path_to_soundfile = check_soundfile_path(path_to_soundfile) if path_to_soundfile is None: return from gajim.common import sound - sound.play(path_to_soundfile) + sound.play(path_to_soundfile, loop) def get_connection_status(account: str) -> str: if not app.account_is_available(account): ===================================== gajim/common/jingle_rtp.py ===================================== @@ -413,12 +413,19 @@ def setup_stream(self): # TODO: Add queues? self.src_bin = self.make_bin_from_config( 'audio_input_device', - '%s ! audioconvert', + '''%s + ! webrtcdsp + echo-suppression-level=high + noise-suppression-level=very-high + voice-detection=true + ! audioconvert ''', _('audio input')) + # setting name=webrtcechoprobe0 is needed because lingering probes + # cause a bug in subsequent calls self.sink = self.make_bin_from_config( 'audio_output_device', - 'audioconvert ! volume name=gajim_out_vol ! %s', + 'audioconvert ! volume name=gajim_out_vol ! webrtcechoprobe name=webrtcechoprobe0 ! %s', _('audio output')) self.mic_volume = self.src_bin.get_by_name('gajim_vol') ===================================== gajim/common/setting_values.py ===================================== @@ -538,6 +538,14 @@ class _ACCOUNT_DEFAULT: 'muc_message_received': { 'enabled': True, 'path': 'message2.wav' + }, + 'incoming-call-sound': { + 'enabled': True, + 'path': 'call_incoming.wav' + }, + 'outgoing-call-sound': { + 'enabled': True, + 'path': 'call_outgoing.wav' } } ===================================== gajim/data/sounds/CREDITS ===================================== @@ -0,0 +1,5 @@ +incoming-call.wav +outgoing-call.wav + Copyright: Damien Sandras + URL: http://git.gnome.org/cgit/ekiga/tree/sounds + License: GPLv2+ ===================================== gajim/data/sounds/call_incoming.wav ===================================== Binary files /dev/null and b/gajim/data/sounds/call_incoming.wav differ ===================================== gajim/data/sounds/call_outgoing.wav ===================================== Binary files /dev/null and b/gajim/data/sounds/call_outgoing.wav differ ===================================== gajim/gtk/call_widget.py ===================================== @@ -35,6 +35,8 @@ from gajim.common.i18n import _ from gajim.common.jingle_rtp import JingleAudio from gajim.common.nec import NetworkEvent +from gajim.common.helpers import play_sound +from gajim.common import sound from .gstreamer import create_gtk_widget from .builder import get_builder @@ -109,10 +111,12 @@ def get_jingle_available(self, content_type: str) -> bool: return self._jingle[content_type].available def _on_call_with_mic(self, _button: Gtk.Button) -> None: + play_sound('outgoing-call-sound', self._account, force=True, loop=True) self._on_jingle_button_toggled(['audio']) self._ui.av_start_box.hide() def _on_call_with_mic_and_cam(self, _button: Gtk.Button) -> None: + play_sound('outgoing-call-sound', self._account, force=True, loop=True) self._on_jingle_button_toggled(['audio', 'video']) self._ui.av_start_box.hide() @@ -237,8 +241,9 @@ def _on_jingle_request(self, event): self._incoming_video_event = event else: # There is no voice call running running yet - self.emit('incoming-call', event) + play_sound('incoming-call-sound', self._account, loop=True) + self.emit('incoming-call', event) app.nec.push_incoming_event( NetworkEvent('notification', account=self._account, @@ -268,6 +273,7 @@ def _on_jingle_connected(self, event): session.approve_session() for content in event.media: session.approve_content(content) + sound.stop() # dialing/ringing def _on_jingle_disconnected(self, event): if event.media is None: @@ -284,6 +290,7 @@ def _on_jingle_disconnected(self, event): JingleState.NULL, sid=event.sid, reason=event.reason) + sound.stop() # dialing/ringing def _on_jingle_error(self, event): if event.sid == self._jingle['audio'].sid: @@ -291,6 +298,7 @@ def _on_jingle_error(self, event): 'audio', JingleState.ERROR, reason=event.reason) + sound.stop() # dialing/ringing def start_call(self) -> None: audio_state = self._jingle['audio'].state @@ -305,6 +313,8 @@ def start_call(self) -> None: self._ui.av_cam_button.set_sensitive(False) def accept_call(self, session): + sound.stop() # dialing/ringing + if not session: return @@ -328,6 +338,8 @@ def accept_call(self, session): @staticmethod def decline_call(session): + sound.stop() # dialing/ringing + if not session: return ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -24,6 +24,7 @@ from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.jingle_session import JingleSession +from gajim.common import sound from .widgets import SimpleLabel from .base import BaseRow @@ -95,6 +96,7 @@ def _on_accept(self, button): self.get_parent().accept_call(self._session) def _on_decline(self, _button): + sound.stop() # dialing/ringing if self._event is not None: session = self._client.get_module('Jingle').get_jingle_session( self._event.fjid, self._event.sid) ===================================== gajim/gtk/manage_sounds.py ===================================== @@ -39,6 +39,8 @@ 'message_sent': _('Message Sent'), 'muc_message_highlight': _('Group Chat Message Highlight'), 'muc_message_received': _('Group Chat Message Received'), + 'incoming-call-sound': _('Call Incoming'), + 'outgoing-call-sound': _('Call Outgoing'), } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4b76de1bf3982b869ce048c06bcfbac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4b76de1bf3982b869ce048c06bcfbac… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

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 December 2021