Commits

commits@gajim.org

17632 discussions

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

24 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3f01dab2 by wurstsalat at 2022-01-24T22:28:02+01:00 Tooltips: Typing - - - - - e4679df6 by wurstsalat at 2022-01-24T22:28:20+01:00 Update pyrightconfig - - - - - 5872a43e by wurstsalat at 2022-01-24T22:30:37+01:00 StartChat: Typing - - - - - 3 changed files: - gajim/gtk/start_chat.py - gajim/gtk/tooltips.py - pyrightconfig.json Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -12,10 +12,19 @@ # 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 cast +from typing import Any +from typing import Generator +from typing import Optional +from typing import Union + import locale from enum import IntEnum from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango @@ -25,8 +34,13 @@ from nbxmpp.errors import StanzaError from nbxmpp.errors import TimeoutStanzaError from nbxmpp.errors import CancelledError +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import MuclumbusItem +from nbxmpp.structs import MuclumbusResult +from nbxmpp.task import Task from gajim.common import app +from gajim.common.const import Direction from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string from gajim.common.helpers import get_group_chat_nick @@ -35,6 +49,8 @@ from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.modules.util import as_task +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact from .menus import get_start_chat_row_menu from .chat_filter import ChatFilter @@ -44,6 +60,8 @@ from .util import get_icon_name from .util import AccountBadge +ContactT = Union[BareContact, GroupchatContact] + class Search(IntEnum): CONTACT = 0 @@ -51,7 +69,7 @@ class Search(IntEnum): class StartChatDialog(Gtk.ApplicationWindow): - def __init__(self): + def __init__(self) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) @@ -61,12 +79,12 @@ def __init__(self): self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_default_size(-1, 600) self.ready_to_destroy = False - self._parameter_form = None - self._keywords = [] + self._parameter_form: Optional[MuclumbusResult] = None + self._keywords: list[str] = [] self._destroyed = False self._search_stopped = False self._redirected = False - self._source_id = None + self._source_id: Optional[int] = None self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -75,23 +93,23 @@ def __init__(self): self._ui.join_box.pack_start(self._nick_chooser, True, False, 0) # Helper for the case where we don't receive a disco info - self._new_chat_row = None + self._new_chat_row: Optional[ContactRow] = None self.new_contact_row_visible = False - self.new_contact_rows = {} + self.new_contact_rows: dict[str, Optional[ContactRow]] = {} self._accounts = app.get_enabled_accounts_with_labels() - rows = [] + rows: list[ContactRow] = [] self._add_accounts() self._add_contacts(rows) self._add_groupchats(rows) - self._ui.search_entry.connect('search-changed', - self._on_search_changed) - self._ui.search_entry.connect('next-match', - self._select_new_match, 'next') - self._ui.search_entry.connect('previous-match', - self._select_new_match, 'prev') + self._ui.search_entry.connect( + 'search-changed', self._on_search_changed) + self._ui.search_entry.connect( + 'next-match', self._select_new_match, Direction.NEXT) + self._ui.search_entry.connect( + 'previous-match', self._select_new_match, Direction.PREV) self._ui.search_entry.connect( 'stop-search', lambda *args: self._ui.search_entry.set_text('')) @@ -125,23 +143,23 @@ def __init__(self): if rows: self._load_contacts(rows) - def set_search_text(self, text): + def set_search_text(self, text: str) -> None: self._ui.search_entry.set_text(text) def remove_row(self, account: str, jid: str) -> None: - for row in self._ui.listbox.get_children(): + for row in cast(list[ContactRow], self._ui.listbox.get_children()): if row.account == account and row.jid == jid: row.destroy() return - def _global_search_active(self): + def _global_search_active(self) -> bool: return self._ui.global_search_toggle.get_active() - def _add_accounts(self): + def _add_accounts(self) -> None: for account in self._accounts: self._ui.account_store.append([None, *account]) - def _add_contacts(self, rows): + def _add_contacts(self, rows: list[ContactRow]): show_account = len(self._accounts) > 1 for account, _label in self._accounts: self.new_contact_rows[account] = None @@ -161,7 +179,7 @@ def _add_contacts(self, rows): _('Note to myself'), show_account)) - def _add_groupchats(self, rows): + def _add_groupchats(self, rows: list[ContactRow]) -> None: show_account = len(self._accounts) > 1 for account, _label in self._accounts: client = app.get_client(account) @@ -176,12 +194,14 @@ def _add_groupchats(self, rows): show_account, groupchat=True)) - def _load_contacts(self, rows): + def _load_contacts(self, rows: list[ContactRow]) -> None: generator = self._incremental_add(rows) self._source_id = GLib.idle_add(lambda: next(generator, False), priority=GLib.PRIORITY_LOW) - def _incremental_add(self, rows): + def _incremental_add(self, + rows: list[ContactRow] + ) -> Generator[bool, None, None]: for row in rows: self._ui.listbox.add(row) yield True @@ -189,23 +209,26 @@ def _incremental_add(self, rows): self._ui.listbox.set_sort_func(self._sort_func, None) self._source_id = None - def _on_page_changed(self, stack, _param): + def _on_page_changed(self, stack: Gtk.Stack, _param: Any) -> None: if stack.get_visible_child_name() == 'account': self._ui.account_view.grab_focus() - def _on_row_activated(self, _listbox, row): + def _on_row_activated(self, + _listbox: Gtk.ListBox, + row: ContactRow + ) -> None: if self._current_listbox_is(Search.GLOBAL): self._select_muc() else: self._start_new_chat(row) - def _select_muc(self): + def _select_muc(self) -> None: if len(self._accounts) > 1: self._ui.stack.set_visible_child_name('account') else: self._on_select_clicked() - def _on_key_press(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> int: is_search = self._ui.stack.get_visible_child_name() == 'search' if event.keyval in (Gdk.KEY_Down, Gdk.KEY_Tab): if not is_search: @@ -295,25 +318,28 @@ def _on_key_press(self, _widget, event): self._ui.search_entry.grab_focus_without_selecting() return Gdk.EVENT_PROPAGATE - def _on_infobar_response(self, _widget, response): + def _on_infobar_response(self, + _widget: Gtk.InfoBar, + response: Gtk.ResponseType + ) -> None: if response == Gtk.ResponseType.CLOSE: self._ui.infobar.set_revealed(False) app.settings.set('show_help_start_chat', False) - def _on_filter_bar_toggled(self, toggle_button): + def _on_filter_bar_toggled(self, toggle_button: Gtk.ToggleButton) -> None: active = toggle_button.get_active() self._ui.filter_bar_revealer.set_reveal_child(active) - def _on_chat_filter_changed(self, _filter, name): + def _on_chat_filter_changed(self, _filter: ChatFilter, name: str) -> None: self._current_filter = name self._ui.listbox.invalidate_filter() - def _start_new_chat(self, row): - if row.new: + def _start_new_chat(self, row: ContactRow) -> None: + if row.is_new: try: validate_jid(row.jid) except ValueError as error: - self._show_error_page(error) + self._show_error_page(str(error)) return self._disco_info(row) @@ -334,7 +360,7 @@ def _start_new_chat(self, row): self.ready_to_destroy = False self._redirected = False - self._disco_muc(row.account, jid, request_vcard=row.new) + self._disco_muc(row.account, jid, request_vcard=row.is_new) else: app.window.add_chat( @@ -346,7 +372,7 @@ def _start_new_chat(self, row): self.ready_to_destroy = True self.destroy() - def _disco_info(self, row): + def _disco_info(self, row: ContactRow) -> None: if not app.account_is_available(row.account): # Account is disconnected: offer to open 1:1 chat anyway self._new_chat_row = row @@ -361,10 +387,10 @@ def _disco_info(self, row): user_data=row, timeout=10) - def _disco_info_received(self, task): - row = task.get_user_data() + def _disco_info_received(self, task: Task) -> None: + row = cast(ContactRow, task.get_user_data()) try: - result = task.finish() + result = cast(DiscoInfo, task.finish()) except StanzaError as error: contact_conditions = [ 'service-unavailable', # Prosody @@ -393,11 +419,12 @@ def _disco_info_received(self, task): row.update_chat_type() self._start_new_chat(row) - def _on_no_disco_continue(self, _button): + def _on_no_disco_continue(self, _button: Gtk.Button) -> None: + assert self._new_chat_row self._new_chat_row.update_chat_type() self._start_new_chat(self._new_chat_row) - def _disco_muc(self, account, jid, request_vcard): + def _disco_muc(self, account: str, jid: JID, request_vcard: bool) -> None: self._ui.stack.set_visible_child_name('progress') client = app.get_client(account) client.get_module('Discovery').disco_muc( @@ -407,9 +434,9 @@ def _disco_muc(self, account, jid, request_vcard): callback=self._muc_disco_info_received, user_data=account) - def _muc_disco_info_received(self, task): + def _muc_disco_info_received(self, task: Task) -> None: try: - result = task.finish() + result = cast(DiscoInfo, task.finish()) except StanzaError as error: self._set_error(error) return @@ -426,35 +453,36 @@ def _muc_disco_info_received(self, task): else: self._set_error_from_code('not-muc-service') - 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()) if reason: - text = '%s:\n%s' % (text, reason) + text = f'{text}:\n{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 _show_error_page(self, text): + def _show_error_page(self, text: str) -> None: self._ui.error_label.set_text(str(text)) self._ui.stack.set_visible_child_name('error') - def _on_join_clicked(self, _button=None): + def _on_join_clicked(self, *args: Any) -> None: account = self._muc_info_box.get_account() jid = self._muc_info_box.get_jid() nickname = self._nick_chooser.get_text() - - app.interface.show_add_join_groupchat(account, jid, nickname=nickname) + assert account + app.interface.show_add_join_groupchat( + account, str(jid), nickname=nickname) self.ready_to_destroy = True self.destroy() - def _on_back_clicked(self, _button=None): + def _on_back_clicked(self, *args: Any) -> None: self._ui.stack.set_visible_child_name('search') - def _on_select_clicked(self, *args): + def _on_select_clicked(self, *args: Any) -> None: model, iter_ = self._ui.account_view.get_selection().get_selected() if iter_ is not None: account = model[iter_][1] @@ -463,7 +491,8 @@ def _on_select_clicked(self, *args): else: return - selected_row = self._global_search_listbox.get_selected_row() + selected_row = cast( + ResultRow, self._global_search_listbox.get_selected_row()) if selected_row is None: return @@ -475,7 +504,7 @@ def _on_select_clicked(self, *args): self._redirected = False self._disco_muc(account, selected_row.jid, request_vcard=True) - def _set_listbox(self, listbox): + def _set_listbox(self, listbox: Gtk.ListBox): if self._current_listbox == listbox: return viewport = self._ui.scrolledwindow.get_child() @@ -484,12 +513,12 @@ def _set_listbox(self, listbox): self._ui.scrolledwindow.add(listbox) self._current_listbox = listbox - def _current_listbox_is(self, box): + def _current_listbox_is(self, box: Search) -> bool: if self._current_listbox == self._ui.listbox: return box == Search.CONTACT return box == Search.GLOBAL - def _on_global_search_toggle(self, button): + def _on_global_search_toggle(self, button: Gtk.ToggleButton) -> None: self._ui.search_entry.grab_focus() image_style_context = button.get_children()[0].get_style_context() if button.get_active(): @@ -508,7 +537,7 @@ def _on_global_search_toggle(self, button): self._set_listbox(self._ui.listbox) self._global_search_listbox.remove_all() - def _on_search_changed(self, entry): + def _on_search_changed(self, entry: Gtk.SearchEntry) -> None: if self._global_search_active(): return @@ -520,37 +549,43 @@ def _on_search_changed(self, entry): self._remove_new_jid_row() self._ui.listbox.invalidate_filter() - def _add_new_jid_row(self): + def _add_new_jid_row(self) -> None: if self.new_contact_row_visible: return for account in self.new_contact_rows: show_account = len(self._accounts) > 1 - row = ContactRow(account, None, '', None, show_account) + row = ContactRow(account, None, None, None, show_account) self.new_contact_rows[account] = row self._ui.listbox.add(row) - row.get_parent().show_all() + listbox = cast(Gtk.ListBox, row.get_parent()) + listbox.show_all() self.new_contact_row_visible = True - def _remove_new_jid_row(self): + def _remove_new_jid_row(self) -> None: if not self.new_contact_row_visible: return for row in self.new_contact_rows.values(): - self._ui.listbox.remove(row) + if row is not None: + row.destroy() self.new_contact_row_visible = False - def _update_new_jid_rows(self, search_text): + def _update_new_jid_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(JID.from_string(search_text)) - def _select_new_match(self, _entry, direction): + def _select_new_match(self, + _entry: Gtk.Entry, + direction: Direction + ) -> None: selected_row = self._ui.listbox.get_selected_row() if selected_row is None: return index = selected_row.get_index() - if direction == 'next': + if direction == Direction.NEXT: index += 1 else: index -= 1 @@ -563,19 +598,19 @@ def _select_new_match(self, _entry, direction): self._ui.listbox.select_row(new_selected_row) new_selected_row.grab_focus() return - if direction == 'next': + if direction == Direction.NEXT: index += 1 else: index -= 1 - def select_first_row(self): + def select_first_row(self) -> None: first_row = self._ui.listbox.get_row_at_y(0) self._ui.listbox.select_row(first_row) - def _scroll_to_first_row(self): + def _scroll_to_first_row(self) -> None: self._ui.scrolledwindow.get_vadjustment().set_value(0) - def _filter_func(self, row, _user_data): + def _filter_func(self, row: ContactRow, _user_data: Any) -> bool: search_text = self._ui.search_entry.get_text().lower() search_text_list = search_text.split() row_text = row.get_search_text().lower() @@ -589,20 +624,20 @@ def _filter_func(self, row, _user_data): for text in search_text_list: if text not in row_text: GLib.timeout_add(50, self.select_first_row) - return None + return False GLib.timeout_add(50, self.select_first_row) return True @staticmethod - def _sort_func(row1, row2, _user_data): + def _sort_func(row1: ContactRow, row2: ContactRow, _user_data: Any) -> int: name1 = row1.get_search_text() name2 = row2.get_search_text() account1 = row1.account account2 = row2.account is_groupchat1 = row1.groupchat is_groupchat2 = row2.groupchat - new1 = row1.new - new2 = row2.new + new1 = row1.is_new + new2 = row2.is_new result = locale.strcoll(account1.lower(), account2.lower()) if result != 0: @@ -616,27 +651,27 @@ def _sort_func(row1, row2, _user_data): return locale.strcoll(name1.lower(), name2.lower()) - def _start_search(self): + def _start_search(self) -> None: self._search_stopped = False accounts = app.get_connected_accounts() if not accounts: return - con = app.connections[accounts[0]].connection + client = app.connections[accounts[0]].connection text = self._ui.search_entry.get_text().strip() self._global_search_listbox.start_search() if app.settings.get('muclumbus_api_pref') == 'http': - self._start_http_search(con, text) + self._start_http_search(client, text) else: - self._start_iq_search(con, text) + self._start_iq_search(client, text) @as_task - def _start_iq_search(self, con, text): + def _start_iq_search(self, client, text): _task = yield if self._parameter_form is None: - result = yield con.get_module('Muclumbus').request_parameters( + result = yield client.get_module('Muclumbus').request_parameters( app.settings.get('muclumbus_api_jid')) self._process_search_result(result, parameters=True) @@ -646,14 +681,14 @@ def _start_iq_search(self, con, text): self._parameter_form.vars['q'].value = text - result = yield con.get_module('Muclumbus').set_search( + result = yield client.get_module('Muclumbus').set_search( app.settings.get('muclumbus_api_jid'), self._parameter_form) self._process_search_result(result) while not result.end: - result = yield con.get_module('Muclumbus').set_search( + result = yield client.get_module('Muclumbus').set_search( app.settings.get('muclumbus_api_jid'), self._parameter_form, items_per_page=result.max, @@ -664,18 +699,18 @@ def _start_iq_search(self, con, text): self._global_search_listbox.end_search() @as_task - def _start_http_search(self, con, text): + def _start_http_search(self, client, text): _task = yield self._keywords = text.split(' ') - result = yield con.get_module('Muclumbus').set_http_search( + result = yield client.get_module('Muclumbus').set_http_search( app.settings.get('muclumbus_api_http_uri'), self._keywords) self._process_search_result(result) while not result.end: - result = yield con.get_module('Muclumbus').set_http_search( + result = yield client.get_module('Muclumbus').set_http_search( app.settings.get('muclumbus_api_http_uri'), self._keywords, after=result.last) @@ -684,11 +719,15 @@ def _start_http_search(self, con, text): self._global_search_listbox.end_search() - def _process_search_result(self, result, parameters=False): + def _process_search_result(self, + result: MuclumbusResult, + parameters: bool = False + ) -> None: if self._search_stopped: raise CancelledError() if is_error(result): + assert isinstance(result, StanzaError) self._global_search_listbox.remove_progress() self._show_error_page(to_user_string(result)) raise result @@ -699,7 +738,7 @@ def _process_search_result(self, result, parameters=False): for item in result.items: self._global_search_listbox.add(ResultRow(item)) - def _destroy(self, *args): + def _destroy(self, *args: Any) -> None: if self._source_id is not None: GLib.source_remove(self._source_id) self._destroyed = True @@ -707,8 +746,14 @@ def _destroy(self, *args): class ContactRow(Gtk.ListBoxRow): - def __init__(self, account, contact, jid, name, show_account, - groupchat=False): + def __init__(self, + account: str, + contact: Optional[ContactT], + jid: Optional[JID], + name: Optional[str], + show_account: bool, + groupchat: bool = False + ) -> None: Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('start-chat-row') self.account = account @@ -718,7 +763,7 @@ def __init__(self, account, contact, jid, name, show_account, self.contact = contact self.name = name self.groupchat = groupchat - self.new = jid == '' + self.is_new = bool(jid is None) grid = Gtk.Grid() grid.set_column_spacing(12) @@ -767,7 +812,10 @@ def __init__(self, account, contact, jid, name, show_account, self.add(eventbox) self.show_all() - def _popup_menu(self, _widget, event): + def _popup_menu(self, + _widget: Gtk.EventBox, + event: Gdk.EventButton + ) -> None: if not self.groupchat: return @@ -777,8 +825,8 @@ def _popup_menu(self, _widget, event): menu = get_start_chat_row_menu(self.account, self.jid) 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) @@ -787,8 +835,8 @@ def _popup_menu(self, _widget, event): popover.set_pointing_to(rectangle) popover.popup() - def _get_avatar_image(self, contact): - if self.new: + def _get_avatar_image(self, contact: ContactT) -> Gtk.Image: + if self.is_new: icon_name = 'avatar-default' if self.groupchat: icon_name = get_icon_name('muc-inactive') @@ -796,34 +844,35 @@ def _get_avatar_image(self, contact): scale = self.get_scale_factor() surface = contact.get_avatar(AvatarSize.CHAT, scale) + assert not isinstance(surface, GdkPixbuf.Pixbuf) return Gtk.Image.new_from_surface(surface) - def update_jid(self, jid): + def update_jid(self, jid: JID) -> None: self.jid = jid - self.jid_label.set_text(jid) + self.jid_label.set_text(str(jid)) - def update_chat_type(self, groupchat=False): - self.new = False + def update_chat_type(self, groupchat: bool = False) -> None: + self.is_new = False self.groupchat = groupchat - def get_search_text(self): + def get_search_text(self) -> str: if self.contact is None and not self.groupchat: return str(self.jid) if self.show_account: - return '%s %s %s' % (self.name, self.jid, self.account_label) - return '%s %s' % (self.name, self.jid) + return f'{self.name} {self.jid} {self.account_label}' + return f'{self.name} {self.jid}' class GlobalSearch(Gtk.ListBox): - def __init__(self): + def __init__(self) -> None: Gtk.ListBox.__init__(self) self.set_has_tooltip(True) self.set_activate_on_single_click(False) - self._progress = None + self._progress: Optional[ProgressRow] = None self._add_placeholder() self.show_all() - def _add_placeholder(self): + def _add_placeholder(self) -> None: placeholder = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=12) placeholder.set_halign(Gtk.Align.CENTER) placeholder.set_valign(Gtk.Align.CENTER) @@ -840,39 +889,41 @@ def _add_placeholder(self): placeholder.show_all() self.set_placeholder(placeholder) - def remove_all(self): - def remove(row): - self.remove(row) + def remove_all(self) -> None: + def remove(row: Gtk.ListBoxRow) -> None: row.destroy() self.foreach(remove) - def remove_progress(self): + def remove_progress(self) -> None: + assert self._progress self.remove(self._progress) self._progress.destroy() - def start_search(self): + def start_search(self) -> None: self._progress = ProgressRow() super().add(self._progress) - def end_search(self): + def end_search(self) -> None: + assert self._progress self._progress.stop() - def add(self, row): + def add(self, row: ResultRow) -> None: super().add(row) if self.get_selected_row() is None: - row = self.get_row_at_index(1) - if row is not None: - self.select_row(row) - row.grab_focus() + row_ = self.get_row_at_index(1) + if row_ is not None: + self.select_row(row_) + row_.grab_focus() + assert self._progress self._progress.update() - def _select(self, direction): + def _select(self, direction: Direction) -> None: selected_row = self.get_selected_row() if selected_row is None: return index = selected_row.get_index() - if direction == 'next': + if direction == Direction.NEXT: index += 1 else: index -= 1 @@ -884,20 +935,20 @@ def _select(self, direction): self.select_row(new_selected_row) new_selected_row.grab_focus() - def select_next(self): - self._select('next') + def select_next(self) -> None: + self._select(Direction.NEXT) - def select_prev(self): - self._select('prev') + def select_prev(self) -> None: + self._select(Direction.PREV) class ResultRow(Gtk.ListBoxRow): - def __init__(self, item): + def __init__(self, item: MuclumbusItem) -> None: Gtk.ListBoxRow.__init__(self) self.set_activatable(True) self.get_style_context().add_class('start-chat-row') - self.new = False - self.jid = item.jid + self.is_new = False + self.jid = JID.from_string(item.jid) self.groupchat = True name_label = Gtk.Label(label=item.name) @@ -918,7 +969,7 @@ def __init__(self, item): class ProgressRow(Gtk.ListBoxRow): - def __init__(self): + def __init__(self) -> None: Gtk.ListBoxRow.__init__(self) self.set_selectable(False) self.set_activatable(False) @@ -942,11 +993,11 @@ def __init__(self): self.add(box) self.show_all() - def update(self): + def update(self) -> None: self._count += 1 self._count_label.set_text(self._text % self._count) - def stop(self): + def stop(self) -> None: self._spinner.stop() self._spinner.hide() self._finished_image.show() ===================================== gajim/gtk/tooltips.py ===================================== @@ -31,6 +31,7 @@ import logging from datetime import datetime +from gi.repository import GdkPixbuf from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango @@ -152,6 +153,7 @@ def _populate_grid(self, contact: types.BareContact) -> None: # Avatar surface = contact.get_avatar(AvatarSize.TOOLTIP, scale) + assert not isinstance(surface, GdkPixbuf.Pixbuf) self._ui.avatar.set_from_surface(surface) self._ui.avatar.show() @@ -181,6 +183,8 @@ def _populate_grid(self, contact: types.BareContact) -> None: # This sets the bottom-most widget to expand, in case the avatar # takes more space than the labels row_count = 1 + last_widget = self._ui.tooltip_grid.get_child_at(1, 1) + assert last_widget is not None while row_count < 6: widget = self._ui.tooltip_grid.get_child_at(1, row_count) if widget and widget.get_visible(): @@ -202,6 +206,7 @@ def _add_resources(self, contact: types.BareContact) -> None: show_image.set_halign(Gtk.Align.START) show_image.set_valign(Gtk.Align.CENTER) + assert resource.jid.resource is not None resource_string = GLib.markup_escape_text(resource.jid.resource) resource_label = Gtk.Label() resource_label.set_halign(Gtk.Align.START) @@ -298,12 +303,15 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: properties: list[tuple[str, str]] = [] name = file_prop.name if file_prop.type_ == 'r': + assert file_prop.file_name is not None file_name = os.path.split(file_prop.file_name)[1] else: + assert file_prop.name is not None file_name = file_prop.name properties.append((_('File Name: '), GLib.markup_escape_text(file_name))) + assert file_prop.tt_account is not None client = app.get_client(file_prop.tt_account) if file_prop.type_ == 'r': type_ = Q_('?Noun:Download') ===================================== pyrightconfig.json ===================================== @@ -63,6 +63,7 @@ "gajim/gtk/status_selector.py", "gajim/gtk/structs.py", "gajim/gtk/themes.py", + "gajim/gtk/tooltips.py", "gajim/gtk/video_preview.py", "gajim/gtk/workspace_dialog.py", ], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/99a75dae9d4651cd5c850388391706b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/99a75dae9d4651cd5c850388391706b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginManager: Fix undefined var
by Daniel Brötzmann (＠wurstsalat) 24 Jan '22

24 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 99a75dae by wurstsalat at 2022-01-24T18:43:07+01:00 PluginManager: Fix undefined var - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -528,7 +528,7 @@ def _unregister_modules_with_handlers(self, plugin: GajimPlugin) -> None: return for client in app.connections.values(): for module in plugin.modules: - instance = con.get_module(module.name) + instance = client.get_module(module.name) modules.unregister_single_module(client, module.name) for handler in instance.handlers: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99a75dae9d4651cd5c850388391706b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99a75dae9d4651cd5c850388391706b7… You're receiving this email because of your account on dev.gajim.org.

1 0

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

24 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 231ef904 by wurstsalat at 2022-01-24T18:38:28+01:00 Menus: Typing - - - - - 7807a8f8 by wurstsalat at 2022-01-24T18:38:28+01:00 Preview: Improve Save As dialog on Windows - - - - - 9d1df09e by wurstsalat at 2022-01-24T18:38:28+01:00 Plugin system: Typing - - - - - 8 changed files: - gajim/common/app.py - gajim/common/types.py - gajim/gtk/menus.py - gajim/gtk/preview.py - gajim/plugins/gajimplugin.py - gajim/plugins/gui.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/app.py ===================================== @@ -75,7 +75,7 @@ window = None # type: MainWindow ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher -plugin_manager = None # Plugins Manager +plugin_manager = cast(types.PluginManagerT, None) # Plugins Manager class Storage: def __init__(self): ===================================== gajim/common/types.py ===================================== @@ -45,6 +45,8 @@ from gajim.common.settings import Settings from gajim.gtk.css_config import CSSConfig + from gajim.plugins.pluginmanager import PluginManager + ContactT = Union[BareContact, ResourceContact, GroupchatContact, @@ -52,6 +54,7 @@ InterfaceT = Union['Interface'] +PluginManagerT = Union['PluginManager'] ConnectionT = Union['Client'] CSSConfigT = Union['CSSConfig'] ===================================== gajim/gtk/menus.py ===================================== @@ -206,10 +206,12 @@ def get_account_menu(account: str) -> Gio.Menu: def build_accounts_menu() -> None: menubar = app.app.get_menubar() + assert isinstance(menubar, Gio.Menu) # Accounts Submenu menu_position = 1 acc_menu = menubar.get_item_link(menu_position, 'submenu') + assert isinstance(acc_menu, Gio.Menu) acc_menu.remove_all() accounts_list = sorted(app.settings.get_active_accounts()) @@ -261,7 +263,9 @@ def get_encryption_menu(control_id: str, return menu -def get_conv_action_context_menu(account: str, selected_text: str) -> Gtk.MenuItem: +def get_conv_action_context_menu(account: str, + selected_text: str + ) -> Gtk.MenuItem: selected_text_short = reduce_chars_newlines(selected_text, 10, 1) action_menu_item = Gtk.MenuItem.new_with_mnemonic( ===================================== gajim/gtk/preview.py ===================================== @@ -198,8 +198,21 @@ def _on_open(self, _menu: Gtk.Menu) -> None: open_file(self._preview.orig_path) def _on_save_as(self, _menu: Gtk.Menu) -> None: - def _on_ok(target_path): - dirname = Path(target_path).parent + assert self._preview is not None + + def _on_ok(target: str) -> None: + assert self._preview is not None + assert self._preview.orig_path is not None + + target_path = Path(target) + orig_ext = self._preview.orig_path.suffix + new_ext = target_path.suffix + if orig_ext != new_ext: + # Windows file chooser selects the full file name including + # extension. Starting to type will overwrite the extension + # as well. Restore the extension if it's lost. + target_path = target_path.with_suffix(orig_ext) + dirname = target_path.parent if not os.access(dirname, os.W_OK): ErrorDialog( _('Directory \'%s\' is not writable') % dirname, ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -21,18 +21,18 @@ :license: GPL ''' -from typing import List # pylint: disable=W0611 -from typing import Tuple # pylint: disable=W0611 -from typing import Dict # pylint: disable=W0611 -from typing import Any # pylint: disable=W0611 +from __future__ import annotations + +from typing import Any import os -import locale import logging import pickle from gajim.common import configpaths -from gajim.common.types import PluginExtensionPoints # pylint: disable=W0611 +from gajim.common.events import ApplicationEvent +from gajim.common.ged import HandlerFuncT +from gajim.common.types import PluginExtensionPoints from gajim.plugins.helpers import log from gajim.plugins.gui import GajimPluginConfigDialog @@ -45,13 +45,15 @@ class GajimPlugin: ''' Base class for implementing Gajim plugins. ''' + __path__: str = '' + + name = '' ''' Name of plugin. Will be shown in plugins management GUI. - :type: str ''' short_name = '' ''' @@ -59,8 +61,6 @@ class GajimPlugin: Used for quick identification of plugin. - :type: str - :todo: decide whether we really need this one, because class name (with module name) can act as such short name ''' @@ -71,15 +71,11 @@ class GajimPlugin: The name that Gajim displays in the encryption menu. Leave empty if the plugin is not an encryption plugin. - :type: str - ''' version = '' ''' Version of plugin. - :type: str - :todo: decide how to compare version between each other (which one is higher). Also rethink: do we really need to compare versions of plugins between each other? This would be only useful if we detect @@ -90,16 +86,12 @@ class GajimPlugin: ''' Plugin description. - :type: str - :todo: should be allow rich text here (like HTML or reStructuredText)? ''' - authors = [] # type: List[str] + authors = '' ''' Plugin authors. - :type: [] of str - :todo: should we decide on any particular format of author strings? Especially: should we force format of giving author's e-mail? ''' @@ -112,7 +104,7 @@ class GajimPlugin: :todo: should we check whether provided string is valid URI? (Maybe using 'property') ''' - gui_extension_points = {} # type: PluginExtensionPoints + gui_extension_points: PluginExtensionPoints = {} ''' Extension points that plugin wants to connect with and handlers to be used. @@ -126,7 +118,7 @@ class GajimPlugin: or when extpoint is destroyed and plugin is activate (eg. chat window closed). ''' - config_default_values = {} # type: Dict[str, Tuple[Any, str]] + config_default_values: dict[str, tuple[Any, str]] = {} ''' Default values for keys that should be stored in plug-in config. @@ -140,7 +132,7 @@ class GajimPlugin: :type: {} of 2-element tuples ''' - events_handlers = {} + events_handlers: dict[str, tuple[int, HandlerFuncT]] = {} ''' Dictionary with events handlers. @@ -151,12 +143,10 @@ class GajimPlugin: :type: {} with 2-element tuples ''' - events = [] + events: list[ApplicationEvent] = [] ''' New network event classes to be registered in Network Events Controller. - :type: [] of `nec.NetworkIncomingEvent` or `nec.NetworkOutgoingEvent` - subclasses. ''' def __init__(self) -> None: @@ -169,6 +159,7 @@ def __init__(self) -> None: :type: `plugins.plugin.GajimPluginConfig` ''' self.activatable = True + self.active = False self.available_text = '' self.load_config() self.config_dialog = GajimPluginConfigDialog(self) @@ -180,59 +171,59 @@ def save_config(self) -> None: def load_config(self) -> None: self.config.load() - def __eq__(self, plugin): + def __eq__(self, plugin: object) -> bool: if self.short_name == plugin.short_name: return True return False - def __ne__(self, plugin): + def __ne__(self, plugin: object) -> bool: if self.short_name != plugin.short_name: return True return False - def local_file_path(self, file_name): + def local_file_path(self, file_name: str) -> str: return os.path.join(self.__path__, file_name) - def init(self): + def init(self) -> None: pass - def activate(self): + def activate(self) -> None: pass - def deactivate(self): + def deactivate(self) -> None: pass -class GajimPluginConfig(): - def __init__(self, plugin): +class GajimPluginConfig: + def __init__(self, plugin: GajimPlugin) -> None: self.plugin = plugin self.FILE_PATH = (configpaths.get('PLUGINS_CONFIG_DIR') / self.plugin.short_name) - self.data = {} + self.data: dict[str, Any] = {} - def __getitem__(self, key): + def __getitem__(self, key: str) -> None: if not key in self.data: self.data[key] = self.plugin.config_default_values[key][0] self.save() return self.data[key] - def __setitem__(self, key, value): + def __setitem__(self, key: str, value: Any) -> None: self.data[key] = value self.save() - def __delitem__(self, key): + def __delitem__(self, key: str) -> None: del self.data[key] self.save() - def __contains__(self, key): + def __contains__(self, key: str) -> bool: return key in self.data def __iter__(self): - for k in self.data.keys(): - yield k + for key in self.data.keys(): + yield key def keys(self): return self.data.keys() @@ -240,11 +231,11 @@ def keys(self): def items(self): return self.data.items() - def save(self): + def save(self) -> None: with open(self.FILE_PATH, 'wb') as fd: pickle.dump(self.data, fd) - def load(self): + def load(self) -> None: if not self.FILE_PATH.is_file(): self.data = {} self.save() @@ -255,23 +246,23 @@ def load(self): except Exception: try: import shelve - s = shelve.open(self.FILE_PATH) - for (k, v) in s.items(): - self.data[k] = v + shelf = shelve.open(str(self.FILE_PATH)) + for (key, value) in shelf.items(): + self.data[key] = value if not isinstance(self.data, dict): raise GajimPluginException - s.close() + shelf.close() self.save() except Exception: - enc = locale.getpreferredencoding() - filename = self.FILE_PATH.decode(enc) + '.bak' + filepath_bak = self.FILE_PATH.with_suffix('bak') log.warning( '%s plugin config file not readable. Saving it as ' '%s and creating a new one', - self.plugin.short_name, filename) - if os.path.exists(self.FILE_PATH + '.bak'): - os.remove(self.FILE_PATH + '.bak') - os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') + self.plugin.short_name, filepath_bak) + if filepath_bak.exists(): + filepath_bak.unlink() + + self.FILE_PATH.rename(f'{self.FILE_PATH}.bak') self.data = {} self.save() @@ -279,5 +270,6 @@ def load(self): class GajimPluginException(Exception): pass + class GajimPluginInitError(GajimPluginException): pass ===================================== gajim/plugins/gui.py ===================================== @@ -21,6 +21,12 @@ :license: GPL ''' +from __future__ import annotations + +from typing import Any +from typing import Optional +from typing import TYPE_CHECKING + import os from enum import IntEnum from enum import unique @@ -31,6 +37,8 @@ from gajim.common import app from gajim.common import ged +from gajim.common.events import PluginAdded +from gajim.common.events import PluginRemoved from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import open_uri from gajim.common.ged import EventHelper @@ -45,6 +53,9 @@ from gajim.gui.builder import get_builder from gajim.gui.util import load_icon_pixbuf +if TYPE_CHECKING: + from gajim.plugins.gajimplugin import GajimPlugin + @unique class Column(IntEnum): @@ -56,7 +67,7 @@ class Column(IntEnum): class PluginsWindow(Gtk.ApplicationWindow, EventHelper): - def __init__(self): + def __init__(self) -> None: Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) @@ -75,8 +86,13 @@ def __init__(self): _('Click to view Gajim\'s wiki page on how to install plugins ' 'in Flatpak.')) - self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, - GdkPixbuf.Pixbuf) + self.installed_plugins_model = Gtk.ListStore( + object, + str, + bool, + bool, + GdkPixbuf.Pixbuf + ) self._ui.installed_plugins_treeview.set_model( self.installed_plugins_model) @@ -101,7 +117,7 @@ def __init__(self): # connect signal for selection change selection = self._ui.installed_plugins_treeview.get_selection() selection.connect( - 'changed', self._installed_plugins_treeview_selection_changed) + 'changed', self._selection_changed) selection.set_mode(Gtk.SelectionMode.SINGLE) self._clear_installed_plugin_info() @@ -128,19 +144,21 @@ def __init__(self): self.show_all() - def get_notebook(self): + def get_notebook(self) -> Gtk.Notebook: # Used by plugins return self._ui.plugins_notebook - 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 _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: self.unregister_events() app.plugin_manager.remove_gui_extension_point('plugin_window', self) - def _installed_plugins_treeview_selection_changed(self, treeview_selection): + def _selection_changed(self, + treeview_selection: Gtk.TreeSelection + ) -> None: model, iter_ = treeview_selection.get_selected() if iter_: plugin = model.get_value(iter_, Column.PLUGIN) @@ -148,11 +166,11 @@ def _installed_plugins_treeview_selection_changed(self, treeview_selection): else: self._clear_installed_plugin_info() - def _display_installed_plugin_info(self, plugin): + def _display_installed_plugin_info(self, plugin: GajimPlugin) -> None: self._ui.plugin_name_label.set_text(plugin.name) self._ui.plugin_version_label.set_text(plugin.version) self._ui.plugin_authors_label.set_text(plugin.authors) - markup = '<a href="%s">%s</a>' % (plugin.homepage, plugin.homepage) + markup = f'<a href="{plugin.homepage}">{plugin.homepage}</a>' self._ui.plugin_homepage_linkbutton.set_markup(markup) if plugin.available_text: @@ -170,7 +188,7 @@ def _display_installed_plugin_info(self, plugin): self._ui.configure_plugin_button.set_sensitive( plugin.config_dialog is not None and plugin.active) - def _clear_installed_plugin_info(self): + def _clear_installed_plugin_info(self) -> None: self._ui.plugin_name_label.set_text('') self._ui.plugin_version_label.set_text('') self._ui.plugin_authors_label.set_text('') @@ -180,7 +198,7 @@ def _clear_installed_plugin_info(self): self._ui.uninstall_plugin_button.set_sensitive(False) self._ui.configure_plugin_button.set_sensitive(False) - def _fill_installed_plugins_model(self): + def _fill_installed_plugins_model(self) -> None: pm = app.plugin_manager self.installed_plugins_model.clear() self.installed_plugins_model.set_sort_column_id(1, @@ -195,15 +213,19 @@ def _fill_installed_plugins_model(self): plugin.activatable, icon]) - def _get_plugin_icon(self, plugin): - icon_file = os.path.join(plugin.__path__, os.path.split( - plugin.__path__)[1]) + '.png' + def _get_plugin_icon(self, plugin: GajimPlugin) -> GdkPixbuf.Pixbuf: + icon_file = os.path.join( + plugin.__path__, os.path.split(plugin.__path__)[1]) + '.png' + assert self.def_icon is not None icon = self.def_icon if os.path.isfile(icon_file): icon = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file, 16, 16) return icon - def _installed_plugin_toggled(self, _cell, path): + def _installed_plugin_toggled(self, + _cell: Gtk.CellRendererToggle, + path: str + ) -> None: is_active = self.installed_plugins_model[path][Column.ACTIVE] plugin = self.installed_plugins_model[path][Column.PLUGIN] @@ -221,7 +243,7 @@ def _installed_plugin_toggled(self, _cell, path): plugin.config_dialog is not None and not is_active) self.installed_plugins_model[path][Column.ACTIVE] = not is_active - def _on_configure_plugin(self, _widget): + def _on_configure_plugin(self, _button: Gtk.Button) -> None: selection = self._ui.installed_plugins_treeview.get_selection() model, iter_ = selection.get_selected() if iter_: @@ -238,25 +260,25 @@ def _on_configure_plugin(self, _widget): # XXX: maybe throw exception here? pass - def _on_uninstall_plugin(self, _widget): + def _on_uninstall_plugin(self, _button: Gtk.ToolButton) -> None: selection = self._ui.installed_plugins_treeview.get_selection() model, iter_ = selection.get_selected() if iter_: plugin = model.get_value(iter_, Column.PLUGIN) try: app.plugin_manager.uninstall_plugin(plugin) - except PluginsystemError as e: + except PluginsystemError as error: WarningDialog(_('Unable to properly remove the plugin'), - str(e), self) + str(error), self) return - def _on_plugin_removed(self, event): + def _on_plugin_removed(self, event: PluginRemoved) -> None: for row in self.installed_plugins_model: if row[Column.PLUGIN] == event.plugin: self.installed_plugins_model.remove(row.iter) break - def _on_plugin_added(self, event): + def _on_plugin_added(self, event: PluginAdded) -> None: icon = self._get_plugin_icon(event.plugin) self.installed_plugins_model.append([event.plugin, event.plugin.name, @@ -264,18 +286,18 @@ def _on_plugin_added(self, event): event.plugin.activatable, icon]) - def _on_install_plugin(self, _widget): + def _on_install_plugin(self, _button: Gtk.ToolButton) -> None: if app.is_flatpak(): open_uri('https://dev.gajim.org/gajim/gajim/wikis/help/flathub') return - def _show_warn_dialog(): + def _show_warn_dialog() -> None: text = _('Archive is malformed') dialog = WarningDialog(text, '', transient_for=self) dialog.set_modal(False) dialog.popup() - def _on_plugin_exists(zip_filename): + def _on_plugin_exists(zip_filename: str) -> None: def _on_yes(): plugin = app.plugin_manager.install_from_zip(zip_filename, overwrite=True) @@ -293,7 +315,7 @@ def _on_yes(): callback=_on_yes)], transient_for=self).show() - def _try_install(zip_filename): + def _try_install(zip_filename: str) -> None: try: plugin = app.plugin_manager.install_from_zip(zip_filename) except PluginsystemError as er_type: @@ -302,7 +324,7 @@ def _try_install(zip_filename): _on_plugin_exists(zip_filename) return - WarningDialog(error_text, '"%s"' % zip_filename, self) + WarningDialog(error_text, f'"{zip_filename}"', self) return if not plugin: _show_warn_dialog() @@ -312,9 +334,10 @@ def _try_install(zip_filename): class GajimPluginConfigDialog(Gtk.Dialog): - def __init__(self, plugin, **kwargs): - Gtk.Dialog.__init__(self, title='%s %s' % (plugin.name, - _('Configuration')), **kwargs) + def __init__(self, plugin: GajimPlugin, **kwargs: Any) -> None: + Gtk.Dialog.__init__(self, + title='%s %s' % (plugin.name, _('Configuration')), + **kwargs) self.plugin = plugin button = self.add_button('gtk-close', Gtk.ResponseType.CLOSE) button.connect('clicked', self.on_close_button_clicked) @@ -323,14 +346,14 @@ def __init__(self, plugin, **kwargs): self.init() - def on_close_dialog(self, widget, data): + def on_close_dialog(self, widget: Gtk.Widget, data: Any) -> bool: self.hide() return True - def on_close_button_clicked(self, widget): + def on_close_button_clicked(self, widget: Gtk.Button) -> None: self.hide() - def run(self, parent=None): + def run(self, parent: Optional[PluginsWindow] = None): self.set_transient_for(parent) self.on_run() self.show_all() @@ -338,8 +361,8 @@ def run(self, parent=None): result = super(GajimPluginConfigDialog, self) return result - def init(self): + def init(self) -> None: pass - def on_run(self): + def on_run(self) -> None: pass ===================================== gajim/plugins/helpers.py ===================================== @@ -23,7 +23,8 @@ __all__ = ['log', 'log_calls'] -from typing import List +from pathlib import Path +from typing import Optional import logging import functools @@ -56,7 +57,7 @@ class log_calls: called, even though `log_calls` decorator is used. ''' - def __init__(self, classname=''): + def __init__(self, classname: str = '') -> None: ''' :Keywords: classname : str @@ -117,14 +118,14 @@ def wrapper(*args, **kwargs): return wrapper -def get_builder(file_name: str, widgets: List[str] = None) -> Builder: +def get_builder(file_name: str, widgets: Optional[list[str]] = None) -> Builder: return Builder(file_name, widgets, domain=plugins_i18n.DOMAIN, gettext_=plugins_i18n._) -def is_shipped_plugin(path): +def is_shipped_plugin(path: Path) -> bool: base = configpaths.get('PLUGINS_BASE') if not base.exists(): return False ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -21,8 +21,14 @@ :license: GPL ''' +from __future__ import annotations + __all__ = ['PluginManager'] +from typing import Any +from typing import Optional +from typing import Type + import os import sys import zipfile @@ -38,6 +44,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import modules +from gajim.common.client import Client from gajim.common.events import PluginAdded from gajim.common.events import PluginRemoved from gajim.common.i18n import _ @@ -48,7 +55,8 @@ from gajim.plugins.helpers import log from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.helpers import is_shipped_plugin -from gajim.plugins.gajimplugin import GajimPlugin, GajimPluginException +from gajim.plugins.gajimplugin import GajimPlugin +from gajim.plugins.gajimplugin import GajimPluginException FIELDS = ('name', @@ -75,7 +83,7 @@ class Plugin: path: Path @classmethod - def from_manifest(cls, path): + def from_manifest(cls, path: Path) -> Plugin: shipped = is_shipped_plugin(path) manifest = path / 'manifest.ini' if not manifest.exists() and not manifest.is_dir(): @@ -129,7 +137,7 @@ def from_manifest(cls, path): shipped=shipped, path=path) - def load_module(self): + def load_module(self) -> Optional[Type[GajimPlugin]]: module_path = self.path / '__init__.py' if not module_path.exists(): # On Windows we only ship compiled files @@ -188,7 +196,7 @@ class PluginManager(metaclass=Singleton): ''' def __init__(self): - self.plugins = [] + self.plugins: list[GajimPlugin] = [] ''' Detected plugin classes. @@ -196,7 +204,7 @@ def __init__(self): :type: [] of class objects ''' - self.active_plugins = [] + self.active_plugins: list[GajimPlugin] = [] ''' Instance objects of active plugins. @@ -205,17 +213,17 @@ def __init__(self): :type: [] of `GajimPlugin` based objects ''' - self.gui_extension_points = {} + self.gui_extension_points: dict[str, Any] = {} ''' Registered GUI extension points. ''' - self.gui_extension_points_handlers = {} + self.gui_extension_points_handlers: dict[str, Any] = {} ''' Registered handlers of GUI extension points. ''' - self.encryption_plugins = {} + self.encryption_plugins: dict[str, GajimPlugin] = {} ''' Registered names with instances of encryption Plugins. ''' @@ -223,20 +231,20 @@ def __init__(self): self.update_plugins() self._load_plugins() - def update_plugins(self, replace=True, activate=False, plugin_name=None): + def update_plugins(self, + replace: bool = True, + activate: bool = False, + plugin_name: Optional[str] = None + ) -> list[str]: ''' Move plugins from the downloaded folder to the user plugin folder :param replace: replace plugin files if they already exist. - :type replace: boolean :param activate: load and activate the plugin - :type activate: boolean :param plugin_name: if provided, update only this plugin - :type plugin_name: str :return: list of updated plugins (files have been installed) - :rtype: [] of str ''' - updated_plugins = [] + updated_plugins: list[str] = [] user_dir = configpaths.get('PLUGINS_USER') dl_dir = configpaths.get('PLUGINS_DOWNLOAD') to_update = [plugin_name] if plugin_name else next(os.walk(dl_dir))[1] @@ -264,7 +272,7 @@ def update_plugins(self, replace=True, activate=False, plugin_name=None): self.add_plugin(plugin, activate=True) return updated_plugins - def init_plugins(self): + def init_plugins(self) -> None: for plugin in self.plugins: if not app.settings.get_plugin_setting(plugin.short_name, 'active'): continue @@ -276,14 +284,18 @@ def init_plugins(self): except GajimPluginActivateException: pass - def add_plugin(self, plugin, activate=False): + def add_plugin(self, + plugin: Plugin, + activate: bool = False + ) -> Optional[GajimPlugin]: plugin_class = plugin.load_module() if plugin_class is None: return None if plugin in self.plugins: log.info('Not loading plugin %s v %s. Plugin already loaded.', - plugin.short_name, plugin.version) + plugin.short_name, + plugin.version) return None try: @@ -307,7 +319,7 @@ def add_plugin(self, plugin, activate=False): return plugin_obj - def remove_plugin(self, plugin): + def remove_plugin(self, plugin: GajimPlugin) -> None: ''' removes the plugin from the plugin list and deletes all loaded modules from sys. This way we will have a fresh start when the plugin gets added @@ -332,19 +344,19 @@ def remove_plugin(self, plugin): for module_to_remove in modules_to_remove: del sys.modules[module_to_remove] - def get_active_plugin(self, plugin_name): + def get_active_plugin(self, plugin_name: str) -> Optional[GajimPlugin]: for plugin in self.active_plugins: if plugin.short_name == plugin_name: return plugin return None - def get_plugin(self, short_name): + def get_plugin(self, short_name: str) -> Optional[GajimPlugin]: for plugin in self.plugins: if plugin.short_name == short_name: return plugin return None - def extension_point(self, gui_extpoint_name, *args): + def extension_point(self, gui_extpoint_name: str, *args: Any) -> None: ''' Invokes all handlers (from plugins) for a particular extension point, but doesn't add it to collection for further processing. @@ -353,24 +365,22 @@ def extension_point(self, gui_extpoint_name, *args): plugin. For example after an update. :param gui_extpoint_name: name of GUI extension point. - :type gui_extpoint_name: str :param args: parameters to be passed to extension point handlers (typically and object that invokes `gui_extension_point`; however, this can be practically anything) :type args: tuple ''' - self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, - *args) + self._execute_all_handlers_of_gui_extension_point( + gui_extpoint_name, *args) - def gui_extension_point(self, gui_extpoint_name, *args): + def gui_extension_point(self, gui_extpoint_name: str, *args: Any) -> None: ''' Invokes all handlers (from plugins) for particular GUI extension point and adds it to collection for further processing (eg. by plugins not active yet). :param gui_extpoint_name: name of GUI extension point. - :type gui_extpoint_name: str :param args: parameters to be passed to extension point handlers (typically and object that invokes `gui_extension_point`; however, this can be practically anything) @@ -392,7 +402,10 @@ def gui_extension_point(self, gui_extpoint_name, *args): self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args) - def remove_gui_extension_point(self, gui_extpoint_name, *args): + def remove_gui_extension_point(self, + gui_extpoint_name: str, + *args: Any + ) -> None: ''' Removes GUI extension point from collection held by `PluginManager`. @@ -420,7 +433,6 @@ def remove_gui_extension_point(self, gui_extpoint_name, *args): freedom, but is this necessary? :param gui_extpoint_name: name of GUI extension point. - :type gui_extpoint_name: str :param args: arguments that `PluginManager.gui_extension_point` was called with for this extension point. This is used (along with extension point name) to identify element to be removed. @@ -441,7 +453,10 @@ def remove_gui_extension_point(self, gui_extpoint_name, *args): if disconnect_handler is not None: disconnect_handler(args[0]) - def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): + def _add_gui_extension_point_call_to_list(self, + gui_extpoint_name: str, + *args: Any + ) -> None: ''' Adds GUI extension point call to list of calls. @@ -453,8 +468,6 @@ def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): :param gui_extpoint_name: GUI extension point name used to identify it by plugins. - :type gui_extpoint_name: str - :param args: parameters to be passed to extension point handlers (typically and object that invokes `gui_extension_point`; however, this can be practically anything) @@ -466,8 +479,10 @@ def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): self.gui_extension_points.setdefault(gui_extpoint_name, []).append( args) - def _execute_all_handlers_of_gui_extension_point(self, gui_extpoint_name, - *args): + def _execute_all_handlers_of_gui_extension_point(self, + gui_extpoint_name: str, + *args: Any + ) -> None: if gui_extpoint_name in self.gui_extension_points_handlers: for handlers in self.gui_extension_points_handlers[ gui_extpoint_name]: @@ -477,47 +492,49 @@ def _execute_all_handlers_of_gui_extension_point(self, gui_extpoint_name, log.warning('Error executing %s', handlers[0], exc_info=True) - def _register_events_handlers_in_ged(self, plugin): + def _register_events_handlers_in_ged(self, plugin: GajimPlugin) -> None: for event_name, handler in plugin.events_handlers.items(): priority = handler[0] handler_function = handler[1] - app.ged.register_event_handler(event_name, priority, - handler_function) + app.ged.register_event_handler( + event_name, priority, handler_function) - def _remove_events_handler_from_ged(self, plugin): + def _remove_events_handler_from_ged(self, plugin: GajimPlugin) -> None: for event_name, handler in plugin.events_handlers.items(): priority = handler[0] handler_function = handler[1] - app.ged.remove_event_handler(event_name, priority, - handler_function) + app.ged.remove_event_handler( + event_name, priority, handler_function) - def _remove_name_from_encryption_plugins(self, plugin): + def _remove_name_from_encryption_plugins(self, + plugin: GajimPlugin + ) -> None: if plugin.encryption_name: del self.encryption_plugins[plugin.encryption_name] - def _register_modules_with_handlers(self, plugin): + def _register_modules_with_handlers(self, plugin: GajimPlugin) -> None: if not hasattr(plugin, 'modules'): return - for con in app.connections.values(): + for client in app.connections.values(): for module in plugin.modules: - instance, name = module.get_instance(con) - modules.register_single_module(con, instance, name) + instance, name = module.get_instance(client) + modules.register_single_module(client, instance, name) for handler in instance.handlers: - con.connection.register_handler(handler) + client.connection.register_handler(handler) - def _unregister_modules_with_handlers(self, plugin): + def _unregister_modules_with_handlers(self, plugin: GajimPlugin) -> None: if not hasattr(plugin, 'modules'): return - for con in app.connections.values(): + for client in app.connections.values(): for module in plugin.modules: instance = con.get_module(module.name) - modules.unregister_single_module(con, module.name) + modules.unregister_single_module(client, module.name) for handler in instance.handlers: - con.connection.unregister_handler(handler) + client.connection.unregister_handler(handler) - def activate_plugin(self, plugin): + def activate_plugin(self, plugin: GajimPlugin) -> None: ''' :param plugin: plugin to be activated :type plugin: class object of `GajimPlugin` subclass @@ -539,7 +556,7 @@ def activate_plugin(self, plugin): app.settings.set_plugin_setting(plugin.short_name, 'active', True) plugin.active = True - def deactivate_plugin(self, plugin): + def deactivate_plugin(self, plugin: GajimPlugin) -> None: # remove GUI extension points handlers (provided by plug-in) from # handlers list for gui_extpoint_name, gui_extpoint_handlers in \ @@ -573,17 +590,21 @@ def deactivate_plugin(self, plugin): app.settings.set_plugin_setting(plugin.short_name, 'active', False) plugin.active = False - def _add_gui_extension_points_handlers_from_plugin(self, plugin): + def _add_gui_extension_points_handlers_from_plugin(self, + plugin: GajimPlugin + ) -> None: for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): - self.gui_extension_points_handlers.setdefault(gui_extpoint_name, - []).append(gui_extpoint_handlers) + self.gui_extension_points_handlers.setdefault( + gui_extpoint_name, []).append(gui_extpoint_handlers) - def _add_encryption_name_from_plugin(self, plugin): + def _add_encryption_name_from_plugin(self, plugin: GajimPlugin) -> None: if plugin.encryption_name: self.encryption_plugins[plugin.encryption_name] = plugin - def _handle_all_gui_extension_points_with_plugin(self, plugin): + def _handle_all_gui_extension_points_with_plugin(self, + plugin: GajimPlugin + ) -> None: for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): if gui_extpoint_name in self.gui_extension_points: @@ -597,7 +618,7 @@ def _handle_all_gui_extension_points_with_plugin(self, plugin): log.warning('Error executing %s', handler, exc_info=True) - def register_modules_for_account(self, con): + def register_modules_for_account(self, client: Client) -> None: ''' A new account has been added, register modules of all active plugins @@ -610,21 +631,22 @@ def register_modules_for_account(self, con): continue for module in plugin.modules: - instance, name = module.get_instance(con) - modules.register_single_module(con, instance, name) + instance, name = module.get_instance(client) + modules.register_single_module(client, instance, name) for handler in instance.handlers: - con.connection.register_handler(handler) + client.connection.register_handler(handler) @staticmethod - def _load_plugin(plugin_path): + def _load_plugin(plugin_path: Path) -> Optional[Plugin]: try: return Plugin.from_manifest(plugin_path) except Exception as error: log.warning(error) + return None - def _load_plugins(self): - plugins = {} + def _load_plugins(self) -> None: + plugins: dict[str, Plugin] = {} for plugin_dir in configpaths.get_plugin_dirs(): if not plugin_dir.is_dir(): continue @@ -646,7 +668,10 @@ def _load_plugins(self): for plugin in plugins.values(): self.add_plugin(plugin) - def install_from_zip(self, zip_filename, overwrite=None): + def install_from_zip(self, + zip_filename: str, + overwrite: bool = False + ) -> Optional[GajimPlugin]: ''' Install plugin from zip and return plugin ''' @@ -662,11 +687,11 @@ def install_from_zip(self, zip_filename, overwrite=None): # CRC error raise PluginsystemError(_('Archive corrupted')) - dirs = [] + dirs: list[str] = [] manifest = None for filename in zip_file.namelist(): - if filename.startswith('.') or filename.startswith('/') or \ - ('/' not in filename): + if (filename.startswith('.') or filename.startswith('/') or + ('/' not in filename)): # members not safe raise PluginsystemError(_('Archive is malformed')) if filename.endswith('/') and filename.find('/', 0, -1) < 0: @@ -686,7 +711,9 @@ def install_from_zip(self, zip_filename, overwrite=None): # Plugin dir already exists if not overwrite: raise PluginsystemError(_('Plugin already exists')) - self.uninstall_plugin(self.get_plugin_by_path(str(plugin_path))) + plugin = self.get_plugin_by_path(str(plugin_path)) + assert isinstance(plugin, GajimPlugin) + self.uninstall_plugin(plugin) zip_file.extractall(user_dir) zip_file.close() @@ -699,7 +726,7 @@ def install_from_zip(self, zip_filename, overwrite=None): return self.add_plugin(plugin) - def delete_plugin_files(self, plugin_path): + def delete_plugin_files(self, plugin_path: Path) -> None: def on_error(func, path, error): if func is os.path.islink: # if symlink @@ -710,7 +737,7 @@ def on_error(func, path, error): rmtree(plugin_path, False, on_error) - def uninstall_plugin(self, plugin): + def uninstall_plugin(self, plugin: GajimPlugin) -> None: ''' Deactivate and remove plugin from `plugins` list ''' @@ -718,17 +745,17 @@ def uninstall_plugin(self, plugin): return self.remove_plugin(plugin) - self.delete_plugin_files(plugin.__path__) + self.delete_plugin_files(Path(plugin.__path__)) if not is_shipped_plugin(Path(plugin.__path__)): path = configpaths.get('PLUGINS_BASE') / plugin.short_name if path.exists(): - self.delete_plugin_files(str(path)) + self.delete_plugin_files(path) app.settings.remove_plugin(plugin.short_name) app.ged.raise_event(PluginRemoved(plugin=plugin)) - def get_plugin_by_path(self, plugin_dir): + def get_plugin_by_path(self, plugin_dir: str) -> Optional[GajimPlugin]: for plugin in self.plugins: if plugin.__path__ in plugin_dir: return plugin View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef52d49b2801eae4317a08fa7fdb7c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef52d49b2801eae4317a08fa7fdb7c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Notifications: Don’t send nullable types via DBus
by Philipp Hörist (＠lovetox) 24 Jan '22

24 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef52d49b by lovetox at 2022-01-24T14:13:10+01:00 Notifications: Don’t send nullable types via DBus DBus does not support nullable types like GLib.Variant('ms', 'test') - - - - - 3 changed files: - gajim/gtk/application.py - gajim/gtk/notification.py - gajim/gtk/structs.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -750,8 +750,9 @@ def _on_open_event_action(_action: Gio.SimpleAction, 'incoming-call', 'file-transfer'): - assert params.jid is not None - app.window.select_chat(params.account, params.jid) + assert params.jid + jid = JID.from_string(params.jid) + app.window.select_chat(params.account, jid) app.window.present_with_time(Gtk.get_current_event_time()) ===================================== gajim/gtk/notification.py ===================================== @@ -212,12 +212,13 @@ def _on_button_press(self, event: Gdk.EventButton ) -> None: if event.button == 1: - jid = self._event.jid - if jid is not None and isinstance(jid, str): - jid = JID.from_string(jid) + + jid = '' + if self._event.jid is not None: + jid = str(self._event.jid) params = OpenEventActionParams(type=self._event.type, - sub_type=self._event.sub_type, + sub_type=self._event.sub_type or '', account=self._event.account, jid=jid) app.app.activate_action(f'app.{self._event.account}-open-event', @@ -304,12 +305,12 @@ def _add_actions(self, if 'actions' not in self._daemon_capabilities: return - jid = event.jid - if jid is not None and isinstance(jid, str): - jid = JID.from_string(jid) + jid = '' + if event.jid is not None: + jid = str(event.jid) params = OpenEventActionParams(type=event.type, - sub_type=event.sub_type, + sub_type=event.sub_type or '', account=event.account, jid=jid) ===================================== gajim/gtk/structs.py ===================================== @@ -31,10 +31,12 @@ @dataclass class OpenEventActionParams(VariantMixin): + # Event which is used for Notifications and gets sent over DBus + # Don’t use Optional types here because DBus does not support "None" type: str - sub_type: Optional[str] + sub_type: str account: str - jid: Optional[JID] + jid: str @dataclass View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef52d49b2801eae4317a08fa7fdb7c25… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef52d49b2801eae4317a08fa7fdb7c25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Notifications: Add more logging
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8767a40 by lovetox at 2022-01-24T00:35:56+01:00 Notifications: Add more logging - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -291,6 +291,7 @@ def _send(self, event: events.Notification) -> None: self._add_actions(event, notification) notification_id = self._make_notification_id(event) + log.info('Sending notification: %s', notification_id) app.app.send_notification(notification_id, notification) def _add_actions(self, @@ -360,6 +361,8 @@ def _withdraw(self, details: list[Any]) -> None: if not self._dbus_available: return notification_id = self._make_id(details) + + log.info('Withdraw notification: %s', notification_id) app.app.withdraw_notification(notification_id) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f8767a4051350aff130ad4a2f84aa36c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f8767a4051350aff130ad4a2f84aa36c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: FileTransferJingle: Add asserts to help pyright
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 854cee83 by lovetox at 2022-01-23T22:09:16+01:00 FileTransferJingle: Add asserts to help pyright - - - - - 9241befa by lovetox at 2022-01-23T22:09:32+01:00 Update pyrightconfig.json - - - - - 2 changed files: - gajim/gtk/conversation/rows/file_transfer_jingle.py - pyrightconfig.json Changes: ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -210,10 +210,13 @@ def _show_file_infos(self) -> None: else: self._ui.file_description.hide() + assert self._file_props.size is not None self._ui.file_size.set_text( GLib.format_size_full(self._file_props.size, self._units)) def process_event(self, event: TransferEventT) -> None: + assert self._file_props is not None + if isinstance(event, JingleErrorReceived): if event.sid != self._file_props.sid: return @@ -261,6 +264,7 @@ def _update_progress(self, file_props: FileProp) -> None: time_now = time.time() full_size = file_props.size + assert full_size is not None if file_props.type_ == 's': # We're sending a file @@ -273,6 +277,7 @@ def _update_progress(self, file_props: FileProp) -> None: else: # We're receiving a file transferred_size = file_props.received_len + assert transferred_size is not None if full_size == 0: return @@ -321,15 +326,20 @@ def _on_accept_file_request(self, _button: Gtk.Button) -> None: def _on_reject_file_request(self, _button: Gtk.Button) -> None: self._client.get_module('Bytestream').send_file_rejection( self._file_props) + assert self._file_props is not None self._file_props.stopped = True self._ui.action_stack.set_visible_child_name('rejected') self._ui.transfer_action.set_text(_('File Transfer Cancelled')) def _on_open_file(self, _button: Gtk.Button) -> None: + assert self._file_props is not None + assert self._file_props.file_name is not None if os.path.exists(self._file_props.file_name): open_file(self._file_props.file_name) def _on_open_folder(self, _button: Gtk.Button) -> None: + assert self._file_props is not None + assert self._file_props.file_name is not None path = os.path.split(self._file_props.file_name)[0] if os.path.exists(path) and os.path.isdir(path): open_file(path) ===================================== pyrightconfig.json ===================================== @@ -2,6 +2,7 @@ "pythonPlatform": "All", "pythonVersion": "3.9", "typeCheckingMode": "strict", + "reportImportCycles": "none", "include": [ "gajim/gajim.py", "gajim/common/application.py", @@ -36,25 +37,7 @@ "gajim/gtk/const.py", "gajim/gtk/contact_info.py", "gajim/gtk/contacts_flowbox.py", - "gajim/gtk/conversation/code_widget.py", - "gajim/gtk/conversation/jump_to_end_button.py", - "gajim/gtk/conversation/plain_widget.py", - "gajim/gtk/conversation/quote_widget.py", - "gajim/gtk/conversation/rows/base.py", - "gajim/gtk/conversation/rows/call.py", - "gajim/gtk/conversation/rows/command_output.py", - "gajim/gtk/conversation/rows/date.py", - "gajim/gtk/conversation/rows/file_transfer.py", - "gajim/gtk/conversation/rows/info.py", - "gajim/gtk/conversation/rows/message.py", - "gajim/gtk/conversation/rows/muc_join_left.py", - "gajim/gtk/conversation/rows/muc_subject.py", - "gajim/gtk/conversation/rows/user_status.py", - "gajim/gtk/conversation/rows/read_marker.py", - "gajim/gtk/conversation/rows/scroll_hint.py", - "gajim/gtk/conversation/rows/widgets.py", - "gajim/gtk/conversation/scrolled.py", - "gajim/gtk/conversation/view.py", + "gajim/gtk/conversation", "gajim/gtk/features.py", "gajim/gtk/file_transfer_send.py", "gajim/gtk/groupchat_details.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f76a5b17927963925571dc1f9f56d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f76a5b17927963925571dc1f9f56d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Application: Add type annotations
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8beaab56 by lovetox at 2022-01-23T21:04:19+01:00 Application: Add type annotations - - - - - edde11c6 by lovetox at 2022-01-23T21:09:45+01:00 Gajim: Refactor installing signal handlers - This makes type annotations easier - - - - - 4f76a5b1 by lovetox at 2022-01-23T21:10:40+01:00 Update pyrightconfig.json - - - - - 3 changed files: - gajim/gajim.py - gajim/gtk/application.py - pyrightconfig.json Changes: ===================================== gajim/gajim.py ===================================== @@ -118,7 +118,17 @@ def _init_gtk() -> None: def _run_app() -> None: from gajim.gui.application import GajimApplication application = GajimApplication() - _install_signal_handlers(application) + + def sigint_cb(num: int, stack: Optional[FrameType]) -> None: + print(' SIGINT/SIGTERM received') + application.quit() + + # ^C exits the application normally + signal.signal(signal.SIGINT, sigint_cb) + signal.signal(signal.SIGTERM, sigint_cb) + if sys.platform != 'win32': + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + application.run(sys.argv) @@ -140,17 +150,6 @@ def _set_proc_title() -> None: libc.setproctitle('gajim') -def _install_signal_handlers(application): - def sigint_cb(num: int, stack: Optional[FrameType]): - print(' SIGINT/SIGTERM received') - application.quit() - # ^C exits the application normally - signal.signal(signal.SIGINT, sigint_cb) - signal.signal(signal.SIGTERM, sigint_cb) - if sys.platform != 'win32': - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - - def main() -> None: if sys.platform != 'win32': if os.geteuid() == 0: ===================================== gajim/gtk/application.py ===================================== @@ -56,6 +56,7 @@ import gajim from gajim.common import app from gajim.common import configpaths +from gajim.common import events from gajim.common import ged from gajim.common import idle from gajim.common import logging_helpers @@ -63,7 +64,6 @@ from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI from gajim.common.dbus import music_track -from gajim.common.events import ApplicationEvent from gajim.common.exceptions import GajimGeneralException from gajim.common.helpers import load_json from gajim.common.helpers import open_uri @@ -78,6 +78,7 @@ from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import ShortcutsWindow from gajim.gui.discovery import ServiceDiscoveryWindow +from gajim.gui.start_chat import StartChatDialog from gajim.gui.util import get_app_window from gajim.gui.util import load_user_iconsets from gajim.gui.util import open_window @@ -515,7 +516,7 @@ def _load_shortcuts(self) -> None: for action, accels in shortcuts.items(): self.set_accels_for_action(action, accels) - def _on_feature_discovered(self, event: ApplicationEvent) -> None: + def _on_feature_discovered(self, event: events.FeatureDiscovered) -> None: if event.feature == Namespace.MAM_2: action = '%s-archive' % event.account self.set_action_state(action, True) @@ -767,8 +768,8 @@ def _on_ipython_action(_action: Gio.SimpleAction, """ Show/hide the ipython window """ - win = app.ipython_window - if win and win.window.is_visible(): + win = cast(Gtk.Window, app.ipython_window) + if win and win.is_visible(): win.present() else: app.interface.create_ipython_window() @@ -829,7 +830,7 @@ def _on_forget_groupchat_action(_action: Gio.SimpleAction, params: structs.ForgetGroupchatActionParams ) -> None: - window = get_app_window('StartChatDialog') + window = cast(StartChatDialog, get_app_window('StartChatDialog')) window.remove_row(params.account, str(params.jid)) client = app.get_client(params.account) ===================================== pyrightconfig.json ===================================== @@ -3,6 +3,7 @@ "pythonVersion": "3.9", "typeCheckingMode": "strict", "include": [ + "gajim/gajim.py", "gajim/common/application.py", "gajim/common/cert_store.py", "gajim/common/configpaths.py", @@ -19,10 +20,12 @@ "gajim/common/regex.py", "gajim/common/sound.py", "gajim/common/storage/", + "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", + "gajim/gtk/application.py", "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", "gajim/gtk/builder.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/28847ed8bc9d177d160fc8abc498f67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/28847ed8bc9d177d160fc8abc498f67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove dead code
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: afd89099 by lovetox at 2022-01-23T20:33:06+01:00 Remove dead code - - - - - b9335eaf by lovetox at 2022-01-23T20:33:06+01:00 Main: Refactor event handling - Add dedicated methods for some events - Add type annotations - Events: Use JID object instead of string - - - - - 28847ed8 by lovetox at 2022-01-23T20:41:05+01:00 Main: Reduce event imports - - - - - 11 changed files: - gajim/common/app.py - gajim/common/events.py - gajim/common/jingle_ft.py - gajim/common/jingle_session.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/presence.py - gajim/gtk/chat_list.py - gajim/gtk/main.py - gajim/gui_interface.py - pyrightconfig.json Changes: ===================================== gajim/common/app.py ===================================== @@ -93,9 +93,6 @@ def __init__(self): # {account: {room_jid: {'invities': []}}} automatic_rooms: dict[str, dict[str, dict[str, list[str]]]] = {} -# list of contacts that has just signed in -newly_added: dict[str, list[str]] = {} - # list of contacts that has just signed out to_be_removed: dict[str, list[str]] = {} ===================================== gajim/common/events.py ===================================== @@ -37,6 +37,21 @@ from gajim.common.client import Client +MainEventT = Union['PresenceReceived', + 'MessageSent', + 'MamMessageReceived', + 'GcMessageReceived', + 'MessageUpdated', + 'ReceiptReceived', + 'DisplayedReceived', + 'MessageError', + 'MucDiscoUpdate', + 'JingleConnectedReceived', + 'JingleDisconnectedReceived', + 'JingleErrorReceived', + 'FileRequestSent'] + + @dataclass class ApplicationEvent: name: str @@ -130,7 +145,7 @@ class MusicTrackChanged(ApplicationEvent): class MessageSent(ApplicationEvent): name: str = field(init=False, default='message-sent') account: str - jid: str + jid: JID message: str message_id: str chatstate: Optional[str] @@ -200,7 +215,7 @@ class FileRequestSent(ApplicationEvent): name: str = field(init=False, default='file-request-sent') account: str file_props: FileProp - jid: str + jid: JID @dataclass @@ -342,7 +357,7 @@ class ArchivingIntervalFinished(ApplicationEvent): class MessageUpdated(ApplicationEvent): name: str = field(init=False, default='message-updated') account: str - jid: str + jid: JID msgtxt: str properties: Any correct_id: str @@ -352,7 +367,7 @@ class MessageUpdated(ApplicationEvent): class MamMessageReceived(ApplicationEvent): name: str = field(init=False, default='mam-message-received') account: str - jid: str + jid: JID msgtxt: str properties: Any additional_data: AdditionalDataDict @@ -368,7 +383,7 @@ class MessageReceived(ApplicationEvent): conn: 'Client' stanza: Any account: str - jid: str + jid: JID msgtxt: str properties: Any additional_data: AdditionalDataDict @@ -392,7 +407,7 @@ class GcMessageReceived(MessageReceived): class MessageError(ApplicationEvent): name: str = field(init=False, default='message-error') account: str - jid: str + jid: JID room_jid: str message_id: str error: Any @@ -452,7 +467,7 @@ class SearchResultReceivedEvent(ApplicationEvent): class ReceiptReceived(ApplicationEvent): name: str = field(init=False, default='receipt-received') account: str - jid: str + jid: JID receipt_id: str @@ -462,7 +477,7 @@ class JingleEvent(ApplicationEvent): conn: 'Client' account: str fjid: str - jid: str + jid: JID sid: str resource: str jingle_session: Any @@ -571,7 +586,7 @@ class PresenceReceived(ApplicationEvent): need_add_in_roster: bool popup: bool ptype: str - jid: str + jid: JID resource: str id_: str fjid: str @@ -622,7 +637,7 @@ class FileRequestReceivedEvent(ApplicationEvent): id_: str fjid: str account: str - jid: str + jid: JID file_props: FileProp ===================================== gajim/common/jingle_ft.py ===================================== @@ -181,7 +181,7 @@ def _raise_event(self, stanza, content): fjid = con.get_module('Bytestream')._ft_get_from(stanza) account = con.name jid = app.get_jid_without_resource(fjid) - + jid = JID.from_string(jid) if not content: return ===================================== gajim/common/jingle_session.py ===================================== @@ -902,7 +902,7 @@ def __transport_accept(self, transport): def _raise_event(self, name: str, **kwargs): jid, resource = app.get_room_and_nick_from_fjid( str(self.peerjid)) - + jid = JID.from_string(jid) event_class = JINGLE_EVENTS[name] app.ged.raise_event( ===================================== gajim/common/modules/mam.py ===================================== @@ -260,7 +260,7 @@ def _mam_message_received(self, _con, stanza, properties): event_attr = { 'account': self._account, - 'jid': str(properties.jid.bare), + 'jid': properties.jid.new_as_bare(), 'msgtxt': properties.body, 'properties': properties, 'additional_data': additional_data, ===================================== gajim/common/modules/message.py ===================================== @@ -179,7 +179,7 @@ def _message_received(self, _con, stanza, properties): 'account': self._account, 'additional_data': additional_data, 'fjid': fjid, - 'jid': fjid if properties.is_muc_pm else jid, + 'jid': from_ if properties.is_muc_pm else from_.new_as_bare(), 'resource': resource, 'stanza_id': stanza_id, 'unique_id': stanza_id or message_id, ===================================== gajim/common/modules/presence.py ===================================== @@ -125,7 +125,7 @@ def _presence_received(self, _con, stanza, properties): 'need_add_in_roster': False, 'popup': False, 'ptype': properties.type.value, - 'jid': properties.jid.bare, + 'jid': properties.jid.new_as_bare(), 'resource': properties.jid.resource, 'id_': properties.id, 'fjid': str(properties.jid), ===================================== gajim/gtk/chat_list.py ===================================== @@ -495,7 +495,7 @@ def _on_jingle_request_received(self, def _on_file_request_received(self, event: events.FileRequestReceivedEvent ) -> None: - row = self._chats.get((event.account, JID.from_string(event.jid))) + row = self._chats.get((event.account, event.jid)) if row is None: return row.set_timestamp(time.time()) ===================================== gajim/gtk/main.py ===================================== @@ -29,23 +29,12 @@ from nbxmpp import JID from gajim.common import app +from gajim.common import events from gajim.common import ged from gajim.common.const import Direction -from gajim.common.events import ApplicationEvent -from gajim.common.events import MucAdded -from gajim.common.events import HttpAuth -from gajim.common.events import PasswordRequired -from gajim.common.events import PlainConnection -from gajim.common.events import RosterItemExchangeEvent -from gajim.common.events import AllowGajimUpdateCheck -from gajim.common.events import GajimUpdateAvailable -from gajim.common.events import AccountEnabled -from gajim.common.events import AccountDisabled -from gajim.common.events import ShowChanged -from gajim.common.events import SignedIn +from gajim.common.ged import EventHelper from gajim.common.helpers import ask_for_status_message from gajim.common.i18n import _ -from gajim.common.ged import EventHelper from gajim.common.modules.bytestream import is_transfer_active from .account_side_bar import AccountSideBar @@ -110,22 +99,19 @@ def __init__(self) -> None: self.register_events([ ('presence-received', ged.GUI1, self._on_event), ('message-sent', ged.GUI1, self._on_event), - ('message-received', ged.CORE, self._on_event), + ('message-received', ged.CORE, self._on_message_received), ('mam-message-received', ged.CORE, self._on_event), ('gc-message-received', ged.CORE, self._on_event), ('message-updated', ged.CORE, self._on_event), ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), - ('muc-creation-failed', ged.GUI1, self._on_event), - ('muc-self-presence', ged.GUI1, self._on_event), - ('muc-voice-request', ged.GUI1, self._on_event), ('muc-disco-update', ged.GUI1, self._on_event), - ('jingle-request-received', ged.GUI1, self._on_event), + ('jingle-request-received', ged.GUI1, self._on_jingle_request), ('jingle-connected-received', ged.GUI1, self._on_event), ('jingle-disconnected-received', ged.GUI1, self._on_event), ('jingle-error-received', ged.GUI1, self._on_event), - ('file-request-received', ged.GUI1, self._on_event), + ('file-request-received', ged.GUI1, self._on_file_request), ('file-request-sent', ged.GUI1, self._on_event), ('our-show', ged.GUI1, self._on_our_show), ('signed-in', ged.GUI1, self._on_signed_in), @@ -178,11 +164,11 @@ def _prepare_window(self) -> None: app.settings.get('trayicon') != 'always'): self.show_all() - def _on_account_enabled(self, event: AccountEnabled) -> None: + def _on_account_enabled(self, event: events.AccountEnabled) -> None: self._account_side_bar.add_account(event.account) self._main_stack.add_account_page(event.account) - def _on_account_disabled(self, event: AccountDisabled) -> None: + def _on_account_disabled(self, event: events.AccountDisabled) -> None: workspace_id = self._workspace_side_bar.get_first_workspace() self.activate_workspace(workspace_id) self._account_side_bar.remove_account(event.account) @@ -190,24 +176,26 @@ def _on_account_disabled(self, event: AccountDisabled) -> None: self._main_stack.remove_chats_for_account(event.account) @staticmethod - def _on_our_show(event: ShowChanged) -> None: + def _on_our_show(event: events.ShowChanged) -> None: if event.show == 'offline': app.app.set_account_actions_state(event.account) app.app.update_app_actions_state() @staticmethod - def _on_signed_in(event: SignedIn) -> None: + def _on_signed_in(event: events.SignedIn) -> None: app.app.set_account_actions_state(event.account, True) app.app.update_app_actions_state() - def _on_allow_gajim_update(self, event: AllowGajimUpdateCheck) -> None: + def _on_allow_gajim_update(self, + event: events.AllowGajimUpdateCheck) -> None: self.add_app_message(event.name) - def _on_gajim_update_available(self, event: GajimUpdateAvailable) -> None: + def _on_gajim_update_available(self, + event: events.GajimUpdateAvailable) -> None: self.add_app_message(event.name, event.version) @staticmethod - def _on_roster_item_exchange(event: RosterItemExchangeEvent) -> None: + def _on_roster_item_exchange(event: events.RosterItemExchangeEvent) -> None: open_window('RosterItemExchange', account=event.client.account, action=event.action, @@ -215,7 +203,7 @@ def _on_roster_item_exchange(event: RosterItemExchangeEvent) -> None: jid_from=event.jid) @staticmethod - def _on_plain_connection(event: PlainConnection) -> None: + def _on_plain_connection(event: events.PlainConnection) -> None: ConfirmationDialog( _('Insecure Connection'), _('Insecure Connection'), @@ -233,11 +221,11 @@ def _on_plain_connection(event: PlainConnection) -> None: callback=event.connect)]).show() @staticmethod - def _on_password_required(event: PasswordRequired) -> None: + def _on_password_required(event: events.PasswordRequired) -> None: open_window('PasswordDialog', event=event) @staticmethod - def _on_http_auth(event: HttpAuth) -> None: + def _on_http_auth(event: events.HttpAuth) -> None: def _response(answer: str) -> None: event.client.get_module('HTTPAuth').build_http_auth_answer( event.stanza, answer) @@ -267,7 +255,7 @@ def _response(answer: str) -> None: callback=_response, args=['yes'])]).show() - def _on_muc_added(self, event: MucAdded) -> None: + def _on_muc_added(self, event: events.MucAdded) -> None: if self.chat_exists(event.account, event.jid): return @@ -523,7 +511,7 @@ def get_chat_list(self, workspace_id: str) -> ChatList: def _add_group_chat(self, _action: Gio.SimpleAction, - param: Optional[GLib.Variant]) -> None: + param: GLib.Variant) -> None: account, jid, select = param.unpack() self.add_group_chat(account, JID.from_string(jid), select) @@ -755,35 +743,41 @@ def _load_chats(self) -> None: self._set_startup_finished() - def _on_event(self, event: ApplicationEvent) -> None: - if event.name == 'update-roster-avatar': + def _on_event(self, event: events.MainEventT) -> None: + if not self.chat_exists(event.account, event.jid): return + self._main_stack.process_event(event) + + def _on_message_received(self, event: events.MessageReceived) -> None: if not self.chat_exists(event.account, event.jid): - if event.name == 'message-received': - if not event.properties.body: - # Don’t open control on chatstate etc. - return - if event.properties.is_muc_pm: - self.add_private_chat(event.account, - event.properties.jid) - else: - jid = event.properties.jid.new_as_bare() - self.add_chat(event.account, jid, 'contact') - elif event.name == 'jingle-request-received': - content_types = [] - for item in event.contents: - content_types.append(item.media) - if 'audio' in content_types or 'video' in content_types: - # AV Call received, open chat control - self.add_chat(event.account, event.jid, 'contact') - elif event.name == 'file-request-received': - # Jingle file transfer, open chat control - self.add_chat(event.account, event.jid, 'contact') - else: - # No chat is open, dont handle any gui events + if not event.properties.body: + # Don’t open control on chatstate etc. return + if event.properties.is_muc_pm: + self.add_private_chat(event.account, + event.properties.jid) + + else: + jid = event.properties.jid.new_as_bare() + self.add_chat(event.account, jid, 'contact') + + self._main_stack.process_event(event) + + def _on_jingle_request(self, event: events.JingleRequestReceived) -> None: + if not self.chat_exists(event.account, event.jid): + for item in event.contents: + if item.media in ('audio', 'video'): + self.add_chat(event.account, event.jid, 'contact') + break + + self._main_stack.process_event(event) + + def _on_file_request(self, event: events.FileRequestReceivedEvent) -> None: + if not self.chat_exists(event.account, event.jid): + self.add_chat(event.account, event.jid, 'contact') + self._main_stack.process_event(event) def quit(self) -> None: @@ -807,8 +801,7 @@ def on_continue2(message: Optional[str]) -> None: app.app.start_shutdown(message=message) return # check if there is an active file transfer - files_props = app.interface.instances['file_transfers'].\ - files_props + files_props = app.interface.instances['file_transfers'].files_props transfer_active = False for x in files_props: for y in files_props[x]: ===================================== gajim/gui_interface.py ===================================== @@ -118,7 +118,7 @@ def __init__(self): self._create_core_handlers_list() self._register_core_handlers() - self.instances = {} + self.instances: dict[str, Any] = {} for acc in app.connections: self.instances[acc] = { @@ -126,7 +126,6 @@ def __init__(self): 'disco': {} } app.automatic_rooms[acc] = {} - app.newly_added[acc] = [] app.to_be_removed[acc] = [] app.nicks[acc] = app.settings.get_account_setting(acc, 'name') @@ -531,7 +530,6 @@ def enable_account(self, account: str) -> None: } app.automatic_rooms[account] = {} - app.newly_added[account] = [] app.to_be_removed[account] = [] app.nicks[account] = app.settings.get_account_setting(account, 'name') app.settings.set_account_setting(account, 'active', True) @@ -566,7 +564,6 @@ def disable_account(self, account: str) -> None: del app.nicks[account] del app.automatic_rooms[account] del app.to_be_removed[account] - del app.newly_added[account] def remove_account(self, account: str) -> None: if app.settings.get_account_setting(account, 'active'): ===================================== pyrightconfig.json ===================================== @@ -60,6 +60,7 @@ "gajim/gtk/groupchat_nick.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", + "gajim/gtk/main.py", "gajim/gtk/main_stack.py", "gajim/gtk/manage_sounds.py", "gajim/gtk/notification.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e797ae75677f0c2d8389dab1d0121c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e797ae75677f0c2d8389dab1d0121c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Groupchat: Remove rename page
by Daniel Brötzmann (＠wurstsalat) 23 Jan '22

23 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 298a6900 by wurstsalat at 2022-01-23T19:06:13+01:00 Groupchat: Remove rename page - - - - - e797ae75 by wurstsalat at 2022-01-23T19:25:36+01:00 Menus: Unify single and group chat menu - - - - - 3 changed files: - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/groupchat.py - gajim/gtk/menus.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1748,112 +1748,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Rename This Chat</property> - <property name="xalign">0</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="name_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="caps-lock-warning">False</property> - <property name="secondary-icon-name">face-smile-symbolic</property> - <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> - <property name="secondary-icon-tooltip-markup" translatable="yes">Insert Emoji</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="rename_button"> - <property name="label" translatable="yes">_Rename</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_rename_clicked" swapped="no"/> - <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="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">rename</property> - <property name="position">10</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> @@ -1934,9 +1829,6 @@ <property name="position">11</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -2148,7 +2040,7 @@ </object> <packing> <property name="name">muc-manage</property> - <property name="position">13</property> + <property name="position">12</property> </packing> </child> <child> @@ -2257,7 +2149,7 @@ </object> <packing> <property name="name">avatar-selector</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> </object> ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -286,7 +286,6 @@ def add_actions(self) -> None: super().add_actions() actions = [ ('groupchat-manage-', None, self._on_groupchat_manage), - ('rename-groupchat-', None, self._on_rename_groupchat), ('change-nickname-', None, self._on_change_nick), ('destroy-', None, self._on_destroy_room), ('configure-', None, self._on_configure_room), @@ -385,7 +384,6 @@ def remove_actions(self) -> None: super().remove_actions() actions = [ 'groupchat-manage-', - 'rename-groupchat-', 'change-nickname-', 'destroy-', 'configure-', @@ -1578,8 +1576,6 @@ def focus(self) -> None: self.xml.password_entry.grab_focus_without_selecting() elif page_name == 'nickname': self.xml.nickname_entry.grab_focus_without_selecting() - elif page_name == 'rename': - self.xml.name_entry.grab_focus_without_selecting() elif page_name == 'subject': self.xml.subject_textview.grab_focus() elif page_name == 'captcha': @@ -1645,23 +1641,6 @@ def _on_nickname_change_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').change_nick(self.room_jid, new_nick) self._show_page('groupchat') - def _on_rename_groupchat(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: - if self._get_current_page() != 'groupchat': - return - self.xml.name_entry.set_text(self.contact.name) - self.xml.name_entry.grab_focus() - self.xml.rename_button.grab_default() - self._show_page('rename') - - def _on_rename_clicked(self, _button: Gtk.Button) -> None: - new_name = self.xml.name_entry.get_text() - self._client.get_module('Bookmarks').modify( - self.room_jid, name=new_name) - self._show_page('groupchat') - def _on_manage_save_clicked(self, _button: Gtk.Button) -> None: if self._room_config_form is not None: name = self.xml.muc_name_entry.get_text() ===================================== gajim/gtk/menus.py ===================================== @@ -64,35 +64,36 @@ def get_singlechat_menu(control_id: str, is_self_contact = jid.bare == client.get_own_jid().bare contact = client.get_module('Contacts').get_contact(jid) - singlechat_menu: list[tuple[str, Any]] = [ + self_contact_menu: list[tuple[str, Any]] = [ + ('profile', _('Profile')), (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')) - ]) + ]), + ('app.remove-history', _('Remove History…')), + ('win.search-history', _('Search…')) ] - additional_menu: list[tuple[str, Any]] = [ + singlechat_menu: list[tuple[str, Any]] = [ + ('win.information-', _('Details')), ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.block-contact-', _('Block Contact…')), + (_('Send File'), [ + ('win.send-file-httpupload-', _('Upload File…')), + ('win.send-file-jingle-', _('Send File Directly…')) + ]), ('win.start-call-', _('Start Call…')), - ('win.information-', _('Information')), - ('app.remove-history', _('Remove History…')) + ('app.remove-history', _('Remove History…')), + ('win.search-history', _('Search…')) ] if not contact.is_in_roster: if (type_.is_chat or (type_.is_privatechat and contact.real_jid is not None)): - additional_menu.append( + singlechat_menu.append( ('win.add-to-roster-', _('Add to Contact List…'))) - if is_self_contact: - singlechat_menu.append(('profile', _('Profile'))) - else: - singlechat_menu.extend(additional_menu) - - singlechat_menu.append(('win.search-history', _('Search…'))) - def build_chatstate_menu() -> Gio.Menu: menu = Gio.Menu() entries = [ @@ -112,7 +113,7 @@ def build_menu(preset: list[tuple[str, Any]]): for item in preset: if isinstance(item[1], str): action_name, label = item - if action_name == 'win.send-marker-' and type_ == 'pm': + if action_name == 'win.send-marker-' and type_.is_privatechat: continue if action_name == 'win.search-history': @@ -142,6 +143,9 @@ def build_menu(preset: list[tuple[str, Any]]): menu.append_submenu(label, submenu) return menu + if is_self_contact: + return build_menu(self_contact_menu) + return build_menu(singlechat_menu) @@ -152,12 +156,11 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: menulist: MenuItemListT = [ (_('Details'), f'win.groupchat-details-{control_id}', None), (_('Manage…'), f'win.groupchat-manage-{control_id}', None), - (_('Rename Chat…'), f'win.rename-groupchat-{control_id}', None), (_('Change Nickname…'), f'win.change-nickname-{control_id}', None), (_('Request Voice'), f'win.request-voice-{control_id}', None), (_('Execute Command…'), f'win.execute-command-{control_id}', '""'), - (_('Search…'), 'win.search-history', None), - (_('Remove History…'), 'app.remove-history', params) + (_('Remove History…'), 'app.remove-history', params), + (_('Search…'), 'win.search-history', None) ] return make_menu(menulist) @@ -408,7 +411,7 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: value = f'"{jid}"' menuitems: MenuItemListT = [ - (_('Information'), f'win.contact-info-{account}', value), + (_('Details'), f'win.contact-info-{account}', value), (_('Execute Command…'), f'win.execute-command-{account}', value), (block_label, f'win.block-contact-{account}', value), (_('Remove…'), f'win.remove-contact-{account}', value), @@ -429,7 +432,7 @@ def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: value = f'"{jid}"' menuitems: MenuItemListT = [ (_('Start Chat'), 'win.add-chat', params), - (_('Information'), f'win.contact-info-{account}', value), + (_('Details'), f'win.contact-info-{account}', value), (_('Block'), f'win.subscription-block-{account}', value), (_('Report'), f'win.subscription-report-{account}', value), (_('Deny'), f'win.subscription-deny-{account}', value), @@ -588,7 +591,7 @@ def get_groupchat_roster_menu(account: str, value = f'"{contact.name}"' general_items: MenuItemListT = [ - (_('Information'), f'win.contact-information-{control_id}', value), + (_('Details'), f'win.contact-information-{control_id}', value), (_('Execute Command…'), f'win.execute-command-{control_id}', value), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59439c83b3b7e5136a3508328f037bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59439c83b3b7e5136a3508328f037bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add ConfirmationDialog for removing chat history
by Daniel Brötzmann (＠wurstsalat) 23 Jan '22

23 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 59439c83 by wurstsalat at 2022-01-23T14:36:11+01:00 Add ConfirmationDialog for removing chat history - - - - - 2 changed files: - gajim/gtk/application.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -74,6 +74,8 @@ from gajim.gui.about import AboutDialog from gajim.gui.avatar import AvatarStorage from gajim.gui.builder import get_builder +from gajim.gui.dialogs import DialogButton +from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import ShortcutsWindow from gajim.gui.discovery import ServiceDiscoveryWindow from gajim.gui.util import get_app_window @@ -803,15 +805,23 @@ def _on_open_chat_action(_action: Gio.SimpleAction, def _on_remove_history_action(_action: Gio.SimpleAction, params: structs.RemoveHistoryActionParams ) -> None: - - if params.jid is not None: - app.storage.archive.remove_history(params.account, params.jid) - control = app.window.get_control(params.account, params.jid) - if control is not None: - control.reset_view() - else: - for control in app.window.get_controls(params.account): - control.reset_view() + def _remove() -> None: + if params.jid is not None: + app.storage.archive.remove_history(params.account, params.jid) + control = app.window.get_control(params.account, params.jid) + if control is not None: + control.reset_view() + else: + for control in app.window.get_controls(params.account): + control.reset_view() + ConfirmationDialog( + _('Remove Chat History'), + _('Remove Chat History?'), + _('Do you really want to remove your chat history for this chat?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=_remove)], + transient_for=app.window).show() @staticmethod @structs.actionfunction ===================================== gajim/gtk/menus.py ===================================== @@ -77,7 +77,7 @@ def get_singlechat_menu(control_id: str, ('win.block-contact-', _('Block Contact…')), ('win.start-call-', _('Start Call…')), ('win.information-', _('Information')), - ('app.remove-history', _('Remove History')) + ('app.remove-history', _('Remove History…')) ] if not contact.is_in_roster: @@ -157,7 +157,7 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: (_('Request Voice'), f'win.request-voice-{control_id}', None), (_('Execute Command…'), f'win.execute-command-{control_id}', '""'), (_('Search…'), 'win.search-history', None), - (_('Remove History'), 'app.remove-history', params) + (_('Remove History…'), 'app.remove-history', params) ] return make_menu(menulist) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59439c83b3b7e5136a3508328f037bce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59439c83b3b7e5136a3508328f037bce… 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