Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][unify-control] 2 commits: fix: Comment import
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: d9e24817 by lovetox at 2022-08-09T17:14:18+02:00 fix: Comment import - - - - - 7066d32b by lovetox at 2022-08-09T17:18:10+02:00 fix: GroupchatRoster: fix pyright issues - - - - - 3 changed files: - gajim/gtk/groupchat_roster.py - gajim/gtk/preferences.py - pyrightconfig.json Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -25,7 +25,7 @@ from gi.repository import Gtk from gi.repository import GLib from nbxmpp.const import Affiliation -from nbxmpp.structs import MessageProperties +from nbxmpp.structs import PresenceProperties from gajim.common import app from gajim.common import ged @@ -184,6 +184,7 @@ def _query_tooltip(self, nickname = self._store[iter_][Column.NICK_OR_GROUP] + assert self._contact is not None contact = self._contact.get_resource(nickname) value, widget = self._tooltip.get_tooltip(contact) @@ -283,11 +284,13 @@ def _on_user_nickname_changed(self, contact: types.GroupchatContact, _signal_name: str, user_contact: types.GroupchatParticipant, - properties: MessageProperties + properties: PresenceProperties ) -> None: self._remove_contact(user_contact) + assert properties.muc_user is not None + assert properties.muc_user.nick is not None user_contact = contact.get_resource(properties.muc_user.nick) self._add_contact(user_contact) @@ -361,15 +364,20 @@ def _on_roster_row_activated(self, if self._store.iter_parent(iter_) is None: # This is a group row return + + assert self._contact is not None + nick = self._store[iter_][Column.NICK_OR_GROUP] if self._contact.nickname == nick: return disco = self._contact.get_disco() assert disco is not None + muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') if disco.muc_is_nonanonymous and muc_prefer_direct_msg: participant = self._contact.get_resource(nick) + assert participant.real_jid is not None app.window.add_chat(self._contact.account, participant.real_jid, 'contact', @@ -402,6 +410,8 @@ def _on_roster_button_press_event(self, # Group row return + assert self._contact is not None + nick = self._store[iter_][Column.NICK_OR_GROUP] if self._contact.nickname == nick: return @@ -416,10 +426,11 @@ def _on_roster_button_press_event(self, # self.roster.emit('row-activated', nick) def _show_contact_menu(self, nick: str, rect: Gdk.Rectangle) -> None: + assert self._contact is not 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._account, + menu = get_groupchat_roster_menu(self._contact.account, self_contact, contact) @@ -461,6 +472,7 @@ def _tree_compare_iters(self, if not app.settings.get('sort_by_show_in_muc'): return locale.strcoll(nick1.lower(), nick2.lower()) + assert self._contact is not None contact1 = self._contact.get_resource(nick1) contact2 = self._contact.get_resource(nick2) @@ -485,6 +497,7 @@ def enable_sort(self, enable: bool) -> None: def _load_roster(self) -> None: log.info('Load Roster') + assert self._contact is not None self._contact.multi_connect({ 'user-affiliation-changed': self._update_contact, 'user-avatar-update': self._on_user_avatar_update, @@ -504,6 +517,7 @@ def _load_roster(self) -> None: def _unload_roster(self) -> None: log.info('Unload Roster') + assert self._contact is not None self._contact.multi_disconnect(self, CONTACT_SIGNALS) self._roster.set_model(None) @@ -527,6 +541,7 @@ def _draw_contact(self, nick: str) -> None: if not iter_: return + assert self._contact is not None contact = self._contact.get_resource(nick) self._draw_avatar(contact) ===================================== gajim/gtk/preferences.py ===================================== @@ -52,8 +52,8 @@ from .util import get_app_window from .builder import get_builder -if app.is_installed('GSPELL'): - from gi.repository import Gspell # pylint: disable=ungrouped-imports +# if app.is_installed('GSPELL'): +# from gi.repository import Gspell # pylint: disable=ungrouped-imports log = logging.getLogger('gajim.gui.preferences') ===================================== pyrightconfig.json ===================================== @@ -84,6 +84,7 @@ "gajim/gtk/groupchat_nick_completion.py", "gajim/gtk/groupchat_nick.py", "gajim/gtk/groupchat_outcasts.py", + "gajim/gtk/groupchat_roster.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", "gajim/gtk/gstreamer.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6ebbfaf6e08573af4871aa40d175ad5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6ebbfaf6e08573af4871aa40d175ad5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] fix: pylint errors
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 6ebbfaf6 by lovetox at 2022-08-09T17:05:05+02:00 fix: pylint errors - - - - - 2 changed files: - gajim/gtk/chat_action_processor.py - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -123,17 +123,16 @@ def _replace_text(self, selected_action: str) -> None: def _get_commands(self) -> list[str]: # TODO + # commands: list[str] = [] + # assert self._account + # assert self._contact + # control = app.window.get_control() + # for command in control.list_commands(): + # for name in command.names: + # commands.append(name) + # return commands return [] - commands: list[str] = [] - assert self._account - assert self._contact - control = app.window.get_control() - for command in control.list_commands(): - for name in command.names: - commands.append(name) - return commands - def _on_changed(self, _textview: MessageInputTextView) -> None: insert = self._buf.get_insert() self._current_iter = self._buf.get_iter_at_mark(insert) ===================================== gajim/gtk/preferences.py ===================================== @@ -320,19 +320,19 @@ def _speller_available() -> bool: @staticmethod def _on_use_speller(value: bool, *args: Any) -> None: # TODO - return - if not value: - return - - lang = app.settings.get('speller_language') - gspell_lang = Gspell.language_lookup(lang) - if gspell_lang is None: - gspell_lang = Gspell.language_get_default() - if gspell_lang is None: - return - app.settings.set('speller_language', gspell_lang.get_code()) - for ctrl in app.window.get_controls(): - ctrl.set_speller() + # if not value: + # return + + # lang = app.settings.get('speller_language') + # gspell_lang = Gspell.language_lookup(lang) + # if gspell_lang is None: + # gspell_lang = Gspell.language_get_default() + # if gspell_lang is None: + # return + # app.settings.set('speller_language', gspell_lang.get_code()) + # for ctrl in app.window.get_controls(): + # ctrl.set_speller() + pass @staticmethod def _on_show_send_message_button(show_button: bool, *args: Any) -> None: @@ -751,9 +751,9 @@ def _on_emoticons_theme(self, *args: Any) -> None: @staticmethod def _toggle_emoticons() -> None: # TODO - return - for ctrl in app.window.get_controls(): - ctrl.toggle_emoticons() + # for ctrl in app.window.get_controls(): + # ctrl.toggle_emoticons() + pass class Server(PreferenceBox): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ebbfaf6e08573af4871aa40d175ad53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ebbfaf6e08573af4871aa40d175ad53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 43 commits: cq: Add missing whitespace after keyword
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: ab44dcda by lovetox at 2022-08-08T15:47:28+02:00 cq: Add missing whitespace after keyword - - - - - 077fd4e2 by lovetox at 2022-08-09T16:48:39+02:00 feat: Unify Control - - - - - 26c83c19 by lovetox at 2022-08-09T16:48:39+02:00 fix: Remove ControlStack and rework all methods using it - - - - - 4a36a56f by lovetox at 2022-08-09T16:48:39+02:00 fix: Make control init work - - - - - 273404d7 by lovetox at 2022-08-09T16:48:39+02:00 fix: ConversationsView: Make it switch contact - - - - - cc7c2cf2 by lovetox at 2022-08-09T16:48:39+02:00 fix: ChatControl: Determine encryption on contact switch - - - - - f653c91e by lovetox at 2022-08-09T16:48:39+02:00 refactor: ChatControl: Rename builder attribute - - - - - 6df70848 by lovetox at 2022-08-09T16:48:39+02:00 refactor: Determine anonymous state from contact - - - - - 0247044d by lovetox at 2022-08-09T16:48:39+02:00 refactor: Determine room jid from contact - - - - - b6c8b934 by lovetox at 2022-08-09T16:48:39+02:00 refactor: Remove comments - - - - - cd81f889 by lovetox at 2022-08-09T16:48:39+02:00 refactor: Remove abstract methods - - - - - f3c20371 by lovetox at 2022-08-09T16:48:39+02:00 refactor: GroupChatState: Make it switch contacts - - - - - d22ad263 by lovetox at 2022-08-09T16:48:39+02:00 refactor: GroupchatRoster: Make it switch contacts - - - - - b27caae2 by lovetox at 2022-08-09T16:48:39+02:00 refactor: Make subject text cache work - - - - - 5faa3e99 by lovetox at 2022-08-09T16:48:39+02:00 fix: Fix some bugs - - - - - 95783364 by lovetox at 2022-08-09T16:48:39+02:00 refactor: Remove unused arg - - - - - 68544d55 by lovetox at 2022-08-09T16:48:39+02:00 fix: Remove unused import - - - - - 759fb331 by lovetox at 2022-08-09T16:48:39+02:00 other: Contacts: Add dedicated methods for adding contacts - - - - - 9aa7d949 by lovetox at 2022-08-09T16:48:39+02:00 other: Add contacts when opening chats - - - - - 15121542 by lovetox at 2022-08-09T16:48:39+02:00 fix: Check for None - - - - - 810804de by lovetox at 2022-08-09T16:48:39+02:00 fix: ChatControl: Fix type discovery - - - - - 8598ad9e by lovetox at 2022-08-09T16:48:39+02:00 fix: Disable user status show callback - - - - - 99dd5a92 by lovetox at 2022-08-09T16:48:39+02:00 fix: Remove unused imports - - - - - 0159faa8 by lovetox at 2022-08-09T16:48:39+02:00 fix: Make mark_as_read work again - - - - - af68fcb3 by lovetox at 2022-08-09T16:48:39+02:00 other: Observable: Add multi_disconnect() - - - - - e22bf6b5 by lovetox at 2022-08-09T16:48:39+02:00 other: Observable: Add disconnect_signal() - - - - - fdb27d71 by lovetox at 2022-08-09T16:48:39+02:00 refactor: ChatControl: Remove handlers for client state-changed - - - - - 79ae5813 by lovetox at 2022-08-09T16:48:39+02:00 other: Contacts: Add get_participants() - - - - - 688ff8cb by lovetox at 2022-08-09T16:48:39+02:00 refactor: GroupchatRoster: Make it work - - - - - 40364b85 by lovetox at 2022-08-09T16:48:39+02:00 fix: Call correct method - - - - - 9e89973f by lovetox at 2022-08-09T16:48:39+02:00 refactor: GroupchatRoster - - - - - 32fbb321 by lovetox at 2022-08-09T16:48:39+02:00 fix: Banner: Fix roster toggle icon - - - - - dba76d32 by lovetox at 2022-08-09T16:48:39+02:00 refactor: Control: fix all pyright issues - - - - - 9446af3a by lovetox at 2022-08-09T16:48:39+02:00 cq: GroupchatState: Fix pyright issues - - - - - a3f76b5b by lovetox at 2022-08-09T16:48:39+02:00 cq: Fix more pyright issues - - - - - a253b77d by lovetox at 2022-08-09T16:48:39+02:00 cq: Fix typo - - - - - f28ac324 by lovetox at 2022-08-09T16:48:39+02:00 fix: Fix some asserts and attr access - - - - - 2bfb1768 by lovetox at 2022-08-09T16:48:39+02:00 fix: ChatControl: Make user status change work - - - - - e5c36190 by lovetox at 2022-08-09T16:48:39+02:00 fix: Fix start chat action - - - - - 5bbafdce by lovetox at 2022-08-09T16:48:39+02:00 fix: Fix read state sync event handling - - - - - 282bf102 by lovetox at 2022-08-09T16:48:39+02:00 fix: Start File Transfer - - - - - 342d0213 by lovetox at 2022-08-09T16:48:39+02:00 fix: Disable user nickname change - - - - - 4d3a78b6 by lovetox at 2022-08-09T16:48:39+02:00 fix: Preferences: Enable roster settings again - - - - - 27 changed files: - gajim/common/helpers.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/data/gui/groupchat_roster.ui - gajim/gtk/application.py - gajim/gtk/builder.pyi - gajim/gtk/chat_action_processor.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_list.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py → gajim/gtk/control.py - − gajim/gtk/control_stack.py - − gajim/gtk/controls/__init__.py - − gajim/gtk/controls/base.py - − gajim/gtk/controls/chat.py - − gajim/gtk/controls/private.py - gajim/gtk/conversation/jump_to_end_button.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_roster.py - gajim/gtk/groupchat_state.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py - gajim/gtk/preferences.py - gajim/gtk/search_view.py - gajim/gtk/structs.py - gajim/gtk/types.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/72b876820f3257191bfcb1deaa6251b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/72b876820f3257191bfcb1deaa6251b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: cq: Fix typo
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: b887b1a4 by lovetox at 2022-08-09T12:00:16+02:00 cq: Fix typo - - - - - 72b87682 by lovetox at 2022-08-09T12:15:35+02:00 fix: Fix some asserts and attr access - - - - - 2 changed files: - gajim/gtk/control.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -125,18 +125,18 @@ def client(self) -> types.Client: return self._client def is_loaded(self, account: str, jid: JID) -> bool: - if self.contact is None: + if self._contact is None: return False return self.contact.account == account and self.contact.jid == jid def has_active_chat(self) -> bool: - return self.contact is not None + return self._contact is not None def clear(self) -> None: log.info('Clear') - if self.contact is not None: - self.contact.disconnect_all_from_obj(self) + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) self._contact = None self._client = None @@ -194,10 +194,13 @@ def switch_contact(self, contact: Union[BareContact, self._client.get_module('Chatstate').set_active(contact) def process_event(self, event: events.MainEventT) -> None: - if event.account != self.contact.account: + if self._contact is None: + return + + if event.account != self._contact.account: return - if event.jid not in (self.contact.jid, self.contact.jid.bare): + if event.jid not in (self._contact.jid, self._contact.jid.bare): return file_transfer_events = ( @@ -758,7 +761,7 @@ def _on_user_status_show_changed(self, properties: PresenceProperties ) -> None: - # TODO: This cant work + # TODO: This does not work return if isinstance(self.contact, GroupchatContact): if not contact.settings.get('print_status'): ===================================== gajim/gtk/main.py ===================================== @@ -421,12 +421,12 @@ def _on_action(self, if action_name == 'escape': if app.settings.get('escape_key_closes'): - self._chat_page.remove_chat(control.account, + self._chat_page.remove_chat(control.contact.account, control.contact.jid) return None elif action_name == 'close-tab': - self._chat_page.remove_chat(control.account, + self._chat_page.remove_chat(control.contact.account, control.contact.jid) return None @@ -490,7 +490,7 @@ def _on_window_motion_notify(self, return if self.get_property('has-toplevel-focus'): - client = app.get_client(control.account) + client = app.get_client(control.contact.account) chat_stack = self._chat_page.get_chat_stack() msg_action_box = chat_stack.get_message_action_box() client.get_module('Chatstate').set_mouse_activity( @@ -822,7 +822,7 @@ def _on_window_active(self, return if control.get_autoscroll(): - self.mark_as_read(control.account, control.contact.jid) + self.mark_as_read(control.contact.account, control.contact.jid) @staticmethod def contact_info(account: str, jid: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c121701810eba287c97afa63303ad6c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c121701810eba287c97afa63303ad6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: cq: GroupchatState: Fix pyright issues
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 3a9c1bc9 by lovetox at 2022-08-09T11:51:30+02:00 cq: GroupchatState: Fix pyright issues - - - - - c1217018 by lovetox at 2022-08-09T11:58:41+02:00 cq: Fix more pyright issues - - - - - 5 changed files: - gajim/gtk/chat_page.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_state.py - gajim/gtk/main.py - gajim/gtk/structs.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -161,7 +161,7 @@ def _on_search_history(self, _param: Literal[None]) -> None: if self._chat_control.has_active_chat(): - self._search_view.set_context(self._chat_control.account, + self._search_view.set_context(self._chat_control.contact.account, self._chat_control.contact.jid) self._search_view.clear() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -36,6 +36,7 @@ from nbxmpp.protocol import JID from gajim.common import app +from gajim.common import types from gajim.common.events import JingleRequestReceived from gajim.common.events import FileRequestReceivedEvent from gajim.common.events import FileRequestSent @@ -87,6 +88,11 @@ def __init__(self) -> None: # message_id -> row mapping self._message_id_row_map: dict[str, MessageRow] = {} + @property + def contact(self) -> types.ChatContactT: + assert self._contact is not None + return self._contact + def clear(self) -> None: self._contact = None self._client = None @@ -113,7 +119,7 @@ def switch_contact(self, contact: ChatContactT) -> None: account=contact.account, jid=contact.jid) - self._read_marker_row = ReadMarkerRow(contact.account, self._contact) + self._read_marker_row = ReadMarkerRow(contact.account, contact) self.add(self._read_marker_row) self._scroll_hint_row = ScrollHintRow(contact.account) @@ -161,7 +167,7 @@ def _sort_func(row1: BaseRow, row2: BaseRow) -> int: return -1 if row1.timestamp < row2.timestamp else 1 def add_muc_subject(self, subject: MucSubject) -> None: - muc_subject = MUCSubject(self._contact.account, subject) + muc_subject = MUCSubject(self.contact.account, subject) self._insert_message(muc_subject) def add_muc_user_left(self, @@ -188,15 +194,15 @@ def add_muc_user_joined(self, nick: str) -> None: self._insert_message(join_left) def add_user_status(self, name: str, show: str, status: str) -> None: - user_status = UserStatus(self._contact.account, name, show, status) + user_status = UserStatus(self.contact.account, name, show, status) self._insert_message(user_status) def add_info_message(self, text: str) -> None: - message = InfoMessage(self._contact.account, text) + message = InfoMessage(self.contact.account, text) self._insert_message(message) def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: - transfer_row = FileTransferRow(self._contact.account, transfer) + transfer_row = FileTransferRow(self.contact.account, transfer) self._insert_message(transfer_row) def add_jingle_file_transfer(self, @@ -229,7 +235,7 @@ def add_call_message(self, def add_command_output(self, text: str, is_error: bool) -> None: command_output_row = CommandOutputRow( - self._contact.account, text, is_error) + self.contact.account, text, is_error) self._insert_message(command_output_row) def add_message(self, @@ -250,8 +256,8 @@ def add_message(self, timestamp = time.time() message_row = MessageRow( - self._contact.account, - self._contact, + self.contact.account, + self.contact, message_id, stanza_id, timestamp, @@ -293,7 +299,7 @@ def _add_date_row(self, timestamp: datetime) -> None: if start_of_day in self._active_date_rows: return - date_row = DateRow(self._contact.account, start_of_day) + date_row = DateRow(self.contact.account, start_of_day) self._active_date_rows.add(start_of_day) self.add(date_row) ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -77,10 +77,12 @@ def set_fetching(self) -> None: self._ui.groupchat_state.set_visible_child_name('fetching') def _on_join_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None client = app.get_client(self._contact.account) client.get_module('MUC').join(self._contact.jid) def _on_abort_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None app.window.activate_action( 'remove-chat', GLib.Variant( ===================================== gajim/gtk/main.py ===================================== @@ -50,7 +50,6 @@ from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .dialogs import ConfirmationCheckDialog -from .types import ControlT from .builder import get_builder from .util import get_app_window from .util import get_key_theme @@ -758,7 +757,7 @@ def add_app_message(self, message: Optional[str] = None) -> None: self._app_page.add_app_message(category, message) - def get_control(self) -> ControlT: + def get_control(self) -> Any: return self._chat_page.get_control() def chat_exists(self, account: str, jid: JID) -> bool: ===================================== gajim/gtk/structs.py ===================================== @@ -16,7 +16,6 @@ from typing import Any from typing import Callable -from typing import Optional import sys import inspect @@ -42,7 +41,7 @@ class OpenEventActionParams(VariantMixin): @dataclass class RemoveHistoryActionParams(VariantMixin): account: str - jid: Optional[JID] = None + jid: JID @dataclass View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6631e5636833f7d88dae9d052724dfb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6631e5636833f7d88dae9d052724dfb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] refactor: Control: fix all pyright issues
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 6631e563 by lovetox at 2022-08-09T11:24:50+02:00 refactor: Control: fix all pyright issues - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import app from gajim.common import events from gajim.common import helpers +from gajim.common import types from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import get_file_path_from_dnd_dropped_uri from gajim.common.helpers import to_user_string @@ -71,8 +72,7 @@ def __init__(self) -> None: self.handlers: dict[int, Any] = {} - self.account = None - self.contact = None + self._contact = None self._client = None self._ui = get_builder('chat_control.ui') @@ -114,6 +114,16 @@ def __init__(self) -> None: self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() + @property + def contact(self) -> types.ChatContactT: + assert self._contact is not None + return self._contact + + @property + def client(self) -> types.Client: + assert self._client is not None + return self._client + def is_loaded(self, account: str, jid: JID) -> bool: if self.contact is None: return False @@ -128,9 +138,8 @@ def clear(self) -> None: if self.contact is not None: self.contact.disconnect_all_from_obj(self) - self.contact = None - self._clinet = None - self.account = None + self._contact = None + self._client = None self.encryption = None self.last_msg_id = None self.reset_view() @@ -142,11 +151,10 @@ def switch_contact(self, contact: Union[BareContact, GroupchatParticipant]) -> None: log.info('Switch to %s (%s)', contact.jid, contact.account) - if self.contact is not None: - self.contact.disconnect_all_from_obj(self) + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) - self.contact = contact - self.account = contact.account + self._contact = contact self._client = app.get_client(contact.account) @@ -158,16 +166,16 @@ def switch_contact(self, contact: Union[BareContact, self.encryption = self.get_encryption_state() self.conversation_view.encryption_enabled = self.encryption is not None - if isinstance(self.contact, GroupchatParticipant): - self.contact.multi_connect({ + if isinstance(contact, GroupchatParticipant): + contact.multi_connect({ 'user-status-show-changed': self._on_user_status_show_changed, 'user-nickname-changed': self._on_user_nickname_changed, # 'room-kicked': self._on_room_kicked, # 'room-destroyed': self._on_room_destroyed, }) - elif isinstance(self.contact, GroupchatContact): - self.contact.multi_connect({ + elif isinstance(contact, GroupchatContact): + contact.multi_connect({ 'user-joined': self._on_user_joined, 'user-left': self._on_user_left, 'user-affiliation-changed': self._on_user_affiliation_changed, @@ -183,10 +191,10 @@ def switch_contact(self, contact: Union[BareContact, 'room-subject': self._on_room_subject, }) - self._client.get_module('Chatstate').set_active(self.contact) + self._client.get_module('Chatstate').set_active(contact) - def process_event(self, event: events.ApplicationEvent) -> None: - if event.account != self.account: + def process_event(self, event: events.MainEventT) -> None: + if event.account != self.contact.account: return if event.jid not in (self.contact.jid, self.contact.jid.bare): @@ -237,7 +245,7 @@ def _on_message_updated(self, event: events.MessageUpdated) -> None: def _on_message_moderated(self, event: events.MessageModerated) -> None: text = get_retraction_text( - self.account, + self.contact.account, event.moderation.moderator_jid, event.moderation.reason) self.conversation_view.show_message_retraction( @@ -263,7 +271,7 @@ def mark_as_read(self, send_marker: bool = True) -> None: if send_marker and self.last_msg_id is not None: # XEP-0333 Send <displayed> marker - self._client.get_module('ChatMarkers').send_displayed_marker( + self.client.get_module('ChatMarkers').send_displayed_marker( self.contact, self.last_msg_id) self.last_msg_id = None @@ -313,11 +321,11 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: def get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): - muc_data = self._client.get_module('MUC').get_muc_data( + muc_data = self.client.get_module('MUC').get_muc_data( self.contact.jid.bare) return muc_data.nick - return app.nicks[self.account] + return app.nicks[self.contact.account] def _allow_add_message(self) -> bool: # Only add messages if the view is already populated @@ -359,7 +367,7 @@ def _add_message(self, additional_data = AdditionalDataDict() chat_active = app.window.is_chat_active( - self.account, self.contact.jid) + self.contact.account, self.contact.jid) if self._allow_add_message(): self.conversation_view.add_message( @@ -393,12 +401,13 @@ def _add_message(self, self._notify(name, text, tim, additional_data) if not chat_active and notify: - if self.is_groupchat: + if isinstance(self._contact, GroupchatContact): + assert self._contact.nickname is not None needs_highlight = message_needs_highlight( text, - self.contact.nickname, - self._client.get_own_jid().bare) - if needs_highlight or self.contact.can_notify(): + self._contact.nickname, + self.client.get_own_jid().bare) + if needs_highlight or self._contact.can_notify(): set_urgency_hint(app.window, True) else: set_urgency_hint(app.window, True) @@ -409,7 +418,7 @@ def _notify(self, tim: Optional[float], additional_data: AdditionalDataDict ) -> None: - if app.window.is_chat_active(self.account, self.contact.jid): + if app.window.is_chat_active(self.contact.account, self.contact.jid): if self._scrolled_view.get_autoscroll(): return @@ -431,21 +440,22 @@ def _notify(self, msg_type = 'chat-message' sound = 'first_message_received' - if self.is_groupchat: + if isinstance(self._contact, GroupchatContact): msg_type = 'group-chat-message' - title += f' ({self.contact.name})' + title += f' ({self._contact.name})' + assert self._contact.nickname is not None needs_highlight = message_needs_highlight( - text, self.contact.nickname, self._client.get_own_jid().bare) + text, self._contact.nickname, self.client.get_own_jid().bare) if needs_highlight: sound = 'muc_message_highlight' else: sound = 'muc_message_received' - if not self.contact.can_notify() and not needs_highlight: + if not self._contact.can_notify() and not needs_highlight: return if self.is_privatechat: - room_contact = self._client.get_module('Contacts').get_contact( + room_contact = self.client.get_module('Contacts').get_contact( self.contact.jid.bare) msg_type = 'private-chat-message' title += f' (private in {room_contact.name})' @@ -460,7 +470,7 @@ def _notify(self, text = f'* {name} {text[3:]}' app.ged.raise_event( - events.Notification(account=self.account, + events.Notification(account=self.contact.account, jid=self.contact.jid, type='incoming-message', sub_type=msg_type, @@ -489,7 +499,7 @@ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: self.conversation_view.lock() self.reset_view() before, at_after = app.storage.archive.get_conversation_around( - self.account, self.contact.jid, timestamp) + self.contact.account, self.contact.jid, timestamp) self.add_messages(before) self.add_messages(at_after) @@ -517,7 +527,7 @@ def fetch_n_lines_history(self, timestamp = row.db_timestamp messages = app.storage.archive.get_conversation_before_after( - self.account, + self.contact.account, self.contact.jid, before, timestamp, @@ -582,7 +592,7 @@ def add_messages(self, messages: list[ConversationRow]): reason = msg.additional_data.get_value( 'retracted', 'reason') message_text = get_retraction_text( - self.account, retracted_by, reason) + self.contact.account, retracted_by, reason) self.conversation_view.add_message( message_text, @@ -606,8 +616,8 @@ def _on_mam_message_received(self, if event.archive_jid != self.contact.jid: return self.add_muc_message(event.msgtxt, - contact=event.properties.muc_nickname, tim=event.properties.mam.timestamp, + contact=event.properties.muc_nickname, message_id=event.properties.id, stanza_id=event.stanza_id, additional_data=event.additional_data, @@ -712,7 +722,7 @@ def _on_presence_received(self, event: events.PresenceReceived) -> None: if not app.settings.get('print_status_in_chats'): return - contact = self._client.get_module('Contacts').get_contact(event.fjid) + contact = self.client.get_module('Contacts').get_contact(event.fjid) if isinstance(contact, BareContact): return self.conversation_view.add_user_status(self.contact.name, @@ -726,6 +736,7 @@ def _on_user_nickname_changed(self, ) -> None: # TODO: check if the nick logic makes sense + return if isinstance(self.contact, GroupchatContact): nick = user_contact.name else: @@ -784,9 +795,9 @@ def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: def invite(self, invited_jid: JID) -> None: # TODO: Remove, used by command system - self._client.get_module('MUC').invite( + self.client.get_module('MUC').invite( self.contact.jid, invited_jid) - invited_contact = self._client.get_module('Contacts').get_contact( + invited_contact = self.client.get_module('Contacts').get_contact( invited_jid) self.add_info_message( _('%s has been invited to this group chat') % invited_contact.name) @@ -800,7 +811,7 @@ def _on_room_voice_request(self, assert voice_request is not None def on_approve() -> None: - self._client.get_module('MUC').approve_voice_request( + self.client.get_module('MUC').approve_voice_request( self.contact.jid, voice_request) ConfirmationDialog( @@ -823,8 +834,8 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: additional_data=event.additional_data) else: self.add_muc_message(event.msgtxt, - contact=event.properties.muc_nickname, tim=event.properties.timestamp, + contact=event.properties.muc_nickname, displaymarking=event.displaymarking, message_id=event.properties.id, stanza_id=event.stanza_id, @@ -832,8 +843,8 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: def add_muc_message(self, text: str, + tim: float, contact: str = '', - tim: Optional[float] = None, displaymarking: Optional[Displaymarking] = None, message_id: Optional[str] = None, stanza_id: Optional[str] = None, @@ -841,7 +852,9 @@ def add_muc_message(self, notify: bool = True ) -> None: - if contact == self.contact.nickname: + assert isinstance(self._contact, GroupchatContact) + + if contact == self._contact.nickname: kind = 'outgoing' else: kind = 'incoming' @@ -873,7 +886,7 @@ def _on_room_subject(self, self._subject_text_cache[contact.jid] = subject.text if (app.settings.get('show_subject_on_join') or - not self.contact.is_joining): + not contact.is_joining): self.conversation_view.add_muc_subject(subject) def _on_room_config_changed(self, @@ -897,7 +910,7 @@ def _on_room_config_changed(self, if StatusCode.CONFIG_NON_PRIVACY_RELATED in status_codes: changes.append(_('A setting not related to privacy has been ' 'changed')) - self._client.get_module('Discovery').disco_muc(self.contact.jid) + self.client.get_module('Discovery').disco_muc(self.contact.jid) if StatusCode.CONFIG_ROOM_LOGGING in status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) @@ -919,10 +932,10 @@ def _on_room_config_changed(self, self.add_info_message(change) def rejoin(self) -> None: - self._client.get_module('MUC').join(self.contact.jid) + self.client.get_module('MUC').join(self.contact.jid) def _on_user_joined(self, - _contact: GroupchatContact, + contact: GroupchatContact, _signal_name: str, user_contact: GroupchatParticipant, properties: PresenceProperties @@ -930,13 +943,13 @@ def _on_user_joined(self, nick = user_contact.name if not properties.is_muc_self_presence: - if self.contact.is_joined: + if contact.is_joined: self.conversation_view.add_muc_user_joined(nick) return status_codes = properties.muc_status_codes or [] - if not self.contact.is_joined: + if not contact.is_joined: # We just joined the room self.add_info_message(_('You (%s) joined the group chat') % nick) @@ -1137,17 +1150,21 @@ def _on_user_left(self, def _on_room_presence_error(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + properties: PresenceProperties ) -> None: + + assert properties.error is not None error_message = to_user_string(properties.error) self.add_info_message(_('Error: %s') % error_message) def _on_room_destroyed(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + properties: PresenceProperties ) -> None: + destroyed = properties.muc_destroyed + assert destroyed is not None reason = destroyed.reason reason = '' if reason is None else f': {reason}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6631e5636833f7d88dae9d052724dfb4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6631e5636833f7d88dae9d052724dfb4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 3 commits: fix: Call correct method
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 08381f70 by lovetox at 2022-08-09T09:50:32+02:00 fix: Call correct method - - - - - dced843a by lovetox at 2022-08-09T10:34:27+02:00 refactor: GroupchatRoster - - - - - 1d04c9bd by lovetox at 2022-08-09T10:35:35+02:00 fix: Banner: Fix roster toggle icon - - - - - 6 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py - gajim/gtk/chat_page.py - gajim/gtk/control.py - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="participant_store"> @@ -8,76 +8,67 @@ <column type="CairoGObjectSurface"/>  <column type="gchararray"/> -  - <column type="gboolean"/>  <column type="gboolean"/>  <column type="gchararray"/> </columns> </object> - <object class="GtkTreeView" id="roster_treeview"> + <object class="GtkScrolledWindow" id="scrolled"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">participant_store</property> - <property name="headers_visible">False</property> - <property name="expander_column">expander</property> - <property name="search_column">1</property> - <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> - <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> - <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkTreeViewColumn" id="contact_column"> - <property name="sizing">fixed</property> - <property name="fixed_width">210</property> - <property name="title">avatar</property> - <property name="expand">True</property> + <object class="GtkTreeView" id="roster_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="model">participant_store</property> + <property name="headers-visible">False</property> + <property name="expander-column">expander</property> + <property name="search-column">1</property> + <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> + <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> + <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> + <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> <child> - <object class="GtkCellRendererPixbuf" id="avatar_renderer"> - <property name="width">40</property> - <property name="ypad">3</property> - <property name="xalign">0</property> + <object class="GtkTreeViewColumn" id="contact_column"> + <property name="sizing">fixed</property> + <property name="fixed-width">210</property> + <property name="title">avatar</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererPixbuf" id="avatar_renderer"> + <property name="width">40</property> + <property name="ypad">3</property> + <property name="xalign">0</property> + </object> + <attributes> + <attribute name="visible">2</attribute> + <attribute name="surface">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="markup">1</attribute> + </attributes> + </child> </object> - <attributes> - <attribute name="visible">3</attribute> - <attribute name="surface">0</attribute> - </attributes> </child> <child> - <object class="GtkCellRendererText" id="text_renderer"> - <property name="ellipsize">end</property> + <object class="GtkTreeViewColumn" id="expander"> + <property name="visible">False</property> + <property name="sizing">fixed</property> + <property name="title">expander</property> </object> - <attributes> - <attribute name="markup">1</attribute> - </attributes> </child> </object> </child> - <child> - <object class="GtkTreeViewColumn" id="event_column"> - <property name="sizing">fixed</property> - <property name="fixed_width">35</property> - <property name="title">event</property> - <child> - <object class="GtkCellRendererPixbuf" id="icon"> - <property name="xalign">0</property> - <property name="icon_name">gajim-event</property> - </object> - <attributes> - <attribute name="visible">2</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="expander"> - <property name="visible">False</property> - <property name="sizing">fixed</property> - <property name="title">expander</property> - </object> - </child> + <style> + <class name="groupchat-roster"/> + </style> </object> </interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -210,11 +210,8 @@ class ChatBannerBuilder(Builder): class ChatControlBuilder(Builder): control_box: Gtk.Box - overlay: Gtk.Overlay conv_view_box: Gtk.Box conv_view_overlay: Gtk.Overlay - roster_revealer: Gtk.Revealer - drop_area: Gtk.Box class ChatListRowBuilder(Builder): @@ -493,12 +490,11 @@ class GroupchatOutcastBuilder(Builder): class GroupchatRosterBuilder(Builder): participant_store: Gtk.TreeStore + scrolled: Gtk.ScrolledWindow roster_treeview: Gtk.TreeView contact_column: Gtk.TreeViewColumn avatar_renderer: Gtk.CellRendererPixbuf text_renderer: Gtk.CellRendererText - event_column: Gtk.TreeViewColumn - icon: Gtk.CellRendererPixbuf expander: Gtk.TreeViewColumn ===================================== gajim/gtk/chat_banner.py ===================================== @@ -312,8 +312,9 @@ def _on_toggle_roster_clicked(self, _button: Gtk.Button) -> None: app.settings.set('hide_groupchat_occupants_list', not state) def _set_toggle_roster_button_icon(self, - show_roster: bool, + hide_roster: bool, *args: Any) -> None: - icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' + + icon = 'go-next-symbolic' if not hide_roster else 'go-previous-symbolic' self._ui.toggle_roster_image.set_from_icon_name( icon, Gtk.IconSize.BUTTON) ===================================== gajim/gtk/chat_page.py ===================================== @@ -232,7 +232,7 @@ def add_chat_for_workspace(self, client.get_module('Contacts').add_group_chat_contact(jid) elif type_ == 'pm': - client.get_module('Contacts').add_group_private_contact(jid) + client.get_module('Contacts').add_private_contact(jid) if self.chat_exists(account, jid): if select: ===================================== gajim/gtk/control.py ===================================== @@ -98,16 +98,8 @@ def __init__(self) -> None: self.fetch_n_lines_history, 20) self.roster = GroupchatRoster() - self.roster.connect('row-activated', self._on_roster_row_activated) - self._show_roster_setting = app.settings.get( - 'hide_groupchat_occupants_list') - app.settings.connect_signal( - 'hide_groupchat_occupants_list', self._show_roster) - - self._roster_revealer = Gtk.Revealer() - self._roster_revealer.add(self.roster) - self._ui.conv_view_box.add(self._roster_revealer) + self._ui.conv_view_box.add(self.roster) # Keeps track of whether the ConversationView is populated self._chat_loaded: bool = False @@ -163,10 +155,6 @@ def switch_contact(self, contact: Union[BareContact, self._groupchat_state.switch_contact(contact) self.roster.switch_contact(contact) - show_roster = (isinstance(contact, GroupchatContact) and - self._show_roster_setting) - self._roster_revealer.set_reveal_child(show_roster) - self.encryption = self.get_encryption_state() self.conversation_view.encryption_enabled = self.encryption is not None @@ -803,34 +791,6 @@ def invite(self, invited_jid: JID) -> None: self.add_info_message( _('%s has been invited to this group chat') % invited_contact.name) - def _show_roster(self, show_roster: bool, *args: Any) -> None: - self._show_roster_setting = show_roster - transition = Gtk.RevealerTransitionType.SLIDE_RIGHT - if show_roster: - self._roster_revealer.set_no_show_all(False) - self._roster_revealer.show_all() - transition = Gtk.RevealerTransitionType.SLIDE_LEFT - self._roster_revealer.set_transition_type(transition) - self._roster_revealer.set_reveal_child(show_roster) - - def _on_roster_row_activated(self, - _roster: GroupchatRoster, - nick: str - ) -> None: - - disco = self.contact.get_disco() - muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') - if disco.muc_is_nonanonymous and muc_prefer_direct_msg: - participant = self.contact.get_resource(nick) - app.window.add_chat(self.account, - participant.real_jid, - 'contact', - select=True, - workspace='current') - else: - contact = self.contact.get_resource(nick) - app.window.add_private_chat(self.account, contact.jid, select=True) - def _on_room_voice_request(self, _contact: GroupchatContact, _signal_name: str, ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -24,7 +24,6 @@ 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.structs import MessageProperties @@ -60,9 +59,8 @@ class Column(IntEnum): AVATAR = 0 TEXT = 1 - EVENT = 2 - IS_CONTACT = 3 - NICK_OR_GROUP = 4 + IS_CONTACT = 2 + NICK_OR_GROUP = 3 CONTACT_SIGNALS = { @@ -76,28 +74,17 @@ class Column(IntEnum): } -class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): - - __gsignals__ = { - 'row-activated': ( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, - (str, )) - } - +class GroupchatRoster(Gtk.Revealer, EventHelper): def __init__(self) -> None: - Gtk.ScrolledWindow.__init__(self) + Gtk.Revealer.__init__(self) EventHelper.__init__(self) - self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - self.get_style_context().add_class('groupchat-roster') self._contact = None self._tooltip = GCTooltip() self._ui = get_builder('groupchat_roster.ui') - self._ui.roster_treeview.set_model(None) - self.add(self._ui.roster_treeview) + self.add(self._ui.scrolled) self._contact_refs: dict[str, Gtk.TreeRowReference] = {} self._group_refs: dict[str, Gtk.TreeRowReference] = {} @@ -108,7 +95,6 @@ def __init__(self) -> None: 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) self._ui.contact_column.set_fixed_width( app.settings.get('groupchat_roster_width')) @@ -117,10 +103,26 @@ def __init__(self) -> None: self._ui.connect_signals(self) + app.settings.connect_signal( + 'hide_groupchat_occupants_list', self._hide_roster) + self.register_events([ ('theme-update', ged.GUI2, self._on_theme_update), ]) + self.set_no_show_all(True) + self.set_reveal_child( + not app.settings.get('hide_groupchat_occupants_list')) + + def _hide_roster(self, hide_roster: bool, *args: Any) -> None: + transition = Gtk.RevealerTransitionType.SLIDE_RIGHT + if not hide_roster: + self.show_all() + transition = Gtk.RevealerTransitionType.SLIDE_LEFT + + self.set_transition_type(transition) + self.set_reveal_child(not hide_roster) + def clear(self) -> None: log.info('Clear') if self._contact is None: @@ -133,7 +135,9 @@ def switch_contact(self, contact: types.ChatContactT) -> None: if self._contact is not None: self.clear() - if not isinstance(contact, GroupchatContact): + is_groupchat = isinstance(contact, GroupchatContact) + self.set_visible(is_groupchat) + if not is_groupchat: return log.info('Switch to %s (%s)', contact.jid, contact.account) @@ -192,6 +196,7 @@ def _search_func(model: Gtk.TreeModel, 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]: @@ -233,7 +238,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, 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 @@ -243,7 +248,7 @@ 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, True, nick]) self._contact_refs[nick] = Gtk.TreeRowReference( self._store, self._store.get_path(iter_)) @@ -260,6 +265,7 @@ def _on_user_left(self, user_contact: types.GroupchatParticipant, *args: Any ) -> None: + self._remove_contact(user_contact) self._draw_groups() @@ -269,6 +275,7 @@ def _update_contact(self, user_contact: types.GroupchatParticipant, *args: Any ) -> None: + self._remove_contact(user_contact) self._add_contact(user_contact) @@ -278,6 +285,7 @@ def _on_user_nickname_changed(self, user_contact: types.GroupchatParticipant, properties: MessageProperties ) -> None: + self._remove_contact(user_contact) user_contact = contact.get_resource(properties.muc_user.nick) @@ -289,6 +297,7 @@ def _on_user_status_show_changed(self, user_contact: types.GroupchatParticipant, *args: Any ) -> None: + self._draw_contact(user_contact.name) def _remove_contact(self, contact: types.GroupchatParticipant) -> None: @@ -323,6 +332,7 @@ def _text_cell_data_func(_column: Gtk.TreeViewColumn, iter_: Gtk.TreeIter, _user_data: Optional[object] ) -> None: + has_parent = bool(model.iter_parent(iter_)) style = 'contact' if has_parent else 'group' @@ -346,6 +356,7 @@ def _on_roster_row_activated(self, 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 @@ -353,12 +364,28 @@ def _on_roster_row_activated(self, nick = self._store[iter_][Column.NICK_OR_GROUP] if self._contact.nickname == nick: return - self.emit('row-activated', nick) + + disco = self._contact.get_disco() + assert disco is not None + muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') + if disco.muc_is_nonanonymous and muc_prefer_direct_msg: + participant = self._contact.get_resource(nick) + app.window.add_chat(self._contact.account, + participant.real_jid, + 'contact', + select=True, + workspace='current') + else: + contact = self._contact.get_resource(nick) + app.window.add_private_chat(self._contact.account, + contact.jid, + select=True) def _on_roster_button_press_event(self, treeview: Gtk.TreeView, event: Gdk.EventButton ) -> None: + if event.button not in (2, 3): return @@ -385,8 +412,8 @@ def _on_roster_button_press_event(self, rec.height, rec.width = 1, 1 self._show_contact_menu(nick, rec) - if event.button == 2: # middle click - self.emit('row-activated', nick) + # if event.button == 2: # middle click + # self.roster.emit('row-activated', nick) def _show_contact_menu(self, nick: str, rect: Gdk.Rectangle) -> None: self_contact = self._contact.get_self() @@ -427,9 +454,6 @@ def _tree_compare_iters(self, ''' is_contact = model.iter_parent(iter1) if is_contact: - # Sort contacts with pending events to top - if model[iter1][Column.EVENT] != model[iter2][Column.EVENT]: - return -1 if model[iter1][Column.EVENT] else 1 nick1 = model[iter1][Column.NICK_OR_GROUP] nick2 = model[iter2][Column.NICK_OR_GROUP] @@ -507,8 +531,6 @@ def _draw_contact(self, nick: str) -> None: self._draw_avatar(contact) - self._store[iter_][Column.EVENT] = False - name = GLib.markup_escape_text(contact.name) # Strike name if blocked @@ -562,12 +584,15 @@ def _draw_avatar(self, contact: types.GroupchatParticipant) -> None: surface = contact.get_avatar(AvatarSize.ROSTER, self.get_scale_factor()) + self._store[iter_][Column.AVATAR] = surface def _on_user_avatar_update(self, _contact: types.GroupchatContact, _signal_name: str, - user_contact: types.GroupchatParticipant): + user_contact: types.GroupchatParticipant + ) -> None: + self._draw_avatar(user_contact) def _get_total_user_count(self) -> int: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/19e86bdfdc6bd09e4947834a70d4272… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/19e86bdfdc6bd09e4947834a70d4272… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 5 commits: other: Observable: Add multi_disconnect()
by Philipp Hörist (＠lovetox) 08 Aug '22

08 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 7d4e2c9c by lovetox at 2022-08-08T23:20:36+02:00 other: Observable: Add multi_disconnect() - - - - - 92188873 by lovetox at 2022-08-08T23:27:10+02:00 other: Observable: Add disconnect_signal() - - - - - 41d327d2 by lovetox at 2022-08-08T23:28:33+02:00 refactor: ChatControl: Remove handlers for client state-changed - - - - - e12bd5d4 by lovetox at 2022-08-08T23:29:00+02:00 other: Contacts: Add get_participants() - - - - - 19e86bdf by lovetox at 2022-08-08T23:29:31+02:00 refactor: GroupchatRoster: Make it work - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/gtk/control.py - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1229,19 +1229,46 @@ def __init__(self, log_: Union[logging.Logger, LogAdapter, None] = None): self._log = log_ self._callbacks: types.ObservableCbDict = defaultdict(list) - def disconnect_signals(self) -> None: - self._callbacks = defaultdict(list) + def __disconnect(self, + obj: Any, + signals: Optional[set[str]] = None + ) -> None: + + def _remove(handlers: list[weakref.WeakMethod[types.AnyCallableT]] + ) -> None: - def disconnect_all_from_obj(self, obj: Any) -> None: - for handlers in self._callbacks.values(): for handler in list(handlers): func = handler() if func is None or func.__self__ is obj: handlers.remove(handler) + if signals is None: + for handlers in self._callbacks.values(): + _remove(handlers) + + else: + for signal in signals: + _remove(self._callbacks.get(signal, [])) + + def disconnect_signals(self) -> None: + self._callbacks = defaultdict(list) + + def multi_disconnect(self, + obj: Any, + signals: Optional[set[str]] + ) -> None: + + self.__disconnect(obj, signals) + + def disconnect_all_from_obj(self, obj: Any) -> None: + self.__disconnect(obj) + def disconnect(self, obj: Any) -> None: self.disconnect_all_from_obj(obj) + def disconnect_signal(self, obj: Any, signal: str) -> None: + self.__disconnect(obj, {signal}) + def connect_signal(self, signal_name: str, func: types.AnyCallableT) -> None: ===================================== gajim/common/modules/contacts.py ===================================== @@ -669,6 +669,11 @@ def get_resource(self, resource: str) -> GroupchatParticipant: contact = self.add_resource(resource) return contact + def get_participants(self) -> Iterator[GroupchatParticipant]: + for contact in self._resources.values(): + if contact.is_available: + yield contact + @property def name(self) -> str: client = app.get_client(self._account) ===================================== gajim/gtk/control.py ===================================== @@ -119,8 +119,6 @@ def __init__(self) -> None: self._subject_text_cache: dict[JID, str] = {} - # self._set_control_inactive() - self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -133,6 +131,8 @@ def has_active_chat(self) -> bool: return self.contact is not None def clear(self) -> None: + log.info('Clear') + if self.contact is not None: self.contact.disconnect_all_from_obj(self) @@ -149,6 +149,7 @@ def switch_contact(self, contact: Union[BareContact, GroupchatContact, GroupchatParticipant]) -> None: + log.info('Switch to %s (%s)', contact.jid, contact.account) if self.contact is not None: self.contact.disconnect_all_from_obj(self) @@ -179,7 +180,6 @@ def switch_contact(self, contact: Union[BareContact, elif isinstance(self.contact, GroupchatContact): self.contact.multi_connect({ - 'state-changed': self._on_muc_state_changed, 'user-joined': self._on_user_joined, 'user-left': self._on_user_left, 'user-affiliation-changed': self._on_user_affiliation_changed, @@ -791,17 +791,6 @@ def _on_user_status_show_changed(self, status=status) self.add_info_message(message) - def _on_muc_state_changed(self, - _contact: GroupchatContact, - _signal_name: str - ) -> None: - - if self.contact.is_joined: - self._set_control_active() - - elif self.contact.is_not_joined: - self._set_control_inactive() - def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: pass @@ -969,18 +958,6 @@ def _on_room_config_changed(self, for change in changes: self.add_info_message(change) - def _set_control_active(self) -> None: - assert self.roster is not None - self.roster.initial_draw() - self.conversation_view.update_avatars() - - def _set_control_inactive(self) -> None: - assert self.roster is not None - self.roster.enable_sort(False) - self.roster.reset() - - self._client.get_module('Chatstate').remove_delay_timeout(self.contact) - def rejoin(self) -> None: self._client.get_module('MUC').join(self.contact.jid) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -18,6 +18,7 @@ from typing import Optional import locale +import logging from enum import IntEnum from gi.repository import Gdk @@ -44,6 +45,9 @@ from .util import EventHelper +log = logging.getLogger('gajim.gui.groupchat_roster') + + AffiliationRoleSortOrder = { 'owner': 0, 'admin': 1, @@ -61,6 +65,17 @@ class Column(IntEnum): NICK_OR_GROUP = 4 +CONTACT_SIGNALS = { + 'user-affiliation-changed', + 'user-avatar-update', + 'user-joined', + 'user-left', + 'user-nickname-changed', + 'user-role-changed', + 'user-status-show-changed', +} + + class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): __gsignals__ = { @@ -107,36 +122,33 @@ def __init__(self) -> None: ]) def clear(self) -> None: - if self._contact is not None: - self._contact.disconnect_all_from_obj(self) - + log.info('Clear') + if self._contact is None: + return + self._unload_roster() + self._contact.disconnect_signal(self, 'state-changed') self._contact = None - self.reset() def switch_contact(self, contact: types.ChatContactT) -> None: - self.clear() + if self._contact is not None: + self.clear() if not isinstance(contact, GroupchatContact): return - contact.connect('user-avatar-update', self._on_user_avatar_update) - contact.connect('user-joined', self._on_user_joined) - contact.connect('user-left', self._on_user_left) - contact.connect('user-affiliation-changed', self._update_contact) - contact.connect('user-role-changed', self._update_contact) - contact.connect('user-nickname-changed', self._on_user_nickname_changed) - contact.connect('user-status-show-changed', - self._on_user_status_show_changed) + log.info('Switch to %s (%s)', contact.jid, contact.account) + + contact.connect('state-changed', self._on_muc_state_changed) self._contact = contact + if self._contact.is_joined: + self._load_roster() + @staticmethod def _on_focus_out(treeview: Gtk.TreeView, _param: Gdk.EventFocus) -> None: treeview.get_selection().unselect_all() - def _set_model(self) -> None: - self._roster.set_model(self._store) - def _query_tooltip(self, widget: Gtk.Widget, x_pos: int, @@ -393,6 +405,17 @@ def destroy(popover: Gtk.Popover) -> None: popover.connect('closed', destroy) popover.popup() + def _on_muc_state_changed(self, + contact: GroupchatContact, + _signal_name: str + ) -> None: + + if contact.is_joined: + self._load_roster() + + elif contact.is_not_joined: + self._unload_roster() + def _tree_compare_iters(self, model: Gtk.TreeModel, iter1: Gtk.TreeIter, @@ -436,15 +459,40 @@ def enable_sort(self, enable: bool) -> None: self._store.set_sort_column_id(column, Gtk.SortType.ASCENDING) - def invalidate_sort(self) -> None: - self.enable_sort(False) - self.enable_sort(True) + def _load_roster(self) -> None: + log.info('Load Roster') + self._contact.multi_connect({ + 'user-affiliation-changed': self._update_contact, + 'user-avatar-update': self._on_user_avatar_update, + 'user-joined': self._on_user_joined, + 'user-left': self._on_user_left, + 'user-nickname-changed': self._on_user_nickname_changed, + 'user-role-changed': self._update_contact, + 'user-status-show-changed': self._on_user_status_show_changed, + }) + + for participant in self._contact.get_participants(): + self._add_contact(participant) - def initial_draw(self) -> None: self.enable_sort(True) - self._set_model() + self._roster.set_model(self._store) self._roster.expand_all() + def _unload_roster(self) -> None: + log.info('Unload Roster') + self._contact.multi_disconnect(self, CONTACT_SIGNALS) + + self._roster.set_model(None) + self._store.clear() + self.enable_sort(False) + + self._contact_refs = {} + self._group_refs = {} + + def invalidate_sort(self) -> None: + self.enable_sort(False) + self.enable_sort(True) + def _redraw(self) -> None: self._roster.set_model(None) self._roster.set_model(self._store) @@ -530,8 +578,3 @@ def _get_total_user_count(self) -> int: def _on_theme_update(self, _event: ApplicationEvent) -> None: self._redraw() - - def reset(self) -> None: - self._contact_refs = {} - self._group_refs = {} - self._store.clear() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/31b3831a3cb84faf8713bbe90ef30ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/31b3831a3cb84faf8713bbe90ef30ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: fix: Remove unused imports
by Philipp Hörist (＠lovetox) 08 Aug '22

08 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 6c2b2c91 by lovetox at 2022-08-08T15:45:41+02:00 fix: Remove unused imports - - - - - 31b3831a by lovetox at 2022-08-08T16:45:11+02:00 fix: Make mark_as_read work again - - - - - 7 changed files: - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/gtk/chat_page.py - gajim/gtk/control.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py Changes: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -26,6 +26,8 @@ from gajim.common.events import DisplayedReceived from gajim.common.events import ReadStateSync from gajim.common.modules.base import BaseModule +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.structs import OutgoingMessage @@ -112,23 +114,19 @@ def _raise_event(self, name: str, properties: Any) -> None: def _send_marker(self, contact: types.ChatContactT, marker: str, - id_: str, - type_: str) -> None: + id_: str) -> None: - jid = contact.jid - if contact.is_pm_contact: - jid = contact.jid.new_as_bare() - - if type_ in ('gc', 'pm'): + if isinstance(contact, (GroupchatContact, GroupchatParticipant)): + typ = 'groupchat' if not app.settings.get_group_chat_setting( - self._account, jid, 'send_marker'): + self._account, contact.jid.new_as_bare(), 'send_marker'): return else: + typ = 'chat' if not app.settings.get_contact_setting( - self._account, jid, 'send_marker'): + self._account, contact.jid, 'send_marker'): return - typ = 'groupchat' if type_ == 'gc' else 'chat' message = OutgoingMessage(account=self._account, contact=contact, message=None, @@ -140,6 +138,6 @@ def _send_marker(self, def send_displayed_marker(self, contact: types.ChatContactT, - id_: str, - type_: str) -> None: - self._send_marker(contact, 'displayed', id_, type_) + id_: str) -> None: + + self._send_marker(contact, 'displayed', id_) ===================================== gajim/common/modules/contacts.py ===================================== @@ -21,7 +21,6 @@ from typing import overload import cairo -from gi.repository.GObject import Value from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import Role ===================================== gajim/gtk/chat_page.py ===================================== @@ -14,8 +14,6 @@ from typing import Any from typing import Literal -from typing import Optional -from typing import Generator import logging ===================================== gajim/gtk/control.py ===================================== @@ -57,7 +57,6 @@ from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint -from gajim.gui.const import ControlType from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.groupchat_roster import GroupchatRoster @@ -278,8 +277,7 @@ def mark_as_read(self, send_marker: bool = True) -> None: # XEP-0333 Send <displayed> marker self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, - self.last_msg_id, - str(self._type)) + self.last_msg_id) self.last_msg_id = None def set_encryption_state(self, encryption: Optional[str]) -> None: @@ -300,13 +298,14 @@ def _on_autoscroll_changed(self, _widget: ScrolledView, autoscroll: bool ) -> None: + if not autoscroll: self._jump_to_end_button.toggle(True) return self._jump_to_end_button.toggle(False) - if app.window.is_chat_active(self.account, self.contact.jid): - app.window.mark_as_read(self.account, self.contact.jid) + if app.window.is_chat_active(self.contact.account, self.contact.jid): + app.window.mark_as_read(self.contact.account, self.contact.jid) def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -36,7 +36,6 @@ from nbxmpp.protocol import JID from gajim.common import app -from gajim.common.client import Client from gajim.common.events import JingleRequestReceived from gajim.common.events import FileRequestReceivedEvent from gajim.common.events import FileRequestSent ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -16,7 +16,6 @@ from typing import Any from typing import Optional -from typing import cast import locale from enum import IntEnum @@ -42,7 +41,6 @@ from .menus import get_groupchat_roster_menu from .tooltips import GCTooltip from .builder import get_builder -from .types import ControlT from .util import EventHelper ===================================== gajim/gtk/main.py ===================================== @@ -792,16 +792,19 @@ def get_chat_unread_count(self, account, jid, include_silent) return count or 0 - def mark_as_read(self, account: str, jid: JID, - send_marker: bool = True) -> None: - # TODO - return + def mark_as_read(self, + account: str, + jid: JID, + send_marker: bool = True + ) -> None: + set_urgency_hint(self, False) - control = self.get_control(account, jid) - if control is not None: + control = self.get_control() + if control.has_active_chat(): # Send displayed marker and # reset jump to bottom button unread counter control.mark_as_read(send_marker=send_marker) + # Reset chat list unread counter (emits unread-count-changed) chat_list_stack = self._chat_page.get_chat_list_stack() chat_list_stack.mark_as_read(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/65d64165150af3e5bb88f40b8666877… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/65d64165150af3e5bb88f40b8666877… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Add missing whitespace after keyword
by Philipp Hörist (＠lovetox) 08 Aug '22

08 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab44dcda by lovetox at 2022-08-08T15:47:28+02:00 cq: Add missing whitespace after keyword - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -120,7 +120,7 @@ def build_intl() -> None: for filename, _, option in META_FILES: newfile = base / filename newdir = newfile.parent - if not(newdir.is_dir() or newdir.is_symlink()): + if not (newdir.is_dir() or newdir.is_symlink()): newdir.mkdir() merge(Path(filename + '.in'), newfile, option) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab44dcda0ae485ed5740f89eefb224e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab44dcda0ae485ed5740f89eefb224e6… 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