Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: ChatListStack: Typing
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 008d137f by wurstsalat at 2022-01-11T19:06:16+01:00 ChatListStack: Typing - - - - - 60b577d6 by wurstsalat at 2022-01-11T19:13:34+01:00 ChatStack: Typing - - - - - 3 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -14,6 +14,7 @@ from typing import Dict from typing import Optional +from typing import cast from gi.repository import Gtk from gi.repository import GObject @@ -101,9 +102,12 @@ def _on_visible_child_name(self, _stack: Gtk.Stack, _param: str) -> None: return if self._last_visible_child_name != 'default': - child = self.get_child_by_name(self._last_visible_child_name) - child.set_filter_text('') - self._last_visible_child_name = self.get_visible_child_name() + chat_list = cast( + ChatList, + self.get_child_by_name(self._last_visible_child_name)) + chat_list.set_filter_text('') + last_child = self.get_visible_child_name() or 'default' + self._last_visible_child_name = last_child def get_chatlist(self, workspace_id: str) -> ChatList: return self._chat_lists[workspace_id] @@ -116,7 +120,7 @@ def get_selected_chat(self) -> Optional[ChatRow]: def get_current_chat_list(self) -> Optional[ChatList]: workspace_id = self.get_visible_child_name() - if workspace_id == 'empty': + if workspace_id == 'empty' or workspace_id is None: return None return self._chat_lists[workspace_id] @@ -130,11 +134,11 @@ def is_chat_active(self, account: str, jid: JID) -> bool: return chat.is_active def _on_filter_changed(self, _filter: ChatFilter, name: str) -> None: - chat_list = self.get_visible_child() + chat_list = cast(ChatList, self.get_visible_child()) chat_list.set_filter(name) def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: - chat_list = self.get_visible_child() + chat_list = cast(ChatList, self.get_visible_child()) chat_list.set_filter_text(search_entry.get_text()) def add_chat_list(self, workspace_id: str) -> ChatList: @@ -165,12 +169,12 @@ def _on_row_selected(self, self.emit('chat-selected', row.workspace_id, row.account, row.jid) def show_chat_list(self, workspace_id: str) -> None: - current_workspace_id = self.get_visible_child_name() - if current_workspace_id == workspace_id: + cur_workspace_id = self.get_visible_child_name() + if cur_workspace_id == workspace_id: return - if current_workspace_id != 'default': - self._chat_lists[current_workspace_id].unselect_all() + if cur_workspace_id != 'default' and cur_workspace_id is not None: + self._chat_lists[cur_workspace_id].unselect_all() self.set_visible_child_name(workspace_id) @@ -213,8 +217,10 @@ def _move_chat_to_workspace(self, new_workspace_id, account, jid = param.unpack() jid = JID.from_string(jid) - current_chatlist = self.get_visible_child() + current_chatlist = cast(ChatList, self.get_visible_child()) type_ = current_chatlist.get_chat_type(account, jid) + if type_ is None: + return current_chatlist.remove_chat(account, jid) new_chatlist = self.get_chatlist(new_workspace_id) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -12,8 +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 Dict -from typing import Tuple +from typing import Any from typing import Optional from typing import Generator @@ -55,7 +54,7 @@ def __init__(self): ]) self.show_all() - self._controls: Dict[Tuple[str, JID], ControlType] = {} + self._controls: dict[tuple[str, JID], ControlType] = {} def get_control(self, account: str, jid: JID) -> Optional[ControlType]: try: @@ -138,7 +137,7 @@ def remove_chats_for_account(self, account: str) -> None: continue self.remove_chat(account, jid) - def _on_account_changed(self, *args): + def _on_account_changed(self, *args: Any) -> None: for control in self._controls.values(): control.update_account_badge() @@ -153,7 +152,7 @@ def __init__(self): 'org.gajim.Gajim-symbolic', 100, self.get_scale_factor(), - 0) + Gtk.IconLookupFlags.FORCE_SIZE) image = Gtk.Image.new_from_pixbuf(pixbuf) image.get_style_context().add_class('dim-label') self.add(image) @@ -163,5 +162,5 @@ def __init__(self): button.connect('clicked', self._on_start_chatting) self.add(button) - def _on_start_chatting(self, _button): + def _on_start_chatting(self, _button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('s', '')) ===================================== gajim/gtk/controls/base.py ===================================== @@ -147,7 +147,7 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.xml = get_builder(f'{widget_name}.ui') self.xml.connect_signals(self) - self.widget = self.xml.get_object(f'{widget_name}_hbox') + self.widget: Gtk.Box = self.xml.get_object(f'{widget_name}_hbox') self._account_badge = AccountBadge(self.account) self.xml.account_badge_box.add(self._account_badge) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ce258cf33acd040148e8f7359b4c107… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ce258cf33acd040148e8f7359b4c107… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatList: Typing
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ce258cf3 by wurstsalat at 2022-01-11T18:58:27+01:00 ChatList: Typing - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/storage/archive.py - gajim/gtk/chat_list.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -298,7 +298,7 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], return _('Member') return '' -def get_uf_relative_time(timestamp: int) -> str: +def get_uf_relative_time(timestamp: float) -> str: date_time = datetime.fromtimestamp(timestamp) now = datetime.now() timespan = now - date_time ===================================== gajim/common/storage/archive.py ===================================== @@ -453,7 +453,7 @@ def get_conversation_muc_before_after(self, def get_last_conversation_line(self, account: str, jid: JID - ) -> list[LastConversationRow]: + ) -> LastConversationRow: """ Load the last line of a conversation with jid for account. Loads messages, but no status messages or error messages. ===================================== gajim/gtk/chat_list.py ===================================== @@ -12,10 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Dict -from typing import Tuple +from __future__ import annotations from typing import Optional from typing import Any +from typing import cast +from typing import Union import logging import time @@ -34,6 +35,16 @@ from gajim.common.const import Direction from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType +from gajim.common.events import ApplicationEvent +from gajim.common.events import BookmarksReceived +from gajim.common.events import FileRequestReceivedEvent +from gajim.common.events import JingleRequestReceived +from gajim.common.events import MessageUpdated +from gajim.common.events import MessageSent +from gajim.common.events import MessageReceived +from gajim.common.events import MamMessageReceived +from gajim.common.events import GcMessageReceived +from gajim.common.events import PresenceReceived from gajim.common.i18n import _ from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_group_chat_nick @@ -41,6 +52,9 @@ from gajim.common.helpers import get_uf_relative_time from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import AdditionalDataDict +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type @@ -50,6 +64,9 @@ log = logging.getLogger('gajim.gui.chatlist') +MessageEventT = Union[MessageReceived, GcMessageReceived, MamMessageReceived] +ContactT = Union[BareContact, GroupchatContact, GroupchatParticipant] + class ChatList(Gtk.ListBox, EventHelper): def __init__(self, workspace_id: str) -> None: @@ -57,7 +74,7 @@ def __init__(self, workspace_id: str) -> None: EventHelper.__init__(self) self._workspace_id = workspace_id - self._chats: Dict[Tuple[str, JID], Any] = {} + self._chats: dict[tuple[str, JID], Any] = {} self._current_filter: str = 'all' self._current_filter_text: str = '' @@ -128,21 +145,23 @@ def mark_as_read(self, account: str, jid: JID) -> None: def emit_unread_changed(self) -> None: count = self.get_unread_count() - self.get_parent().emit('unread-count-changed', - self._workspace_id, - count) + chat_list = cast(ChatList, self.get_parent()) + chat_list.emit('unread-count-changed', + self._workspace_id, + count) def is_visible(self) -> bool: - return self.get_parent().get_property('child-widget') == self + chat_list = cast(ChatList, self.get_parent()) + return chat_list.get_property('child-widget') == self - def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Widget) -> None: GLib.source_remove(self._timer_id) def _update_timer(self) -> bool: self.update_time() return True - def _filter_func(self, row): + def _filter_func(self, row: ChatRow) -> bool: is_groupchat = row.type == 'groupchat' if self._current_filter == 'chats' and is_groupchat: return False @@ -156,7 +175,7 @@ def _filter_func(self, row): return text in row.contact_name.lower() @staticmethod - def _header_func(row, before): + def _header_func(row: ChatRow, before: ChatRow) -> None: if before is None: if row.is_pinned: row.header = RowHeaderType.PINNED @@ -182,7 +201,7 @@ def _header_func(row, before): else: row.header = None - def _sort_func(self, row1, row2): + def _sort_func(self, row1: ChatRow, row2: ChatRow) -> int: if self._mouseover: log.debug('Mouseover active, don’t sort rows') return 0 @@ -200,7 +219,10 @@ def _sort_func(self, row1, row2): # Sort by timestamp return -1 if row1.timestamp > row2.timestamp else 1 - def _on_mouse_focus_changed(self, _widget, event): + def _on_mouse_focus_changed(self, + _widget: Gtk.ListBox, + event: Gdk.EventCrossing + ) -> None: if event.type == Gdk.EventType.ENTER_NOTIFY: self._mouseover = True @@ -219,7 +241,7 @@ def _set_placeholder(self) -> None: self.set_placeholder(button) @staticmethod - def _on_start_chat_clicked(_widget): + def _on_start_chat_clicked(_button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('s', '')) def set_filter(self, name: str) -> None: @@ -258,6 +280,7 @@ def select_next_chat(self, direction: Direction, row = self.get_row_at_index(0) if row is None: return + assert isinstance(row, ChatRow) self.select_chat(row.account, row.jid) return @@ -280,6 +303,7 @@ def select_next_chat(self, direction: Direction, row = self.get_row_at_index(index) if row is None: return + assert isinstance(row, ChatRow) if row.unread_count > 0: unread_found = True break @@ -301,14 +325,17 @@ def select_next_chat(self, direction: Direction, else: last = len(self.get_children()) - 1 next_row = self.get_row_at_index(last) + assert isinstance(next_row, ChatRow) self.select_chat(next_row.account, next_row.jid) return + assert isinstance(next_row, ChatRow) self.select_chat(next_row.account, next_row.jid) def select_chat_number(self, number: int) -> None: row = self.get_row_at_index(number) if row is not None: + assert isinstance(row, ChatRow) self.select_chat(row.account, row.jid) def toggle_chat_pinned(self, account: str, jid: JID) -> None: @@ -331,8 +358,8 @@ def remove_chats_for_account(self, account: str) -> None: self.remove_chat(account, jid) self.emit_unread_changed() - def get_selected_chat(self) -> Optional[Any]: - row = self.get_selected_row() + def get_selected_chat(self) -> Optional[ChatRow]: + row = cast(ChatRow, self.get_selected_row()) if row is None: return None return row @@ -340,8 +367,8 @@ def get_selected_chat(self) -> Optional[Any]: def contains_chat(self, account: str, jid: JID) -> bool: return self._chats.get((account, jid)) is not None - def get_open_chats(self): - open_chats = [] + def get_open_chats(self) -> list[tuple[str, JID, str, bool]]: + open_chats: list[tuple[str, JID, str, bool]] = [] for key, value in self._chats.items(): open_chats.append(key + (value.type, value.is_pinned)) return open_chats @@ -350,7 +377,7 @@ def update_time(self) -> None: for _key, row in self._chats.items(): row.update_time() - def process_event(self, event): + def process_event(self, event: ApplicationEvent) -> None: if event.name in ('message-received', 'mam-message-received', 'gc-message-received'): @@ -368,10 +395,12 @@ def process_event(self, event): else: log.warning('Unhandled Event: %s', event.name) - def _on_message_received(self, event): + def _on_message_received(self, event: MessageEventT) -> None: if not event.msgtxt: return - row = self._chats.get((event.account, event.jid)) + row = self._chats.get((event.account, JID.from_string(event.jid))) + if row is None: + return nick = self._get_nick_for_received_message(event) row.set_nick(nick) if event.name == 'mam-message-received': @@ -392,8 +421,23 @@ def _on_message_received(self, event): self._add_unread(row, event) self.invalidate_sort() - def _on_message_updated(self, event): - row = self._chats.get((event.account, event.jid)) + @staticmethod + def _get_nick_for_received_message(event: MessageEventT) -> str: + nick = _('Me') + if event.properties.type.is_groupchat: + event_nick = event.properties.muc_nickname + our_nick = get_group_chat_nick(event.account, event.jid) + if event_nick != our_nick: + nick = event_nick + else: + con = app.get_client(event.account) + own_jid = con.get_own_jid() + if not own_jid.bare_match(event.properties.from_): + nick = '' + return nick + + def _on_message_updated(self, event: MessageUpdated) -> None: + row = self._chats.get((event.account, JID.from_string(event.jid))) if row is None: return @@ -409,14 +453,17 @@ def _on_message_updated(self, event): event.properties.moderation.reason) row.set_message_text(text) - def _on_message_sent(self, event): + def _on_message_sent(self, event: MessageSent) -> None: msgtext = event.message if not msgtext: return - row = self._chats.get((event.account, event.jid)) - con = app.get_client(event.account) - own_jid = con.get_own_jid() + row = self._chats.get((event.account, JID.from_string(event.jid))) + if row is None: + return + + client = app.get_client(event.account) + own_jid = client.get_own_jid() if own_jid.bare_match(event.jid): nick = '' @@ -432,47 +479,41 @@ def _on_message_sent(self, event): additional_data=event.additional_data) self.invalidate_sort() - @staticmethod - def _get_nick_for_received_message(event): - nick = _('Me') - if event.properties.type.is_groupchat: - event_nick = event.properties.muc_nickname - our_nick = get_group_chat_nick(event.account, event.jid) - if event_nick != our_nick: - nick = event_nick - else: - con = app.get_client(event.account) - own_jid = con.get_own_jid() - if not own_jid.bare_match(event.properties.from_): - nick = '' - - return nick - - def _on_presence_received(self, event): - row = self._chats.get((event.account, event.jid)) + def _on_presence_received(self, event: PresenceReceived) -> None: + row = self._chats.get((event.account, JID.from_string(event.jid))) + if row is None: + return row.update_avatar() - def _on_jingle_request_received(self, event): - content_types = [] + def _on_jingle_request_received(self, + event: JingleRequestReceived + ) -> None: + content_types: list[str] = [] for item in event.contents: content_types.append(item.media) if 'audio' in content_types or 'video' in content_types: # AV Call received - row = self._chats.get((event.account, event.jid)) + row = self._chats.get((event.account, JID.from_string(event.jid))) + if row is None: + return row.set_timestamp(time.time()) row.set_nick('') row.set_message_text( _('Call'), icon_name='call-start-symbolic') - def _on_file_request_received(self, event): - row = self._chats.get((event.account, event.jid)) + def _on_file_request_received(self, + event: FileRequestReceivedEvent + ) -> None: + row = self._chats.get((event.account, JID.from_string(event.jid))) + if row is None: + return row.set_timestamp(time.time()) row.set_nick('') row.set_message_text( _('File'), icon_name='text-x-generic-symbolic') @staticmethod - def _add_unread(row, event): + def _add_unread(row: ChatRow, event: MessageEventT) -> None: if event.properties.is_carbon_message: if event.properties.carbon.is_sent: return @@ -490,12 +531,14 @@ def _add_unread(row, event): row.add_unread(event.msgtxt) - def _on_account_changed(self, *args): - for row in self.get_children(): + def _on_account_changed(self, *args: Any) -> None: + rows = cast(list[ChatRow], self.get_children()) + for row in rows: row.update_account_identifier() - def _on_bookmarks_received(self, _event): - for row in self.get_children(): + def _on_bookmarks_received(self, _event: BookmarksReceived) -> None: + rows = cast(list[ChatRow], self.get_children()) + for row in rows: row.update_name() @@ -522,7 +565,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self.contact.connect('avatar-update', self._on_avatar_update) self.contact_name: str = self.contact.name - self.timestamp: int = 0 + self.timestamp: float = 0 self.stanza_id: Optional[str] = None self.message_id: Optional[str] = None self._unread_count: int = 0 @@ -629,6 +672,7 @@ def header(self) -> Optional[RowHeaderType]: header = self.get_header() if header is None: return None + assert isinstance(header, BaseHeader) return header.type @header.setter @@ -648,17 +692,20 @@ def header(self, type_: RowHeaderType) -> None: def is_pinned(self) -> bool: return self._pinned - def _on_button_press(self, _widget, event): + def _on_button_press(self, + _widget: Gtk.Widget, + event: Gdk.EventButton + ) -> None: if event.button == 3: # right click self._popup_menu(event) - def _popup_menu(self, event): + def _popup_menu(self, event: Gdk.EventButton): menu = get_chat_list_row_menu( self.workspace_id, self.account, self.jid, self._pinned) rectangle = Gdk.Rectangle() - rectangle.x = event.x - rectangle.y = event.y + rectangle.x = int(event.x) + rectangle.y = int(event.y) rectangle.width = rectangle.height = 1 popover = Gtk.Popover.new_from_model(self, menu) @@ -677,7 +724,10 @@ def _on_drag_begin(self, cairo.Format.ARGB32, alloc.width, alloc.height) context = cairo.Context(surface) self.draw(context) - dest_x, dest_y = widget.translate_coordinates(self, 0, 0) + coords = widget.translate_coordinates(self, 0, 0) + if coords is None: + return + dest_x, dest_y = coords surface.set_device_offset(-dest_x, -dest_y) Gtk.drag_set_icon_surface(drag_context, surface) @@ -695,10 +745,16 @@ def _on_drag_data_get(self, def toggle_pinned(self) -> None: self._pinned = not self._pinned - def _on_presence_update(self, _contact, _signal_name): + def _on_presence_update(self, + _contact: ContactT, + _signal_name: str + ) -> None: self.update_avatar() - def _on_avatar_update(self, _contact, _signal_name): + def _on_avatar_update(self, + _contact: ContactT, + _signal_name: str + ) -> None: self.update_avatar() def update_avatar(self) -> None: @@ -724,13 +780,19 @@ def update_account_identifier(self) -> None: show = len(app.settings.get_active_accounts()) > 1 self._ui.account_identifier.set_visible(show) - def _on_chatstate_update(self, contact, _signal_name): + def _on_chatstate_update(self, + contact: ContactT, + _signal_name: str + ) -> None: if contact.chatstate is None: self._ui.chatstate_image.hide() else: self._ui.chatstate_image.set_visible(contact.chatstate.is_composing) - def _on_nickname_update(self, _contact, _signal_name): + def _on_nickname_update(self, + _contact: ContactT, + _signal_name: str + ) -> None: self.update_name() def get_real_unread_count(self) -> int: @@ -746,7 +808,8 @@ def unread_count(self) -> int: def unread_count(self, value: int) -> None: self._unread_count = value self._update_unread() - self.get_parent().emit_unread_changed() + chat_list = cast(ChatList, self.get_parent()) + chat_list.emit_unread_changed() def _update_unread(self) -> None: unread_count = self._get_unread_string(self._unread_count) @@ -766,7 +829,8 @@ def add_unread(self, text: str) -> None: self._unread_count += 1 self._update_unread() - self.get_parent().emit_unread_changed() + chat_list = cast(ChatList, self.get_parent()) + chat_list.emit_unread_changed() app.storage.cache.set_unread_count( self.account, self.jid, @@ -786,7 +850,8 @@ def add_unread(self, text: str) -> None: def reset_unread(self) -> None: self._unread_count = 0 self._update_unread() - self.get_parent().emit_unread_changed() + chat_list = cast(ChatList, self.get_parent()) + chat_list.emit_unread_changed() app.storage.cache.reset_unread_count(self.account, self.jid) # Add class again in case we were mentioned previously @@ -805,14 +870,17 @@ def is_recent(self) -> bool: return True return False - def _on_state_flags_changed(self, _listboxrow, *args): + def _on_state_flags_changed(self, + _row: ChatRow, + _flags: Gtk.StateFlags + ) -> None: state = self.get_state_flags() if (state & Gtk.StateFlags.PRELIGHT) != 0: self._ui.revealer.set_reveal_child(True) else: self._ui.revealer.set_reveal_child(False) - def _on_close_button_clicked(self, _button): + def _on_close_button_clicked(self, _button: Gtk.Button) -> None: app.window.activate_action( 'remove-chat', GLib.Variant('as', [self.account, str(self.jid)])) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce258cf33acd040148e8f7359b4c1076… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce258cf33acd040148e8f7359b4c1076… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: GroupChatInviter: Typing
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 931f6f2c by wurstsalat at 2022-01-11T16:49:29+01:00 GroupChatInviter: Typing - - - - - c47fdfd5 by wurstsalat at 2022-01-11T16:52:51+01:00 GroupchatState: Typing - - - - - 8a92bddf by wurstsalat at 2022-01-11T16:56:29+01:00 GroupChatSettings: Typing - - - - - 3 changed files: - gajim/gtk/groupchat_inviter.py - gajim/gtk/groupchat_settings.py - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/gtk/groupchat_inviter.py ===================================== @@ -294,12 +294,14 @@ def _remove_new_contact_row(self) -> None: return for row in self._new_contact_rows.values(): - self._ui.contacts_listbox.remove(row) + if row is not None: + self._ui.contacts_listbox.remove(row) self._new_contact_row_visible = False def _update_new_contact_rows(self, search_text: str) -> None: for row in self._new_contact_rows.values(): - row.update_jid(search_text) + if row is not None: + row.update_jid(search_text) def _select_new_match(self, _entry: Gtk.SearchEntry, @@ -367,7 +369,7 @@ def _sort_func(row1: ContactRow, return locale.strcoll(name1.lower(), name2.lower()) def _reset(self) -> None: - def _remove(row): + def _remove(row: Gtk.ListBoxRow) -> None: self.remove(row) row.destroy() self._ui.contacts_listbox.foreach(_remove) ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -24,7 +24,7 @@ class GroupChatSettings(SettingsBox): - def __init__(self, account, jid): + def __init__(self, account: str, jid: str) -> None: SettingsBox.__init__(self, account, jid) self.get_style_context().add_class('settings-border') @@ -38,7 +38,7 @@ def __init__(self, account, jid): 'all': _('All Chat States') } - settings = [ + settings: list[Setting] = [ Setting(SettingKind.SWITCH, _('Show Join/Leave'), SettingType.GROUP_CHAT, ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -57,8 +57,8 @@ def set_not_joined(self): def set_fetching(self): self._ui.groupchat_state.set_visible_child_name('fetching') - def _on_join_clicked(self, _button): + def _on_join_clicked(self, _button: Gtk.Button) -> None: self.emit('join-clicked') - def _on_abort_clicked(self, _button): + def _on_abort_clicked(self, _button: Gtk.Button) -> None: self.emit('abort-clicked') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/618d62d1af438a11674b9361cf022e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/618d62d1af438a11674b9361cf022e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CreateGroupchatWindow: Typing
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 618d62d1 by wurstsalat at 2022-01-11T16:34:40+01:00 CreateGroupchatWindow: Typing - - - - - 2 changed files: - gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_info.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any + import logging import random @@ -19,6 +21,7 @@ from gi.repository import Gdk from nbxmpp.errors import StanzaError +from nbxmpp.task import Task from gajim.common import app from gajim.common.const import MUC_CREATION_EXAMPLES @@ -57,15 +60,15 @@ def __init__(self, account: str) -> None: self._fill_placeholders() self._ui.connect_signals(self) - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) self.show_all() self.set_focus(self._ui.address_entry) def _get_muc_service_jid(self) -> str: - con = app.connections[self._account] - return str(con.get_module('MUC').service_jid or 'muc.example.com') + client = app.get_client(self._account) + return str(client.get_module('MUC').service_jid or 'muc.example.com') def _fill_account_combo(self, account: str) -> str: accounts = app.get_enabled_accounts_with_labels(connected_only=True) @@ -106,15 +109,15 @@ def _fill_placeholders(self) -> None: self._ui.address_entry.set_placeholder_text( f'{placeholder[2]}@{server}') - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_account_combo_changed(self, combo): + def _on_account_combo_changed(self, combo: Gtk.ComboBox) -> None: self._account = combo.get_active_id() self._fill_placeholders() - def _update_entry_completion(self, entry, text): + def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: text = entry.get_text() if '@' in text: text = text.split('@', 1)[0] @@ -174,15 +177,15 @@ def _set_warning_from_error(self, error: StanzaError) -> None: def _set_warning_from_error_code(self, error_code: str) -> None: self._set_warning(MUC_DISCO_ERRORS[error_code]) - def _on_address_entry_changed(self, entry): + def _on_address_entry_changed(self, entry: Gtk.Entry) -> None: text = entry.get_text() self._update_entry_completion(entry, text) self._validate_jid(text) - def _on_address_entry_activate(self, _widget): + def _on_address_entry_activate(self, _entry: Gtk.Entry) -> None: self._on_create_clicked() - def _on_create_clicked(self, *args): + def _on_create_clicked(self, *args: Any) -> None: if not app.account_is_available(self._account): ErrorDialog( _('Not Connected'), @@ -192,12 +195,12 @@ def _on_create_clicked(self, *args): room_jid = self._ui.address_entry.get_text() self._set_processing_state(True) - con = app.connections[self._account] - con.get_module('Discovery').disco_info( + client = app.get_client(self._account) + client.get_module('Discovery').disco_info( room_jid, callback=self._disco_info_received) @ensure_not_destroyed - def _disco_info_received(self, task): + def _disco_info_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -238,5 +241,5 @@ def _create_muc(self, room_jid: str) -> None: self.destroy() - def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Widget) -> None: self._destroyed = True ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -12,7 +12,6 @@ # 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 typing import Optional import time @@ -168,7 +167,6 @@ def set_from_disco_info(self, info: DiscoInfo) -> None: else: client = app.get_client(self._account) name = get_groupchat_name(client, info.jid) - contact = client.get_module('Contacts').get_contact( info.jid, groupchat=True) surface = contact.get_avatar( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/618d62d1af438a11674b9361cf022e11… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/618d62d1af438a11674b9361cf022e11… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: GroupChatInvitation: Typing
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4319f263 by wurstsalat at 2022-01-11T15:52:29+01:00 GroupChatInvitation: Typing - - - - - 8826ebdf by wurstsalat at 2022-01-11T16:06:54+01:00 GroupchatJoin: Typing - - - - - c07f5294 by wurstsalat at 2022-01-11T16:19:20+01:00 GroupChatInfoScrolled: Typing - - - - - 3 changed files: - gajim/gtk/groupchat_info.py - gajim/gtk/groupchat_invitation.py - gajim/gtk/groupchat_join.py Changes: ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -104,8 +104,8 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): def __init__(self, account: Optional[str] = None, - width: Optional[int] = 300, - minimal: Optional[bool] = False + width: int = 300, + minimal: bool = False ) -> None: Gtk.ScrolledWindow.__init__(self) self.set_size_request(width, -1) @@ -131,7 +131,7 @@ def __init__(self, self._ui.connect_signals(self) self.show_all() - def get_account(self) -> str: + def get_account(self) -> Optional[str]: return self._account def set_account(self, account: str) -> None: @@ -166,20 +166,19 @@ def set_from_disco_info(self, info: DiscoInfo) -> None: if self._account is None: name = info.muc_name else: - con = app.connections[self._account] - name = get_groupchat_name(con, info.jid) + client = app.get_client(self._account) + name = get_groupchat_name(client, info.jid) + + contact = client.get_module('Contacts').get_contact( + info.jid, groupchat=True) + surface = contact.get_avatar( + AvatarSize.GROUP_INFO, + self.get_scale_factor()) + self._ui.avatar_image.set_from_surface(surface) + self._ui.name.set_text(name) self._ui.name.set_visible(True) - # Set avatar - client = app.get_client(self._account) - contact = client.get_module('Contacts').get_contact( - info.jid, groupchat=True) - surface = contact.get_avatar( - AvatarSize.GROUP_INFO, - self.get_scale_factor()) - self._ui.avatar_image.set_from_surface(surface) - # Set description has_desc = bool(info.muc_description) self._ui.description.set_text(info.muc_description or '') @@ -230,7 +229,7 @@ def set_from_disco_info(self, info: DiscoInfo) -> None: self._add_features(info.features) - def _add_features(self, features: List[str]) -> None: + def _add_features(self, features: list[str]) -> None: grid = self._ui.info_grid for row in range(30, 9, -1): # Remove everything from row 30 to 10 @@ -260,23 +259,23 @@ def _on_copy_address(self, _button: Gtk.Button) -> None: clipboard.set_text(f'xmpp:{self._info.jid}?join', -1) @staticmethod - def _on_activate_log_link(button): + def _on_activate_log_link(button: Gtk.LinkButton) -> int: open_uri(button.get_uri()) return Gdk.EVENT_STOP - def _on_activate_contact_link(self, button): + def _on_activate_contact_link(self, button: Gtk.LinkButton) -> int: open_uri(f'xmpp:{button.get_uri()}?message', account=self._account) return Gdk.EVENT_STOP @staticmethod - def _on_activate_subject_link(_label, uri): + def _on_activate_subject_link(_label: Gtk.Label, uri: str) -> int: # We have to use this, because the default GTK handler # is not cross-platform compatible open_uri(uri) return Gdk.EVENT_STOP @staticmethod - def _get_feature_icon(icon, tooltip: str) -> Gtk.Image: + def _get_feature_icon(icon: str, tooltip: str) -> Gtk.Image: image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) image.set_valign(Gtk.Align.CENTER) image.set_halign(Gtk.Align.END) @@ -291,7 +290,7 @@ def _get_feature_label(text: str) -> Gtk.Label: return label def _get_contact_button(self, contact: str) -> Gtk.Button: - button = Gtk.LinkButton.new(contact) + button = Gtk.LinkButton(label=contact) button.set_halign(Gtk.Align.START) button.get_style_context().add_class('link-button') button.connect('activate-link', self._on_activate_contact_link) ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -16,6 +16,7 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common.events import MucInvitation from gajim.common.i18n import _ from gajim.common.helpers import get_group_chat_nick @@ -25,7 +26,7 @@ class GroupChatInvitation(Gtk.ApplicationWindow): - def __init__(self, account, event): + def __init__(self, account: str, event: MucInvitation) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('GroupChatInvitation') self.set_application(app.app) @@ -100,7 +101,7 @@ def __init__(self, account, event): main_box.add(button_box) - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self.add(main_box) @@ -109,16 +110,16 @@ def __init__(self, account, event): self.show_all() - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_join(self, _widget): + def _on_join(self, _button: Gtk.Button) -> None: nickname = self._nick_chooser.get_text() app.interface.show_add_join_groupchat( self.account, self._room_jid, nickname=nickname) self.destroy() - def _on_decline(self, _widget): + def _on_decline(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').decline(self._room_jid, self._from) self.destroy() ===================================== gajim/gtk/groupchat_join.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 cast +from typing import Any + import logging from gi.repository import Gtk @@ -19,6 +22,7 @@ from gi.repository import Pango from nbxmpp.errors import StanzaError +from nbxmpp.task import Task from gajim.common import app from gajim.common.i18n import _ @@ -35,7 +39,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): - def __init__(self, account, jid): + def __init__(self, account: str, jid: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('GroupchatJoin') self.set_application(app.app) @@ -61,7 +65,8 @@ def __init__(self, account, jid): self._stack.add_named(ErrorPage(), 'error') self._stack.set_visible_child_name('progress') - self._stack.get_visible_child().start() + progress_page = cast(ProgressPage, self._stack.get_visible_child()) + progress_page.start() self._stack.connect('notify::visible-child-name', self._on_page_changed) @@ -84,7 +89,7 @@ def __init__(self, account, jid): self._main_box.add(join_box) - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) self.add(self._main_box) @@ -97,13 +102,13 @@ def __init__(self, account, jid): request_vcard=True, callback=self._disco_info_received) - def _on_page_changed(self, stack, _param): + def _on_page_changed(self, stack: Gtk.Stack, _param: Any) -> None: name = stack.get_visible_child_name() self._join_button.set_sensitive(name == 'info') self._nick_chooser.set_sensitive(name == 'info') @ensure_not_destroyed - def _disco_info_received(self, task): + def _disco_info_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -124,11 +129,12 @@ def _disco_info_received(self, task): else: self._set_error_from_code('not-muc-service') - def _show_error_page(self, text): - self._stack.get_child_by_name('error').set_text(text) + def _show_error_page(self, text: str) -> None: + error_page = cast(ErrorPage, self._stack.get_child_by_name('error')) + error_page.set_text(text) self._stack.set_visible_child_name('error') - def _set_error(self, error): + def _set_error(self, error: StanzaError) -> None: text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) if error.condition == 'gone': reason = error.get_text(get_rfc5646_lang()) @@ -136,26 +142,26 @@ def _set_error(self, error): text = '%s:\n%s' % (text, reason) self._show_error_page(text) - def _set_error_from_code(self, error_code): + def _set_error_from_code(self, error_code: str) -> None: self._show_error_page(MUC_DISCO_ERRORS[error_code]) - def _on_join(self, *args): + def _on_join(self, _button: Gtk.Button) -> None: nickname = self._nick_chooser.get_text() app.interface.show_add_join_groupchat( self.account, self.jid, nickname=nickname) self.destroy() - def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Widget) -> None: self._destroyed = True - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() class ErrorPage(Gtk.Box): - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=18) @@ -177,12 +183,12 @@ def __init__(self): self.add(self._error_label) self.show_all() - def set_text(self, text): + def set_text(self, text: str) -> None: self._error_label.set_text(text) class ProgressPage(Gtk.Box): - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=18) @@ -193,8 +199,8 @@ def __init__(self): self.add(self._spinner) self.show_all() - def start(self): + def start(self) -> None: self._spinner.start() - def stop(self): + def stop(self) -> None: self._spinner.stop() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/024433fba5f8a27d5ad4fca97bb70eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/024433fba5f8a27d5ad4fca97bb70eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Preferences: Typing
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f5069e82 by wurstsalat at 2022-01-11T15:19:17+01:00 Preferences: Typing - - - - - 57525a54 by wurstsalat at 2022-01-11T15:26:22+01:00 NotificationManager: Typing - - - - - fe4e4d2a by wurstsalat at 2022-01-11T15:32:50+01:00 PasswordDialog: Typing - - - - - 024433fb by wurstsalat at 2022-01-11T15:34:33+01:00 SSLErrorDialog: Typing - - - - - 7 changed files: - gajim/common/helpers.py - gajim/gtk/notification_manager.py - gajim/gtk/password_dialog.py - gajim/gtk/preferences.py - gajim/gtk/ssl_error_dialog.py - gajim/gtk/themes.py - gajim/gui_interface.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1053,7 +1053,7 @@ def open_uri(uri: Union[URI, str], account: Optional[str] = None) -> None: @catch_exceptions -def open_file(path: str) -> None: +def open_file(path: Union[str, Path]) -> None: if os.name == 'nt': os.startfile(path) else: ===================================== gajim/gtk/notification_manager.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Optional from typing import Union +from typing import cast from gi.repository import Gio from gi.repository import GLib @@ -153,7 +154,8 @@ def _deny_request(self, jid: str) -> None: self._client.get_module('Presence').unsubscribed(jid) def _get_notification_row(self, jid: str) -> Optional[NotificationRow]: - for row in self.get_children(): + rows = cast(list[NotificationRow], self.get_children()) + for row in rows: if row.jid == jid: return row return None @@ -291,7 +293,7 @@ def __init__(self, accept_button.set_valign(Gtk.Align.CENTER) accept_button.set_action_name( f'win.subscription-accept-{self._account}') - accept_button.set_action_target_value(GLib.Variant('s', str(self.jid))) + accept_button.set_action_target_value(GLib.Variant('s', self.jid)) self.grid.attach(accept_button, 3, 1, 1, 2) more_image = Gtk.Image.new_from_icon_name( @@ -299,7 +301,8 @@ def __init__(self, more_button = Gtk.MenuButton() more_button.set_valign(Gtk.Align.CENTER) more_button.add(more_image) - subscription_menu = get_subscription_menu(self._account, self.jid) + subscription_menu = get_subscription_menu( + self._account, JID.from_string(self.jid)) more_button.set_menu_model(subscription_menu) self.grid.attach(more_button, 4, 1, 1, 2) ===================================== gajim/gtk/password_dialog.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Gdk from gajim.common import app +from gajim.common.events import PasswordRequired from gajim.common.i18n import _ from gajim.common.passwords import save_password from gajim.common.passwords import KEYRING_AVAILABLE @@ -28,7 +29,7 @@ class PasswordDialog(Gtk.ApplicationWindow): - def __init__(self, account, event): + def __init__(self, account: str, event: PasswordRequired) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) @@ -43,7 +44,7 @@ def __init__(self, account, event): self.account = account self._client = app.get_client(account) - self.event = event + self._event = event self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) @@ -52,16 +53,16 @@ def __init__(self, account, event): self._process_event() - def _on_key_press(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _process_event(self): + def _process_event(self) -> None: own_jid = self._client.get_own_jid().bare account_name = app.settings.get_account_setting( self.account, 'name') - if self.event.name == 'password-required': + if self._event.name == 'password-required': self._ui.header.set_text(_('Password Required')) self._ui.message_label.set_text( _('Please enter your password for\n' @@ -74,7 +75,7 @@ def _process_event(self): if not KEYRING_AVAILABLE: self._ui.keyring_hint.show() - if self.event.name == 'client-cert-passphrase': + if self._event.name == 'client-cert-passphrase': self._ui.header.set_text(_('Certificate Password Required')) self._ui.message_label.set_text( _('Please enter your certificate password for ' @@ -82,32 +83,32 @@ def _process_event(self): 'jid': own_jid, 'account': account_name}) - def _on_ok(self, _button): + def _on_ok(self, _button: Gtk.Button) -> None: password = self._ui.pass_entry.get_text() - if self.event.name == 'password-required': + if self._event.name == 'password-required': app.settings.set_account_setting( self.account, 'savepass', self._ui.save_pass_checkbutton.get_active()) save_password(self.account, password) - self.event.on_password(password) + self._event.on_password(password) self.destroy() - if self.event.name == 'client-cert-passphrase': - self.event.conn.on_client_cert_passphrase( + if self._event.name == 'client-cert-passphrase': + self._event.conn.on_client_cert_passphrase( password, - self.event.con, - self.event.port, - self.event.secure_tuple) + self._event.con, + self._event.port, + self._event.secure_tuple) self.destroy() - def _on_cancel(self, _button): - if self.event.name == 'client-cert-passphrase': - self.event.conn.on_client_cert_passphrase( + def _on_cancel(self, _button: Gtk.Button) -> None: + if self._event.name == 'client-cert-passphrase': + self._event.conn.on_client_cert_passphrase( '', - self.event.con, - self.event.port, - self.event.secure_tuple) + self._event.con, + self._event.port, + self._event.secure_tuple) self.destroy() ===================================== gajim/gtk/preferences.py ===================================== @@ -12,6 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations +from typing import Any +from typing import Optional +from typing import cast + import logging import sys @@ -49,7 +54,7 @@ class Preferences(Gtk.ApplicationWindow): - def __init__(self): + def __init__(self) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -61,7 +66,7 @@ def __init__(self): self._ui = get_builder('preferences.ui') - self._video_preview = None + self._video_preview: Optional[VideoPreview] = None self._prefs = {} side_bar_switcher = SideBarSwitcher() @@ -116,44 +121,46 @@ def _add_prefs(self, prefs): pref_box.add(pref) self._prefs[ui_name] = pref - def _add_video_preview(self): + def _add_video_preview(self) -> None: if sys.platform == 'win32': return self._video_preview = VideoPreview() self._ui.video.add(self._video_preview.widget) - def _on_key_press(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def get_video_preview(self): + def get_video_preview(self) -> Optional[VideoPreview]: return self._video_preview @staticmethod - def _on_features_clicked(_widget, _response): + def _on_features_clicked(_widget: Gtk.InfoBar, + _response: Gtk.ResponseType + ) -> None: open_window('Features') - def update_theme_list(self): + def update_theme_list(self) -> None: self._prefs['themes'].update_theme_list() - def update_proxy_list(self): + def update_proxy_list(self) -> None: self._prefs['miscellaneous'].update_proxy_list() @staticmethod - def _check_emoji_theme(): + def _check_emoji_theme() -> None: # Ensure selected emoji theme is valid emoji_themes = helpers.get_available_emoticon_themes() settings_theme = app.settings.get('emoticons_theme') if settings_theme not in emoji_themes: app.settings.set('emoticons_theme', 'font') - def _on_destroy(self, _widget): + def _on_destroy(self, _widget: Gtk.Widget) -> None: self._prefs.clear() app.check_finalize(self) class PreferenceBox(SettingsBox): - def __init__(self, settings): + def __init__(self, settings: list[Setting]) -> None: SettingsBox.__init__(self, None) self.get_style_context().add_class('settings-border') self.set_selection_mode(Gtk.SelectionMode.NONE) @@ -166,7 +173,7 @@ def __init__(self, settings): class WindowBehaviour(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: main_window_on_startup_items = { 'always': _('Always'), @@ -193,7 +200,7 @@ def __init__(self, *args): class Chats(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: speller_desc = None if not app.is_installed('GSPELL'): @@ -243,11 +250,11 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) @staticmethod - def _speller_available(): + def _speller_available() -> bool: return app.is_installed('GSPELL') @staticmethod - def _on_use_speller(value, *args): + def _on_use_speller(value: bool, *args: Any) -> None: if not value: return @@ -261,7 +268,7 @@ def _on_use_speller(value, *args): class GroupChats(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: settings = [ Setting(SettingKind.POPOVER, @@ -320,30 +327,30 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) @staticmethod - def _on_sort_by_show_in_muc(*args): + def _on_sort_by_show_in_muc(_value: bool, *args: Any) -> None: for ctrl in app.window.get_controls(): if ctrl.is_groupchat: ctrl.roster.invalidate_sort() @staticmethod - def _on_show_status_in_roster(*args): + def _on_show_status_in_roster(_value: bool, *args: Any) -> None: for ctrl in app.window.get_controls(): if ctrl.is_groupchat: ctrl.roster.draw_contacts() @staticmethod - def _reset_join_left(button): + def _reset_join_left(button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_group_chat_settings('print_join_left', None) @staticmethod - def _reset_print_status(button): + def _reset_print_status(button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_group_chat_settings('print_status', None) class FilePreview(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: sizes = { 262144: '256 KiB', 524288: '512 KiB', @@ -407,7 +414,7 @@ def __init__(self, *args): class VisualNotifications(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: trayicon_items = { 'never': _('Hide icon'), 'on_event': _('Only show for pending events'), @@ -431,7 +438,7 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) @staticmethod - def _on_trayicon(value, *args): + def _on_trayicon(value: str, *args: Any) -> None: if value == 'never': app.interface.hide_systray() elif value == 'on_event': @@ -441,7 +448,7 @@ def _on_trayicon(value, *args): class NotificationsDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Preferences) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -463,7 +470,7 @@ def __init__(self, account, parent): class Sounds(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -484,12 +491,12 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) - def _on_manage_sounds(self, *args): + def _on_manage_sounds(self, _button: Gtk.Button) -> None: open_window('ManageSounds', transient_for=self.get_toplevel()) class StatusMessage(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -512,7 +519,7 @@ def __init__(self, *args): class AutomaticStatus(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: settings = [ Setting(SettingKind.AUTO_AWAY, @@ -534,16 +541,16 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) @staticmethod - def _get_auto_away(): + def _get_auto_away() -> bool: return app.settings.get('autoaway') @staticmethod - def _get_auto_xa(): + def _get_auto_xa() -> bool: return app.settings.get('autoxa') class AutoAwayDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Preferences) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -571,7 +578,7 @@ def __init__(self, account, parent): class AutoExtendedAwayDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Preferences) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -599,7 +606,7 @@ def __init__(self, account, parent): class Themes(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: theme_items = self._get_theme_items() @@ -631,37 +638,37 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) @staticmethod - def _get_theme_items(): + def _get_theme_items() -> list[str]: theme_items = ['default'] for settings_theme in app.css_config.themes: theme_items.append(settings_theme) return theme_items - def update_theme_list(self): + def update_theme_list(self) -> None: self.get_setting('roster_theme').update_entries(self._get_theme_items()) - def _on_edit_themes(self, *args): + def _on_edit_themes(self, _button: Gtk.Button) -> None: open_window('Themes', transient=self.get_toplevel()) @staticmethod - def _on_theme_changed(value, *args): + def _on_theme_changed(value: str, *args: Any) -> None: app.css_config.change_theme(value) app.ged.raise_event(ThemeUpdate()) app.ged.raise_event(StyleChanged()) @staticmethod - def _on_dark_theme(value, *args): + def _on_dark_theme(value: str, *args: Any) -> None: app.css_config.set_dark_theme(int(value)) app.ged.raise_event(StyleChanged()) class Emoji(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: if sys.platform not in ('win32', 'darwin'): PreferenceBox.__init__(self, []) return - emoji_themes_items = [] + emoji_themes_items: list[str] = [] for theme in helpers.get_available_emoticon_themes(): emoji_themes_items.append(theme) @@ -677,18 +684,18 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) - def _on_emoticons_theme(self, *args): + def _on_emoticons_theme(self, *args: Any) -> None: emoji_chooser.load() self._toggle_emoticons() @staticmethod - def _toggle_emoticons(): + def _toggle_emoticons() -> None: for ctrl in app.window.get_controls(): ctrl.toggle_emoticons() class Server(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: settings = [ @@ -705,7 +712,7 @@ def __init__(self, *args): class StunServerDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Preferences) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -725,7 +732,7 @@ def __init__(self, account, parent): class Audio(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: deps_installed = app.is_installed('AV') @@ -760,18 +767,18 @@ def __init__(self, *args): self.set_sensitive(deps_installed) @staticmethod - def _create_av_combo_items(items_dict): + def _create_av_combo_items(items_dict: dict[str, str]) -> dict[str, str]: items = enumerate(sorted( items_dict.items(), key=lambda x: '' if x[1].startswith('auto') else x[0].lower())) - combo_items = {} + combo_items: dict[str, str] = {} for _index, (name, value) in items: combo_items[value] = name return combo_items class Video(PreferenceBox): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: deps_installed = app.is_installed('AV') @@ -836,31 +843,33 @@ def __init__(self, *args): self.set_sensitive(deps_installed) @staticmethod - def _on_video_input_changed(_value, *args): - preview = get_app_window('Preferences').get_video_preview() + def _on_video_input_changed(_value: str, *args: Any) -> None: + pref_win = cast(Preferences, get_app_window('Preferences')) + preview = pref_win.get_video_preview() if preview is None or not preview.is_active: # changed signal gets triggered when we fill the combobox return preview.refresh() @staticmethod - def _toggle_live_preview(value, *args): - preview = get_app_window('Preferences').get_video_preview() + def _toggle_live_preview(value: bool, *args: Any) -> None: + pref_win = cast(Preferences, get_app_window('Preferences')) + preview = pref_win.get_video_preview() preview.toggle_preview(value) @staticmethod - def _create_av_combo_items(items_dict): + def _create_av_combo_items(items_dict: dict[str, str]) -> dict[str, str]: items = enumerate(sorted( items_dict.items(), key=lambda x: '' if x[1].startswith('auto') else x[0].lower())) - combo_items = {} + combo_items: dict[str, str] = {} for _index, (name, value) in items: combo_items[value] = name return combo_items class Miscellaneous(PreferenceBox): - def __init__(self, pref_window): + def __init__(self, pref_window: Preferences) -> None: self._hints_list = [ 'start_chat', ] @@ -898,30 +907,30 @@ def __init__(self, pref_window): reset_button.set_sensitive(self._check_hints_reset) @staticmethod - def _get_proxies(): + def _get_proxies() -> dict[str, str]: return {proxy: proxy for proxy in app.settings.get_proxies()} @staticmethod - def _on_proxy_edit(*args): + def _on_proxy_edit(*args: Any) -> None: open_window('ManageProxies') - def update_proxy_list(self): + def update_proxy_list(self) -> None: self.get_setting('global_proxy').update_entries(self._get_proxies()) - def _check_hints_reset(self): + def _check_hints_reset(self) -> bool: for hint in self._hints_list: - if app.settings.get('show_help_%s' % hint) is False: + if app.settings.get(f'show_help_{hint}') is False: return True return False - def _on_reset_hints(self, button): + def _on_reset_hints(self, button: Gtk.Button) -> None: for hint in self._hints_list: - app.settings.set('show_help_%s' % hint, True) + app.settings.set(f'show_help_{hint}', True) button.set_sensitive(False) class Advanced(PreferenceBox): - def __init__(self, pref_window): + def __init__(self, pref_window: Preferences) -> None: settings = [ Setting(SettingKind.SWITCH, @@ -939,13 +948,13 @@ def __init__(self, pref_window): 'clicked', self._on_advanced_config_editor) @staticmethod - def _on_debug_logging(value, *args): + def _on_debug_logging(value: bool, *args: Any) -> None: app.set_debug_mode(value) @staticmethod - def _on_open_debug_logs(*args): + def _on_open_debug_logs(*args: Any) -> None: open_file(configpaths.get('DEBUG')) @staticmethod - def _on_advanced_config_editor(*args): + def _on_advanced_config_editor(*args: Any) -> None: open_window('AdvancedConfig') ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -74,16 +74,18 @@ def _process_error(self) -> None: self._ui.connect_button.set_no_show_all(True) self._ui.connect_button.hide() - def _on_view_cert_clicked(self, _button): + def _on_view_cert_clicked(self, _button: Gtk.Button) -> None: open_window('CertificateDialog', account=self.account, transient_for=self, cert=self._cert) - def _on_add_certificate_toggled(self, checkbutton): + def _on_add_certificate_toggled(self, + checkbutton: Gtk.CheckButton + ) -> None: self._ui.connect_button.set_sensitive(checkbutton.get_active()) - def _on_connect_clicked(self, _button): + def _on_connect_clicked(self, _button: Gtk.Button) -> None: if self._ui.add_certificate_checkbutton.get_active(): app.cert_store.add_certificate(self._cert) ===================================== gajim/gtk/themes.py ===================================== @@ -16,8 +16,10 @@ from __future__ import annotations from typing import NamedTuple +from typing import Optional from typing import Any from typing import Union +from typing import cast from enum import IntEnum @@ -35,6 +37,7 @@ from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .builder import get_builder +from .preferences import Preferences from .util import get_app_window @@ -239,7 +242,7 @@ def _load_options(self) -> None: row = Option(option, value) self._ui.option_listbox.add(row) - def _add_option(self, _listbox: Gtk.ListBox, row: Gtk.ListBoxRow) -> None: + def _add_option(self, _listbox: Gtk.ListBox, row: Option) -> None: # Add theme if there is none store, _ = self._ui.theme_treeview.get_selection().get_selected() first = store.get_iter_first() @@ -298,7 +301,7 @@ def _apply_theme(theme: str) -> None: @staticmethod def _update_preferences_window() -> None: - window = get_app_window('Preferences') + window = cast(Optional[Preferences], get_app_window('Preferences')) if window is not None: window.update_theme_list() ===================================== gajim/gui_interface.py ===================================== @@ -76,6 +76,7 @@ from gajim.common.events import FileProgress from gajim.common.events import FileError from gajim.common.events import MucAdded +from gajim.common.events import PasswordRequired from gajim.common.zeroconf import connection_zeroconf from gajim.common.helpers import ask_for_status_message from gajim.common.structs import OutgoingMessage @@ -291,7 +292,7 @@ def handle_event_client_cert_passphrase(event): open_window('PasswordDialog', account=event.conn.name, event=event) @staticmethod - def handle_event_password_required(event): + def handle_event_password_required(event: PasswordRequired) -> None: open_window('PasswordDialog', account=event.conn.name, event=event) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c2feb0ef168698be519a6a711fe37dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c2feb0ef168698be519a6a711fe37dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatControl: Add visitor box with voice request button
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c2feb0ef by wurstsalat at 2022-01-11T13:57:27+01:00 GroupchatControl: Add visitor box with voice request button - - - - - 2 changed files: - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -233,6 +233,56 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="visitor_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are a visitor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="visitor_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">What does this mean?</property> + <property name="valign">center</property> + <property name="popover">visitor_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">dialog-information-symbolic</property> + </object> + </child> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="account_badge_box"> <property name="can-focus">False</property> @@ -249,7 +299,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -301,7 +351,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> @@ -2423,4 +2473,70 @@ </packing> </child> </object> + <object class="GtkPopover" id="visitor_popover"> + <property name="can-focus">False</property> + <property name="relative-to">visitor_menu_button</property> + <property name="position">bottom</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are a visitor</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">In order to write messages in this chat, you need to request voice first. +A moderator will process your request.</property> + <property name="wrap">True</property> + <property name="max-width-chars">30</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Request</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">center</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_request_voice_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="padding-6"/> + </style> + </object> + </child> + </object> </interface> ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -40,6 +40,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking from nbxmpp.modules.vcard_temp import VCard +from nbxmpp.structs import PresenceProperties from gi.repository import Gtk from gi.repository import Gdk @@ -55,6 +56,8 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.structs import OutgoingMessage from gajim.gui.controls.base import BaseControl @@ -310,7 +313,7 @@ def add_actions(self) -> None: act.connect("activate", func) app.window.add_action(act) - def update_actions(self, *args): + def update_actions(self, *args: Any) -> None: joined = self.contact.is_joined if joined: contact = self.contact.get_self() @@ -564,10 +567,17 @@ def _on_configure_form_received(self, task): return GroupchatConfig(self.account, result.jid, 'owner', result.form) - def _on_request_voice(self, _action, _param): - """ - Request voice in the current room - """ + def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: + self._request_voice() + self.xml.visitor_popover.popdown() + + def _on_request_voice(self, + _action: Gio.SimpleAction, + _param: Optional[GLib.Variant] + ) -> None: + self._request_voice() + + def _request_voice(self) -> None: self._client.get_module('MUC').request_voice(self.room_jid) def _on_execute_command(self, _action, param): @@ -882,7 +892,9 @@ def _set_message_input_sensitive(self, state: bool) -> None: def _set_control_active(self) -> None: contact = self.contact.get_self() - if not contact.role.is_visitor: + if contact.role.is_visitor: + self.xml.visitor_box.show() + else: self._set_message_input_sensitive(True) self.roster.initial_draw() @@ -892,6 +904,7 @@ def _set_control_active(self) -> None: def _set_control_inactive(self) -> None: self._set_message_input_sensitive(False) + self.xml.visitor_box.hide() self.roster.enable_sort(False) self.roster.clear() @@ -971,10 +984,11 @@ def _on_user_status_show_changed(self, properties.is_muc_self_presence) def _on_user_affiliation_changed(self, - _contact, - _signal_name, - user_contact, - properties): + _contact: GroupchatContact, + _signal_name: str, + user_contact: GroupchatParticipant, + properties: PresenceProperties + ) -> None: affiliation = helpers.get_uf_affiliation(user_contact.affiliation) nick = user_contact.name reason = properties.muc_user.reason @@ -1002,10 +1016,11 @@ def _on_user_affiliation_changed(self, self.update_actions() def _on_user_role_changed(self, - _contact, - _signal_name, - user_contact, - properties): + _contact: GroupchatContact, + _signal_name: str, + user_contact: GroupchatParticipant, + properties: PresenceProperties + ) -> None: role = helpers.get_uf_role(user_contact.role) nick = user_contact.name reason = properties.muc_user.reason @@ -1016,6 +1031,10 @@ def _on_user_role_changed(self, actor = '' if actor is None else _(' by {actor}').format(actor=actor) if properties.is_muc_self_presence: + if user_contact.role.is_visitor: + self.xml.visitor_box.show() + else: + self.xml.visitor_box.hide() self._set_message_input_sensitive(not user_contact.role.is_visitor) message = _('** Your Role has been set to ' '{role}{actor}{reason}').format(role=role, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c2feb0ef168698be519a6a711fe37dca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c2feb0ef168698be519a6a711fe37dca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Fix using real jid for adding PM contact
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2cc53297 by wurstsalat at 2022-01-11T11:38:14+01:00 ChatControl: Fix using real jid for adding PM contact - - - - - 1 changed file: - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -286,9 +286,14 @@ def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE - def _on_add_to_roster(self, _action, _param): - open_window('AddContact', account=self.account, - jid=self.contact.jid) + def _on_add_to_roster(self, + _action: Gio.SimpleAction, + _param: Optional[GLib.Variant] + ) -> None: + jid = self.contact.jid + if self.type.is_privatechat and self.contact.real_jid is not None: + jid = self.contact.real_jid + open_window('AddContact', account=self.account, jid=jid) def _on_block_contact(self, _action, _param): app.window.block_contact(self.account, self.contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cc532976506b242a8c57703aac1b0b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cc532976506b242a8c57703aac1b0b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Freeze pylint version
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5bf5a18f by lovetox at 2022-01-11T00:39:26+01:00 CI: Freeze pylint version - - - - - 1 changed file: - docker/requirements.txt Changes: ===================================== docker/requirements.txt ===================================== @@ -1,7 +1,7 @@ PyGObject pycairo>=1.20 mypy -pylint +pylint==2.12.2 codespell coverage css-parser View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5bf5a18f80130a1c12b12c75b0dabb4a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5bf5a18f80130a1c12b12c75b0dabb4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Dockerfile
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ca8036e8 by lovetox at 2022-01-11T00:35:44+01:00 Update Dockerfile - - - - - 1 changed file: - docker/Dockerfile Changes: ===================================== docker/Dockerfile ===================================== @@ -8,6 +8,7 @@ RUN apt-get install -y appstream-util RUN apt-get install -y libgirepository1.0-dev RUN apt-get install -y gir1.2-gtk-3.0 RUN apt-get install -y gir1.2-soup-2.4 +RUN apt-get install -y gir1.2-ayatanaappindicator3-0.1 RUN apt-get install -y gettext RUN apt-get install -y nodejs RUN apt-get install -y npm View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca8036e8c1713f1e1b15a9b92b2e4fb8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca8036e8c1713f1e1b15a9b92b2e4fb8… 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