Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Helpers: Refactor is_affiliation_change_allowed()
by Philipp Hörist (＠lovetox) 12 Jan '22

12 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7e115109 by lovetox at 2022-01-12T17:25:03+01:00 Helpers: Refactor is_affiliation_change_allowed() - Allow target_aff passed as str and Affiliation - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1175,9 +1175,11 @@ def get_groupchat_name(client: types.Client, jid: Union[str, JID]) -> str: def is_affiliation_change_allowed(self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant, - target_aff: Affiliation) -> bool: + target_aff: Union[str, Affiliation]) -> bool: + if isinstance(target_aff, str): + target_aff = Affiliation(target_aff) - if contact.affiliation.value == target_aff: + if contact.affiliation == target_aff: # Contact has already the target affiliation return False @@ -1187,9 +1189,10 @@ def is_affiliation_change_allowed(self_contact: types.GroupchatParticipant, if not self_contact.affiliation.is_admin: return False - if target_aff in ('admin', 'owner'): + if target_aff in (Affiliation.OWNER, Affiliation.ADMIN): # Admin can’t edit admin/owner list return False + return self_contact.affiliation > contact.affiliation View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e115109ea3870f782e785ac53d1fd58… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e115109ea3870f782e785ac53d1fd58… You're receiving this email because of your account on dev.gajim.org.

1 0

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

12 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d065741d by wurstsalat at 2022-01-12T17:17:06+01:00 FileProps: Typing - - - - - 1b52bb71 by wurstsalat at 2022-01-12T17:17:06+01:00 Tooltips: Typing - - - - - 2 changed files: - gajim/common/file_props.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/file_props.py ===================================== @@ -17,48 +17,54 @@ True """ -from typing import Any # pylint: disable=unused-import -from typing import ClassVar # pylint: disable=unused-import -from typing import Dict # pylint: disable=unused-import -from typing import Tuple # pylint: disable=unused-import +from __future__ import annotations + +from typing import Callable +from typing import Literal +from typing import Optional +from typing import ClassVar class FilesProp: - _files_props = {} # type: ClassVar[Dict[Tuple[str, str], Any]] + _files_props: ClassVar[dict[tuple[str, str], FileProp]] = {} def __init__(self): raise Exception('this class should not be instantiated') @classmethod - def getNewFileProp(cls, account, sid): + def getNewFileProp(cls, account: str, sid: str) -> FileProp: fp = FileProp(account, sid) cls.setFileProp(fp, account, sid) return fp @classmethod - def getFileProp(cls, account, sid): - return cls._files_props.get(account, sid) + def getFileProp(cls, account: str, sid: str) -> Optional[FileProp]: + return cls._files_props.get((account, sid)) @classmethod - def getFilePropByAccount(cls, account): + def getFilePropByAccount(cls, account: str) -> list[FileProp]: # Returns a list of file_props in one account - file_props = [] + file_props: list[FileProp] = [] for account_, sid in cls._files_props: if account_ == account: file_props.append(cls._files_props[account, sid]) return file_props @classmethod - def getFilePropByType(cls, type_, sid): + def getFilePropByType(cls, + type_: Literal['r', 's'], + sid: str + ) -> Optional[FileProp]: # This method should be deleted. Getting fileprop by type and sid is not # unique enough. More than one fileprop might have the same type and sid files_prop = cls.getAllFileProp() for fp in files_prop: if fp.type_ == type_ and fp.sid == sid: return fp + return None @classmethod - def getFilePropBySid(cls, sid): + def getFilePropBySid(cls, sid: str) -> Optional[FileProp]: # This method should be deleted. It is kept to make things compatible # This method should be replaced and instead get the file_props by # account and sid @@ -66,99 +72,98 @@ def getFilePropBySid(cls, sid): for fp in files_prop: if fp.sid == sid: return fp + return None @classmethod - def getFilePropByTransportSid(cls, account, sid): + def getFilePropByTransportSid(cls, + account: str, + sid: str + ) -> Optional[FileProp]: files_prop = cls.getAllFileProp() for fp in files_prop: if fp.account == account and fp.transport_sid == sid: return fp + return None @classmethod - def getAllFileProp(cls): + def getAllFileProp(cls) -> list[FileProp]: return list(cls._files_props.values()) @classmethod - def setFileProp(cls, fp, account, sid): + def setFileProp(cls, fp: FileProp, account: str, sid: str) -> None: cls._files_props[account, sid] = fp @classmethod - def deleteFileProp(cls, file_prop): + def deleteFileProp(cls, file_prop: FileProp) -> None: files_props = cls._files_props - a = s = None + acc = sid_ = None for key in files_props: account, sid = key fp = files_props[account, sid] if fp is file_prop: - a = account - s = sid - if a is not None and s is not None: - del files_props[a, s] + acc = account + sid_ = sid + if acc is not None and sid_ is not None: + del files_props[acc, sid_] class FileProp: - - def __init__(self, account, sid): - # Do not instantiate this class directly. Call FilesProp.getNeFileProp - # instead + def __init__(self, account: str, sid: str) -> None: + # Do not instantiate this class directly! + # Call FilesProp.getNeFileProp instead self.streamhosts = [] - self.transfered_size = [] - self.started = False - self.completed = False - self.paused = False - self.stalled = False - self.connected = False - self.stopped = False - self.is_a_proxy = False + self.transfered_size: list[int] = [] + self.started: bool = False + self.completed: bool = False + self.paused: bool = False + self.stalled: bool = False + self.connected: bool = False + self.stopped: bool = False + self.is_a_proxy: bool = False self.proxyhost = None self.proxy_sender = None self.proxy_receiver = None self.streamhost_used = None - # method callback called in case of transfer failure - self.failure_cb = None - # method callback called when disconnecting + self.failure_cb: Optional[Callable[[str], None]] = None self.disconnect_cb = None - self.continue_cb = None - self.sha_str = None + self.continue_cb: Optional[Callable[..., None]] = None + self.sha_str: Optional[str] = None # transfer type: 's' for sending and 'r' for receiving - self.type_ = None - self.error = None - # Elapsed time of the file transfer - self.elapsed_time = 0 - self.last_time = None - self.received_len = None - # full file path - self.file_name = None - self.name = None - self.date = None - self.desc = None - self.offset = None - self.sender = None - self.receiver = None - self.tt_account = None - self.size = None + self.type_: Optional[Literal['r', 's']] = None + self.error: Optional[int] = None + self.elapsed_time: float = 0 # Elapsed time of the file transfer + self.last_time: Optional[float] = None + self.received_len: Optional[int] = None + self.file_name: Optional[str] = None # full file path + self.name: Optional[str] = None + self.date: Optional[str] = None + self.desc: Optional[str] = None + self.offset: Optional[int] = None + self.sender: Optional[str] = None + self.receiver: Optional[str] = None + self.tt_account: Optional[str] = None + self.size: Optional[int] = None self._sid = sid - self.transport_sid = None + self.transport_sid: Optional[str] = None self.account = account - self.mime_type = None - self.algo = None - self.direction = None - self.syn_id = None - self.seq = None - self.hash_ = None - self.fd = None - self.startexmpp = None + self.mime_type: Optional[str] = None + self.algo: Optional[str] = None + self.direction: Optional[Literal['<', '>']] = None + self.syn_id: Optional[str] = None + self.seq: Optional[int] = None + self.hash_: Optional[str] = None + self.fd: Optional[int] = None # Type of the session, if it is 'jingle' or 'si' - self.session_type = None - self.request_id = None + self.session_type: Optional[str] = None + self.request_id: Optional[str] = None self.proxyhosts = None self.dstaddr = None - def getsid(self): + def getsid(self) -> str: # Getter of the property sid return self._sid - def setsid(self, value): + def setsid(self, value: str) -> None: # The sid value will change # we need to change the in _files_props key as well del FilesProp._files_props[self.account, self._sid] ===================================== gajim/gtk/tooltips.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.const import PEPEventType from gajim.common.i18n import Q_ from gajim.common.i18n import _ +from gajim.common.file_props import FileProp from .avatar import get_show_circle from .builder import get_builder @@ -120,7 +121,7 @@ def _populate_grid(self, contact: types.GroupchatParticipant) -> None: app.plugin_manager.gui_extension_point( 'gc_tooltip_populate', self, contact, self._ui.tooltip_grid) - def destroy(self): + def destroy(self) -> None: self._ui.tooltip_grid.destroy() @@ -262,7 +263,7 @@ def _append_pep_info(self, contact: types.BareContact) -> None: self._ui.location.show() self._ui.location_label.show() - def destroy(self): + def destroy(self) -> None: self.clear_tooltip() @@ -279,52 +280,54 @@ def clear_tooltip(self) -> None: self.sid = None self.widget = None - def get_tooltip(self, file_props, sid) -> tuple[bool, Gtk.Widget]: + def get_tooltip(self, + file_prop: FileProp, + sid: str + ) -> tuple[bool, Gtk.Widget]: if self.sid == sid: + assert self.widget is not None return True, self.widget - self.widget = self._create_tooltip(file_props, sid) + self.widget = self._create_tooltip(file_prop, sid) self.sid = sid return False, self.widget - def _create_tooltip(self, file_props, _sid) -> None: - ft_grid = Gtk.Grid.new() + def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: + ft_grid = Gtk.Grid(row_spacing=6, column_spacing=12) ft_grid.insert_column(0) - ft_grid.set_row_spacing(6) - ft_grid.set_column_spacing(12) current_row = 0 - properties = [] - name = file_props.name - if file_props.type_ == 'r': - file_name = os.path.split(file_props.file_name)[1] + properties: list[tuple[str, str]] = [] + name = file_prop.name + if file_prop.type_ == 'r': + file_name = os.path.split(file_prop.file_name)[1] else: - file_name = file_props.name + file_name = file_prop.name properties.append((_('File Name: '), GLib.markup_escape_text(file_name))) - client = app.get_client(file_props.tt_account) - if file_props.type_ == 'r': + client = app.get_client(file_prop.tt_account) + if file_prop.type_ == 'r': type_ = Q_('?Noun:Download') actor = _('Sender: ') - sender = JID.from_string(file_props.sender) + sender = JID.from_string(file_prop.sender) name = client.get_module('Contacts').get_contact(sender.bare).name else: type_ = Q_('?Noun:Upload') actor = _('Recipient: ') - receiver = JID.from_string(file_props.receiver) + receiver = JID.from_string(file_prop.receiver) name = client.get_module('Contacts').get_contact( receiver.bare).name properties.append((Q_('?transfer type:Type: '), type_)) properties.append((actor, GLib.markup_escape_text(name))) - transfered_len = file_props.received_len + transfered_len = file_prop.received_len if not transfered_len: transfered_len = 0 properties.append((Q_('?transfer status:Transferred: '), GLib.format_size_full(transfered_len, self.units))) - status = self._get_current_status(file_props) + status = self._get_current_status(file_prop) properties.append((Q_('?transfer status:Status: '), status)) - file_desc = file_props.desc or '' + file_desc = file_prop.desc or '' properties.append((_('Description: '), GLib.markup_escape_text(file_desc))) @@ -347,19 +350,19 @@ def _create_tooltip(self, file_props, _sid) -> None: return ft_grid @staticmethod - def _get_current_status(file_props) -> None: - if file_props.stopped: + def _get_current_status(file_prop: FileProp) -> str: + if file_prop.stopped: return Q_('?transfer status:Aborted') - if file_props.completed: + if file_prop.completed: return Q_('?transfer status:Completed') - if file_props.paused: + if file_prop.paused: return Q_('?transfer status:Paused') - if file_props.stalled: + if file_prop.stalled: # stalled is not paused. it is like 'frozen' it stopped alone return Q_('?transfer status:Stalled') - if file_props.connected: - if file_props.started: + if file_prop.connected: + if file_prop.started: return Q_('?transfer status:Transferring') return Q_('?transfer status:Not started') return Q_('?transfer status:Not started') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ffa79c74a49b8d70fb71779849d63f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ffa79c74a49b8d70fb71779849d63f6… You're receiving this email because of your account on dev.gajim.org.

1 0

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

12 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 48dda6b6 by lovetox at 2022-01-12T17:02:47+01:00 Util: Add type annotations - - - - - 863cd8f2 by lovetox at 2022-01-12T17:02:47+01:00 App: Improve check_finalize() It now checks also if the GObject.Object was finalized. Before it did only for the Python wrapper - - - - - ffa79c74 by lovetox at 2022-01-12T17:02:47+01:00 Menu: Port groupchat roster menu to Gio.Menu - - - - - 4 changed files: - gajim/common/app.py - gajim/gtk/groupchat_roster.py - gajim/gtk/menus.py - gajim/gtk/util.py Changes: ===================================== gajim/common/app.py ===================================== @@ -44,6 +44,7 @@ from nbxmpp.idlequeue import IdleQueue from gi.repository import Gdk from gi.repository import GLib +from gi.repository import GObject import gajim from gajim.common import types @@ -669,6 +670,15 @@ def check_finalize(obj: Any) -> None: logger = logging.getLogger('gajim.leak') finalizer = weakref.finalize(obj, logger.info, f'{name} has been finalized') + g_objects: list[str] = [] + if isinstance(obj, GObject.Object): + g_objects.append(name) + + def g_object_finalized(): + g_objects.remove(name) + + obj.weak_ref(g_object_finalized) + def is_finalizer_ref(ref): try: return isinstance(ref[2][0], str) @@ -677,6 +687,11 @@ def is_finalizer_ref(ref): def check_finalized(): gc.collect() + gc.collect() + + if g_objects: + logger.warning('GObject not finalized: %s', name) + tup = finalizer.peek() if tup is None: return ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -365,27 +365,31 @@ def _on_roster_button_press_event(self, return if event.button == 3: # right click - self._show_contact_menu(nick) + rec = Gdk.Rectangle() + rec.x, rec.y = int(event.x), int(event.y) + rec.height, rec.width = 1, 1 + self._show_contact_menu(nick, rec) if event.button == 2: # middle click self.emit('row-activated', nick) - def _show_contact_menu(self, nick: str) -> None: + def _show_contact_menu(self, nick: str, rect: Gdk.Rectangle) -> None: self_contact = self._group_chat_contact.get_self() + assert self_contact is not None contact = self._group_chat_contact.get_resource(nick) menu = get_groupchat_roster_menu(self._account, self._control_id, self_contact, contact) - def destroy(menu: Gtk.Menu, _pspec: GObject.ParamSpec) -> None: - visible = menu.get_property('visible') - if not visible: - GLib.idle_add(menu.destroy) + def destroy(popover: Gtk.Popover) -> None: + app.check_finalize(popover) + GLib.idle_add(popover.set_relative_to, None) - menu.attach_to_widget(self, None) - menu.connect('notify::visible', destroy) - menu.popup_at_pointer() + popover = Gtk.Popover.new_from_model(self, menu) + popover.set_pointing_to(rect) + popover.connect('closed', destroy) + popover.popup() def _tree_compare_iters(self, model: Gtk.TreeModel, ===================================== gajim/gtk/menus.py ===================================== @@ -525,107 +525,92 @@ def build_workspaces_submenu(current_workspace_id: str, return submenu -def get_groupchat_roster_menu(account: str, - control_id: str, - self_contact: types.GroupchatParticipant, - contact: types.GroupchatParticipant - ) -> Gtk.Menu: - menu = Gtk.Menu() - real_jid = '' - if contact.real_jid is not None: - real_jid = contact.real_jid.bare - - item = Gtk.MenuItem(label=_('Information')) - action = f'win.contact-information-{control_id}::{contact.name}' - item.set_detailed_action_name(action) - menu.append(item) - - item = Gtk.MenuItem(label=_('Add to Contact List…')) - action = f'app.{account}-add-contact(["{account}", "{real_jid}"])' - if contact.real_jid is None: - item.set_sensitive(False) - else: - item.set_detailed_action_name(action) - menu.append(item) - - item = Gtk.MenuItem(label=_('Execute Command…')) - action = f'win.execute-command-{control_id}::{contact.name}' - item.set_detailed_action_name(action) - menu.append(item) - - menu.append(Gtk.SeparatorMenuItem()) - - item = Gtk.MenuItem(label=_('Kick')) - action = f'win.kick-{control_id}::{contact.name}' - if is_role_change_allowed(self_contact, contact): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) +def get_groupchat_admin_menu(control_id: str, + self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant) -> Gio.Menu: - item = Gtk.MenuItem(label=_('Ban')) - action = f'win.ban-{control_id}::{real_jid}' - if is_affiliation_change_allowed(self_contact, contact, 'outcast'): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) + adminitems: MenuItemListT = [] - menu.append(Gtk.SeparatorMenuItem()) + action = f'win.change-affiliation-{control_id}' - item = Gtk.MenuItem(label=_('Make Owner')) - action = (f'win.change-affiliation-{control_id}' - f'(["{contact.real_jid}", "owner"])') if is_affiliation_change_allowed(self_contact, contact, 'owner'): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) + value = f'["{contact.real_jid}", "owner"]' + adminitems.append((_('Make Owner'), action, value)) - item = Gtk.MenuItem(label=_('Make Admin')) - action = (f'win.change-affiliation-{control_id}' - f'(["{contact.real_jid}", "admin"])') if is_affiliation_change_allowed(self_contact, contact, 'admin'): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) + value = f'["{contact.real_jid}", "admin"]' + adminitems.append((_('Make Admin'), action, value)) - item = Gtk.MenuItem(label=_('Make Member')) - action = (f'win.change-affiliation-{control_id}' - f'(["{contact.real_jid}", "member"])') if is_affiliation_change_allowed(self_contact, contact, 'member'): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) + value = f'["{contact.real_jid}", "member"]' + adminitems.append((_('Make Member'), action, value)) - item = Gtk.MenuItem(label=_('Revoke Member')) - action = (f'win.change-affiliation-{control_id}' - f'(["{contact.real_jid}", "none"])') if is_affiliation_change_allowed(self_contact, contact, 'none'): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) + value = f'["{contact.real_jid}", "none"]' + adminitems.append((_('Revoke Member'), action, value)) - if contact.role.is_visitor: - label = _('Grant Voice') - role = 'participant' - else: - label = _('Revoke Voice') - role = 'visitor' + if is_affiliation_change_allowed(self_contact, contact, 'outcast'): + value = f'"{contact.real_jid}"' + adminitems.append((_('Ban…'), f'win.ban-{control_id}', value)) + + if not adminitems: + adminitems.append((_('Not Available'), 'dummy', None)) + + return make_menu(adminitems) + + +def get_groupchat_mod_menu(control_id: str, + self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant + ) -> Gio.Menu: + + moditems: MenuItemListT = [] - item = Gtk.MenuItem(label=label) - action = (f'win.change-role-{control_id}' - f'(["{contact.name}", "{role}"])') if is_role_change_allowed(self_contact, contact): - item.set_detailed_action_name(action) - else: - item.set_sensitive(False) - menu.append(item) + value = f'"{contact.name}"' + moditems.append((_('Kick…'), f'win.kick-{control_id}', value)) + + action = f'win.change-role-{control_id}' + + if is_role_change_allowed(self_contact, contact): + if contact.role.is_visitor: + value = f'["{contact.name}", "participant"]' + moditems.append((_('Grant Voice'), action, value)) + else: + value = f'["{contact.name}", "visitor"]' + moditems.append((_('Revoke Voice'), action, value)) + + if not moditems: + moditems.append((_('Not Available'), 'dummy', None)) + + return make_menu(moditems) + + +def get_groupchat_roster_menu(account: str, + control_id: str, + self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant + ) -> Gio.Menu: + + value = f'"{contact.name}"' + + general_items: MenuItemListT = [ + (_('Information'), f'win.contact-information-{control_id}', value), + (_('Execute Command…'), f'win.execute-command-{control_id}', value), + ] + + real_contact = contact.get_real_contact() + if real_contact is not None and not real_contact.is_in_roster: + value = f'["{account}", "{real_contact.jid}"]' + action = f'app.{account}-add-contact' + general_items.insert(1, (_('Add to Contact List…'), action, value)) + + mod_menu = get_groupchat_mod_menu(control_id, self_contact, contact) + admin_menu = get_groupchat_admin_menu(control_id, self_contact, contact) - menu.show_all() + menu = make_menu(general_items) + menu.append_section(_('Moderation'), mod_menu) + menu.append_section(_('Administration'), admin_menu) return menu ===================================== gajim/gtk/util.py ===================================== @@ -67,6 +67,7 @@ MenuValueT = Union[None, str, GLib.Variant, VariantMixin] +MenuItemListT = list[tuple[str, str, MenuValueT]] class NickCompletionGenerator: @@ -911,7 +912,7 @@ def get_key_theme() -> Optional[str]: def make_menu_item(label: str, - action: str, + action: Optional[str] = None, value: MenuValueT = None) -> Gio.MenuItem: if value is None: @@ -927,7 +928,7 @@ def make_menu_item(label: str, return item -def make_menu(menuitems: list[tuple[str, str, MenuValueT]]) -> Gio.Menu: +def make_menu(menuitems: MenuItemListT) -> Gio.Menu: menu = Gio.Menu() for item in menuitems: menuitem = make_menu_item(*item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e21d2e9aa12e28426d86c86a8ff5ab2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e21d2e9aa12e28426d86c86a8ff5ab2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Themes: Typing
by Daniel Brötzmann (＠wurstsalat) 12 Jan '22

12 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2502c2e1 by wurstsalat at 2022-01-12T14:18:31+01:00 Themes: Typing - - - - - e88c58ba by wurstsalat at 2022-01-12T15:06:23+01:00 SynchronizeAccounts: Typing - - - - - 9382e923 by wurstsalat at 2022-01-12T15:40:51+01:00 Improve type annotations for video preview and gstreamer - - - - - c1474810 by wurstsalat at 2022-01-12T16:20:28+01:00 WorkspaceDialog: Typing - - - - - e21d2e9a by wurstsalat at 2022-01-12T16:20:44+01:00 WorkspaceSidebar: Typing - - - - - 8 changed files: - gajim/common/app.py - gajim/gtk/call_widget.py - gajim/gtk/gstreamer.py - gajim/gtk/synchronize_accounts.py - gajim/gtk/themes.py - gajim/gtk/video_preview.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/common/app.py ===================================== @@ -231,8 +231,8 @@ def detect_dependencies() -> None: conference = Gst.ElementFactory.make('fsrtpconference', None) conference.new_session(Farstream.MediaType.AUDIO) from gajim.gui.gstreamer import create_gtk_widget - sink, _, _ = create_gtk_widget() - if sink is not None: + gtk_widget = create_gtk_widget() + if gtk_widget is not None: _dependencies['AV'] = True except Exception as error: log('gajim').warning('AV dependency test failed: %s', error) ===================================== gajim/gtk/call_widget.py ===================================== @@ -471,8 +471,10 @@ def _update_video(self) -> None: self._ui.outgoing_viewport.set_no_show_all(True) self._ui.outgoing_viewport.hide() - sink_other, self._video_widget_other, _name = create_gtk_widget() - sink_self, self._video_widget_self, _name = create_gtk_widget() + other_gtk_widget = create_gtk_widget() + self_gtk_widget = create_gtk_widget() + sink_other, self._video_widget_other, _name = other_gtk_widget + sink_self, self._video_widget_self, _name = self_gtk_widget self._ui.incoming_viewport.add(self._video_widget_other) self._ui.outgoing_viewport.add(self._video_widget_self) ===================================== gajim/gtk/gstreamer.py ===================================== @@ -22,14 +22,14 @@ pass -def create_gtk_widget() -> Tuple[Optional[Gst.Element], - Optional[Gtk.Widget], - Optional[str]]: +def create_gtk_widget() -> Optional[Tuple[Gst.Element, + Gtk.Widget, + str]]: gtkglsink = Gst.ElementFactory.make('gtkglsink', None) if gtkglsink is not None: glsinkbin = Gst.ElementFactory.make('glsinkbin', None) if glsinkbin is None: - return None, None, None + return None glsinkbin.set_property('sink', gtkglsink) sink = glsinkbin widget = gtkglsink.get_property('widget') @@ -37,7 +37,7 @@ def create_gtk_widget() -> Tuple[Optional[Gst.Element], else: sink = Gst.ElementFactory.make('gtksink', None) if sink is None: - return None, None, None + return None widget = sink.get_property('widget') name = 'gtksink' widget.set_visible(True) ===================================== gajim/gtk/synchronize_accounts.py ===================================== @@ -25,7 +25,7 @@ class SynchronizeAccounts(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -82,15 +82,16 @@ def __init__(self, account): self.show_all() - 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 _init_accounts(self): + def _init_accounts(self) -> None: """ Initialize listStore with existing accounts """ model = self._ui.accounts_treeview.get_model() + assert isinstance(model, Gtk.ListStore) model.clear() for remote_account in app.connections: if remote_account == self.account: @@ -104,15 +105,13 @@ def _init_accounts(self): 1, app.get_hostname_from_account(remote_account)) - def _on_next_clicked(self, _widget): + def _on_next_clicked(self, _button: Gtk.Button) -> None: selection = self._ui.accounts_treeview.get_selection() (model, iter_) = selection.get_selected() if not iter_: return self._remote_account = model.get_value(iter_, 0) - self._remote_client = app.get_client(self._remote_account) - if not app.account_is_available(self._remote_account): ErrorDialog( _('This account is not connected to the server'), @@ -120,24 +119,27 @@ def _on_next_clicked(self, _widget): 'connected.')) return + self._remote_client = app.get_client(self._remote_account) self._init_contacts() self._ui.stack.set_visible_child_full( 'contacts', Gtk.StackTransitionType.SLIDE_LEFT) - def _on_back_clicked(self, _button): + def _on_back_clicked(self, _button: Gtk.Button) -> None: self._ui.stack.set_visible_child_full( 'accounts', Gtk.StackTransitionType.SLIDE_RIGHT) def _init_contacts(self): model = self._ui.contacts_treeview.get_model() + assert isinstance(model, Gtk.ListStore) model.clear() # recover local contacts - local_jid_list = [] + local_jid_list: list[str] = [] for contact in self._local_client.get_module('Roster').iter_contacts(): local_jid_list.append(str(contact.jid)) - remote_jid_list = [] + remote_jid_list: list[str] = [] + assert self._remote_client is not None for contact in self._remote_client.get_module('Roster').iter_contacts(): remote_jid_list.append(str(contact.jid)) @@ -146,22 +148,26 @@ def _init_contacts(self): iter_ = model.append() model.set(iter_, 0, True, 1, remote_jid) - def _on_sync_toggled(self, cell, path): + def _on_sync_toggled(self, cell: Gtk.CellRendererToggle, path: str) -> None: model = self._ui.contacts_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter(path) model[iter_][0] = not cell.get_active() - def _on_sync_clicked(self, _widget): + def _on_sync_clicked(self, _button: Gtk.Button) -> None: + assert self._remote_account is not None + assert self._remote_client is not None model = self._ui.contacts_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter_first() while iter_: if model[iter_][0]: # it is selected remote_jid = model[iter_][1] + hostname = app.get_hostname_from_account(self._remote_account) message = _('I’m synchronizing my contacts from my account at ' '"%s". Could you please add this address to your ' - 'contact list?' % app.get_hostname_from_account( - self._remote_account)) + 'contact list?' % hostname) remote_contact = self._remote_client.get_module( 'Contacts').get_contact(remote_jid) ===================================== gajim/gtk/themes.py ===================================== @@ -326,6 +326,8 @@ def _remove_theme(): app.css_config.remove_theme(theme) self._update_preferences_window() + assert isinstance(store, Gtk.TreeStore) + assert iter_ is not None store.remove(iter_) first = store.get_iter_first() @@ -364,8 +366,10 @@ def __init__(self, self._box.add(label) if option.attr in (StyleAttr.COLOR, StyleAttr.BACKGROUND): + assert not isinstance(value, Pango.FontDescription) self._init_color(value) elif option.attr == StyleAttr.FONT: + assert not isinstance(value, str) self._init_font(value) remove_button = Gtk.Button.new_from_icon_name( @@ -378,7 +382,7 @@ def __init__(self, self.add(self._box) self.show_all() - def _init_color(self, color: str) -> None: + def _init_color(self, color: Optional[str]) -> None: color_button = Gtk.ColorButton() if color is not None: rgba = Gdk.RGBA() @@ -388,7 +392,7 @@ def _init_color(self, color: str) -> None: color_button.connect('color-set', self._on_color_set) self._box.add(color_button) - def _init_font(self, desc: Pango.FontDescription) -> None: + def _init_font(self, desc: Optional[Pango.FontDescription]) -> None: font_button = Gtk.FontButton() if desc is not None: font_button.set_font_desc(desc) @@ -402,24 +406,29 @@ def _on_color_set(self, color_button: Gtk.ColorButton) -> None: app.css_config.set_value( self.option.selector, self.option.attr, color_string, pre=True) app.ged.raise_event(StyleChanged()) - self.get_toplevel().reload_roster_theme() + themes_win = cast(Themes, self.get_toplevel()) + themes_win.reload_roster_theme() def _on_font_set(self, font_button: Gtk.FontButton) -> None: desc = font_button.get_font_desc() + if desc is None: + return app.css_config.set_font(self.option.selector, desc, pre=True) app.ged.raise_event(StyleChanged()) - self.get_toplevel().reload_roster_theme() + themes_win = cast(Themes, self.get_toplevel()) + themes_win.reload_roster_theme() def _on_remove(self, *args: Any) -> None: - self.get_parent().remove(self) + listbox = cast(Gtk.ListBox, self.get_parent()) + listbox.remove(self) app.css_config.remove_value( self.option.selector, self.option.attr, pre=True) app.ged.raise_event(StyleChanged()) self.destroy() - def __eq__(self, other): - if isinstance(other, ChooseOption): - return other.option == self.option + def __eq__(self, other: object) -> bool: + if not isinstance(other, ChooseOption): + raise NotImplementedError return other.option == self.option ===================================== gajim/gtk/video_preview.py ===================================== @@ -70,13 +70,14 @@ def _enable_preview(self) -> None: self._set_error_text() return - sink, widget, name = create_gtk_widget() - if sink is None: + gtk_widget = create_gtk_widget() + if gtk_widget is None: log.error('Failed to obtain a working Gstreamer GTK+ sink, ' 'video support will be disabled') self._set_error_text() return + sink, widget, name = gtk_widget self._set_sink_text(name) if self._av_pipeline is None: @@ -94,6 +95,7 @@ def _enable_preview(self) -> None: self._ui.video_preview_box.pack_end(widget, True, True, 0) self._av_widget = widget + assert self._av_src is not None self._av_pipeline.add(self._av_src) self._av_src.link(self._av_sink) self._av_pipeline.set_state(Gst.State.PLAYING) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any from typing import Optional from gi.repository import Gtk @@ -79,18 +80,19 @@ def __init__(self, workspace_id: Optional[str] = None) -> None: self._ui.connect_signals(self) - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self.show_all() - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_remove_workspace(self, _button): + def _on_remove_workspace(self, _button: Gtk.Button) -> None: def _on_remove(): + assert self._workspace_id is not None app.window.remove_workspace(self._workspace_id) self.destroy() - + assert self._workspace_id is not None chat_list = app.window.get_chat_list(self._workspace_id) open_chats = chat_list.get_open_chats() if len(open_chats) > 0: @@ -106,22 +108,24 @@ def _on_remove(): # No chats in chat list, it is save to remove workspace _on_remove() - def _on_cancel(self, _button): + def _on_cancel(self, _button: Gtk.Button) -> None: self.destroy() - def _on_color_set(self, _button): + def _on_color_set(self, _button: Gtk.ColorButton) -> None: self._update_avatar() - def _on_text_changed(self, entry, _param): + def _on_text_changed(self, entry: Gtk.Entry, _param: Any) -> None: self._ui.save_button.set_sensitive(bool(entry.get_text())) self._update_avatar() - def _on_image_switch_toggled(self, switch, *args): + def _on_image_switch_toggled(self, switch: Gtk.Switch, *args: Any) -> None: if switch.get_active(): self._ui.style_stack.set_visible_child_name('image') if self._workspace_id is not None: self._avatar_sha = app.settings.get_workspace_setting( self._workspace_id, 'avatar_sha') + if self._avatar_sha == '': + self._avatar_sha = None else: self._ui.style_stack.set_visible_child_name('color') self._avatar_sha = None @@ -132,6 +136,7 @@ def _update_avatar(self) -> None: rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() if self._avatar_sha is not None: + assert self._workspace_id is not None surface = app.interface.avatar_storage.get_workspace_surface( self._workspace_id, AvatarSize.WORKSPACE_EDIT, @@ -154,7 +159,7 @@ def _get_avatar_data(self) -> Optional[bytes]: return data - def _on_save(self, _button): + def _on_save(self, _button: Gtk.Button) -> None: name = self._ui.entry.get_text() rgba = self._ui.color_chooser.get_rgba() use_image = self._ui.image_switch.get_active() ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -17,7 +17,7 @@ from typing import Any from typing import List from typing import Optional -from typing import Union +from typing import cast import logging @@ -25,6 +25,7 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk + from nbxmpp.protocol import JID from gajim.common import app @@ -63,8 +64,8 @@ def __init__(self, chat_page: ChatPage) -> None: Gdk.DragAction.MOVE) self.drag_row: Optional[Workspace] = None - self.row_before: Optional[Workspace] = None - self.row_after: Union[Workspace, AddWorkspace, None] = None + self.row_before: Optional[CommonWorkspace] = None + self.row_after: Optional[CommonWorkspace] = None self.connect('drag-motion', self._on_drag_motion) self.connect('drag-data-received', self._on_drag_data_received) @@ -86,7 +87,7 @@ def _on_drag_motion(self, y_coord: int, _time: int ) -> bool: - row = self.get_row_at_y(y_coord) + row = cast(CommonWorkspace, self.get_row_at_y(y_coord)) if row: alloc = row.get_allocation() @@ -128,7 +129,9 @@ def _on_drag_data_received(self, def _process_workspace_drop(self, workspace_id: str) -> None: row = self.get_workspace_by_id(workspace_id) - if row in (self.row_after, None): + if row == self.row_after: + return + if row is None: return self.remove(row) @@ -146,7 +149,7 @@ def _process_workspace_drop(self, workspace_id: str) -> None: def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: account, jid = identifier.split() - workspace_row = self.get_row_at_y(y_coord) + workspace_row = cast(Workspace, self.get_row_at_y(y_coord)) if workspace_row.workspace_id == 'add': return @@ -156,15 +159,25 @@ def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: app.window.activate_action('move-chat-to-workspace', params.to_variant()) - def _get_row_before(self, row): - return self.get_row_at_index(row.get_index() - 1) + def _get_row_before(self, + row: CommonWorkspace + ) -> Optional[CommonWorkspace]: + workspace = cast( + CommonWorkspace, self.get_row_at_index(row.get_index() - 1)) + return workspace - def _get_row_after(self, row): - return self.get_row_at_index(row.get_index() + 1) + def _get_row_after(self, + row: CommonWorkspace + ) -> Optional[CommonWorkspace]: + workspace = cast( + CommonWorkspace, self.get_row_at_index(row.get_index() + 1)) + return workspace def _get_last_workspace_row(self) -> Workspace: # Calling len(children) would include AddWorkspace - return self.get_row_at_index(len(self.get_children()) - 1) + last_workspace = cast( + Workspace, self.get_row_at_index(len(self.get_children()) - 1)) + return last_workspace def set_drag_row(self, row: Workspace) -> None: self.drag_row = row @@ -185,7 +198,7 @@ def _on_chat_selected(self, @staticmethod def _on_row_activated(_listbox: Gtk.ListBox, - row: Union[Workspace, AddWorkspace] + row: CommonWorkspace ) -> None: if row.workspace_id == 'add': open_window('WorkspaceDialog') @@ -199,7 +212,9 @@ def add_workspace(self, workspace_id: str) -> None: self.insert(row, len(self.get_children()) - 1) def store_workspace_order(self) -> None: - order = [row.workspace_id for row in self.get_children()] + workspaces: list[CommonWorkspace] = cast( + list[CommonWorkspace], self.get_children()) + order: list[str] = [row.workspace_id for row in workspaces] order.remove('add') app.settings.set_app_setting('workspace_order', order) @@ -211,7 +226,7 @@ def remove_workspace(self, workspace_id: str) -> bool: return True def activate_workspace(self, workspace_id: str) -> None: - row = self.get_selected_row() + row = cast(CommonWorkspace, self.get_selected_row()) if row is not None and row.workspace_id == workspace_id: return @@ -219,17 +234,24 @@ def activate_workspace(self, workspace_id: str) -> None: self.select_row(row) def get_active_workspace(self) -> Optional[str]: - row = self.get_selected_row() + row = cast(CommonWorkspace, self.get_selected_row()) if row is None: return None return row.workspace_id def get_first_workspace(self) -> str: - for row in self.get_children(): + workspaces: list[CommonWorkspace] = cast( + list[CommonWorkspace], self.get_children()) + for row in workspaces: return row.workspace_id - - def get_workspace_by_id(self, workspace_id: str) -> Optional[Workspace]: - for row in self.get_children(): + return '' + + def get_workspace_by_id(self, + workspace_id: str + ) -> Optional[CommonWorkspace]: + workspaces: list[CommonWorkspace] = cast( + list[CommonWorkspace], self.get_children()) + for row in workspaces: if row.workspace_id == workspace_id: return row return None @@ -296,8 +318,8 @@ def _popup_menu(self, _widget: Gtk.Widget, event: Gdk.EventButton) -> None: menu = self._get_workspace_menu() 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) @@ -337,9 +359,10 @@ def _on_drag_begin(self, scale = self.get_scale_factor() surface = app.interface.avatar_storage.get_workspace_surface( self.workspace_id, AvatarSize.WORKSPACE, scale) - Gtk.drag_set_icon_surface(drag_context, surface) + if surface is not None: + Gtk.drag_set_icon_surface(drag_context, surface) - listbox = self.get_parent() + listbox = cast(WorkspaceSideBar, self.get_parent()) listbox.set_drag_row(self) def _on_drag_data_get(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/355be2949d53c5e2bbd5c42424c7426… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/355be2949d53c5e2bbd5c42424c7426… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: RemoteControl: Remove unused code
by Philipp Hörist (＠lovetox) 11 Jan '22

11 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4920bc38 by lovetox at 2022-01-11T23:44:21+01:00 RemoteControl: Remove unused code - - - - - 8aaab336 by lovetox at 2022-01-11T23:55:25+01:00 App: Add type annotations - - - - - 75439a55 by lovetox at 2022-01-11T23:55:41+01:00 ChatListStack: Add type annotations - - - - - 143a2afe by lovetox at 2022-01-12T00:06:01+01:00 GroupChatInviter: Add type annotations - - - - - 355be294 by lovetox at 2022-01-12T00:06:11+01:00 Update pyrightconfig.json - - - - - 5 changed files: - gajim/common/app.py - gajim/gtk/chat_list_stack.py - gajim/gtk/groupchat_inviter.py - gajim/remote_control.py - pyrightconfig.json Changes: ===================================== gajim/common/app.py ===================================== @@ -58,6 +58,7 @@ from gajim.gui.application import GajimApplication from gajim.common.storage.cache import CacheStorage from gajim.common.storage.archive import MessageArchiveStorage + from gajim.common.cert_store import CertificateStore interface = cast(types.InterfaceT, None) @@ -111,7 +112,7 @@ def __init__(self): proxy65_manager = None -cert_store = None +cert_store = cast('CertificateStore', None) task_manager = None ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -26,24 +26,24 @@ from nbxmpp import JID from gajim.common import app -from gajim.common.events import ApplicationEvent +from gajim.common import events from . import structs from .chat_filter import ChatFilter from .chat_list import ChatList from .chat_list import ChatRow -HANDLED_EVENTS = [ - 'message-received', - 'mam-message-received', - 'gc-message-received', - 'message-updated', - 'presence-received', - 'message-sent', - 'chatstate-received', - 'jingle-request-received', - 'file-request-received' -] + +HANDLED_EVENTS = ( + events.MessageReceived, + events.MamMessageReceived, + events.GcMessageReceived, + events.MessageUpdated, + events.PresenceReceived, + events.MessageSent, + events.JingleRequestReceived, + events.FileRequestReceivedEvent +) class ChatListStack(Gtk.Stack): @@ -296,11 +296,13 @@ def mark_as_read(self, account: str, jid: JID) -> None: for chat_list in self._chat_lists.values(): chat_list.mark_as_read(account, jid) - def process_event(self, event: ApplicationEvent) -> None: - if event.name not in HANDLED_EVENTS: + def process_event(self, event: events.ApplicationEvent) -> None: + if not isinstance(event, HANDLED_EVENTS): return - chat_list = self.find_chat(event.account, event.jid) + jid = JID.from_string(event.jid) + + chat_list = self.find_chat(event.account, jid) if chat_list is None: return chat_list.process_event(event) ===================================== gajim/gtk/groupchat_inviter.py ===================================== @@ -13,12 +13,13 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations + from typing import List from typing import Optional import locale -from gi.repository import Gdk +from gi.repository import Gdk, GdkPixbuf from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk @@ -110,6 +111,7 @@ def _get_avatar_image(self, scale = self.get_scale_factor() surface = contact.get_avatar(AvatarSize.ROSTER, scale) + assert not isinstance(surface, GdkPixbuf.Pixbuf) return Gtk.Image.new_from_surface(surface) def update_jid(self, jid: str) -> None: @@ -233,10 +235,10 @@ def _on_invitee_removed(self, client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) row = ContactRow(account, - contact, - str(contact.jid), - contact.name, - show_account) + contact, + str(contact.jid), + contact.name, + show_account) self._ui.contacts_listbox.add(row) self._ui.search_entry.grab_focus() self.emit('listbox-changed', flowbox.has_contacts()) ===================================== gajim/remote_control.py ===================================== @@ -295,16 +295,9 @@ def __init__(self): self.on_account_created) app.ged.register_event_handler('vcard-received', ged.POSTGUI, self.on_vcard_received) - app.ged.register_event_handler('chatstate-received', ged.POSTGUI, - self.on_chatstate_received) app.ged.register_event_handler('message-sent', ged.POSTGUI, self.on_message_sent) - def on_chatstate_received(self, event): - self.raise_signal( - 'ChatState', - (event.account, [event.contact.jid, event.contact.chatstate])) - def on_message_sent(self, obj): try: chatstate = obj.chatstate ===================================== pyrightconfig.json ===================================== @@ -19,6 +19,7 @@ "gajim/gtk/account_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/chat_filter.py", + "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py", @@ -36,10 +37,15 @@ "gajim/gtk/conversation/rows/scroll_hint.py", "gajim/gtk/conversation/rows/widgets.py", "gajim/gtk/conversation/scrolled.py", + "gajim/gtk/groupchat_invitation.py", + "gajim/gtk/groupchat_inviter.py", + "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_state.py", "gajim/gtk/main_stack.py", "gajim/gtk/notification.py", "gajim/gtk/structs.py", "gajim/gtk/sidebar_switcher.py", + "gajim/gtk/ssl_error_dialog.py", "gajim/gtk/status_icon.py", "gajim/gtk/status_message_selector.py", "gajim/gtk/status_selector.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c615db3f18c78fbff0b72b336d37d55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c615db3f18c78fbff0b72b336d37d55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Menu: Refactor roster menu
by Philipp Hörist (＠lovetox) 11 Jan '22

11 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8f8569f by lovetox at 2022-01-11T22:57:41+01:00 Menu: Refactor roster menu - - - - - c615db3f by lovetox at 2022-01-11T23:01:12+01:00 ContactInfo: Stop spinner when erros are received - - - - - 2 changed files: - gajim/gtk/contact_info.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -272,7 +272,7 @@ def _set_os_info(self, task: Task) -> None: result = task.finish() except Exception as err: log.warning('Could not retrieve software version: %s', err) - return + result = None resource = task.get_user_data() device_grid = self._devices[resource] @@ -285,7 +285,7 @@ def _set_entity_time(self, task: Task) -> None: entity_time = task.finish() except Exception as err: log.warning('Could not retrieve entity time: %s', err) - return + entity_time = None resource = task.get_user_data() @@ -464,22 +464,24 @@ def __init__(self, contact: ResourceContact) -> None: def widget(self) -> Gtk.Grid: return self._ui.devices_grid - def set_entity_time(self, entity_time: str) -> None: - self._ui.time_value.set_text(entity_time) - self._ui.time_value.show() - self._ui.time_label.show() + def set_entity_time(self, entity_time: Optional[str]) -> None: + if entity_time is not None: + self._ui.time_value.set_text(entity_time) + self._ui.time_value.show() + self._ui.time_label.show() self._check_complete() - def set_software(self, software: SoftwareVersionResult) -> None: - software_string = '%s %s' % (software.name, software.version) - self._ui.software_value.set_text(software_string) - self._ui.software_value.show() - self._ui.software_label.show() - if software.os is not None: - self._ui.system_value.set_text(software.os) - self._ui.system_value.show() - self._ui.system_label.show() + def set_software(self, software: Optional[SoftwareVersionResult]) -> None: + if software is not None: + software_string = '%s %s' % (software.name, software.version) + self._ui.software_value.set_text(software_string) + self._ui.software_value.show() + self._ui.software_label.show() + if software.os is not None: + self._ui.system_value.set_text(software.os) + self._ui.system_value.show() + self._ui.system_label.show() self._check_complete() ===================================== gajim/gtk/menus.py ===================================== @@ -407,29 +407,25 @@ def get_conv_uri_context_menu(account: str, uri: URI) -> Optional[Gtk.Menu]: def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: + + block_label = _('Block…') if jid_is_blocked(account, jid): block_label = _('Unblock') - else: - block_label = _('Block…') - menu_items = [ - ('contact-info', _('Information')), - ('execute-command', _('Execute Command…')), - ('block-contact', block_label), - ('remove-contact', _('Remove…')), + + value = f'"{jid}"' + + menuitems: MenuItemListT = [ + (_('Information'), 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), ] - if gateway: - menu_items.insert(1, ('modify-gateway', _('Modify Gateway…'))) - menu = Gio.Menu() - for item in menu_items: - action, label = item - action = f'win.{action}-{account}' - menuitem = Gio.MenuItem.new(label, action) - variant = GLib.Variant('s', jid) - menuitem.set_action_and_target_value(action, variant) - menu.append_item(menuitem) + if gateway: + menuitems.insert( + 1, (_('Modify Gateway…'), f'win.modify-gateway-{account}', value)) - return menu + return make_menu(menuitems) def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec6c6cc6185990caa6e925cc1e9d285… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec6c6cc6185990caa6e925cc1e9d285… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Menus: Refactor account menu
by Philipp Hörist (＠lovetox) 11 Jan '22

11 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d604b72 by lovetox at 2022-01-11T22:36:51+01:00 Menus: Refactor account menu - - - - - ec6c6cc6 by lovetox at 2022-01-11T22:36:51+01:00 Menu: Fix passing string values - - - - - 2 changed files: - gajim/gtk/menus.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -156,7 +156,7 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: (_('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}', 's("")'), + (_('Execute Command…'), f'win.execute-command-{control_id}', '""'), (_('Search…'), 'win.search-history', None), (_('Remove History'), 'app.remove-history', params) ] @@ -165,52 +165,41 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: def get_account_menu(account: str) -> Gio.Menu: - ''' - [(action, label/sub_menu)] - action: string - label: string - sub menu: list - ''' - account_menu: list[tuple[str, Union[str, list[tuple[str, str]]]]] = [ - ('-profile', _('Profile')), - ('-start-single-chat', _('Send Single Message…')), - ('-services', _('Discover Services…')), - ('-server-info', _('Server Info')), - (_('Advanced'), [ - ('-archive', _('Archiving Preferences')), - ('-blocking', _('Blocking List')), - ('-pep-config', _('PEP Configuration')), - ('-sync-history', _('Synchronise History…')), - ]), - (_('Admin'), [ - ('-send-server-message', _('Send Server Message…')), - ('-set-motd', _('Set MOTD…')), - ('-update-motd', _('Update MOTD…')), - ('-delete-motd', _('Delete MOTD…')) - ]), + + val = f'"{account}"' + + menuitems: MenuItemListT = [ + (_('Profile'), f'app.{account}-profile', val), + (_('Send Single Message…'), f'app.{account}-start-single-chat', val), + (_('Discover Services…'), f'app.{account}-services', val), + (_('Server Info'), f'app.{account}-server-info', val), + ] + + menu = make_menu(menuitems) + + advanced_menuitems: MenuItemListT = [ + (_('Archiving Preferences'), f'app.{account}-archive', val), + (_('Blocking List'), f'app.{account}-blocking', val), + (_('PEP Configuration'), f'app.{account}-pep-config', val), + (_('Synchronise History…'), f'app.{account}-sync-history', val), ] if app.settings.get('developer_modus'): - account_menu[5][1].append(('-bookmarks', _('Bookmarks'))) + advanced_menuitems.append( + (_('Bookmarks'), f'app.{account}-bookmarks', val)) - def build_menu(preset: list[tuple[str, Union[str, list[tuple[str, str]]]]]): - menu = Gio.Menu() - for item in preset: - if isinstance(item[1], str): - action, label = item - action = f'app.{account}{action}' - menuitem = Gio.MenuItem.new(label, action) - variant = GLib.Variant('s', account) - menuitem.set_action_and_target_value(action, variant) - menu.append_item(menuitem) - else: - label, sub_menu = item - # This is a submenu - submenu = build_menu(sub_menu) - menu.append_submenu(label, submenu) - return menu + menu.append_submenu(_('Advanced'), make_menu(advanced_menuitems)) - return build_menu(account_menu) + admin_menuitems: MenuItemListT = [ + (_('Send Server Message…'), f'app.{account}-send-server-message', val), + (_('Set MOTD…'), f'app.{account}-set-motd', val), + (_('Update MOTD…'), f'app.{account}-update-motd', val), + (_('Delete MOTD…'), f'app.{account}-delete-motd', val) + ] + + menu.append_submenu(_('Admin'), make_menu(admin_menuitems)) + + return menu def build_accounts_menu() -> None: @@ -448,7 +437,7 @@ def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: jid=jid, type='contact', select=True) - value = f's("{jid}")' + value = f'"{jid}"' menuitems: MenuItemListT = [ (_('Start Chat'), 'win.add-chat', params), (_('Information'), f'win.contact-info-{account}', value), ===================================== gajim/gtk/util.py ===================================== @@ -919,7 +919,7 @@ def make_menu_item(label: str, item = Gio.MenuItem.new(label) if isinstance(value, str): - item.set_detailed_action(f'{action}::value') + item.set_detailed_action(f'{action}({value})') elif isinstance(value, VariantMixin): item.set_action_and_target_value(action, value.to_variant()) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1c8ed6bb6232727a7b957ae366959ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1c8ed6bb6232727a7b957ae366959ff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused code
by Philipp Hörist (＠lovetox) 11 Jan '22

11 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1dcbc059 by lovetox at 2022-01-11T21:51:19+01:00 Remove unused code - - - - - 1c8ed6bb by lovetox at 2022-01-11T22:00:46+01:00 Menu: Refactor groupchat menu - - - - - 1 changed file: - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -125,14 +125,6 @@ def build_menu(preset: list[tuple[str, Any]]): variant = GLib.Variant('s', account) menuitem.set_action_and_target_value(action, variant) menu.append_item(menuitem) - elif action_name == 'app.browse-history': - menuitem = Gio.MenuItem.new(label, action_name) - dict_ = {'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', str(jid))} - variant_dict = GLib.Variant('a{sv}', dict_) - menuitem.set_action_and_target_value(action_name, - variant_dict) - menu.append_item(menuitem) elif action_name == 'app.remove-history': params = RemoveHistoryActionParams(account=account, jid=jid) menuitem = Gio.MenuItem.new(label, action_name) @@ -154,55 +146,22 @@ def build_menu(preset: list[tuple[str, Any]]): def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: - groupchat_menu = [ - ('win.information-', _('Information')), - ('win.groupchat-settings-', _('Settings…')), - ('win.groupchat-manage-', _('Manage…')), - ('win.rename-groupchat-', _('Rename Chat…')), - ('win.change-nickname-', _('Change Nickname…')), - ('win.request-voice-', _('Request Voice')), - ('win.execute-command-', _('Execute Command…')), - ('win.search-history', _('Search…')), - ('app.remove-history', _('Remove History')) - ] - - def build_menu(preset: list[tuple[str, str]]) -> Gio.Menu: - menu = Gio.Menu() - for item in preset: - action_name, label = item - if action_name == 'win.search-history': - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, None) - menu.append_item(menuitem) - elif action_name == 'app.browse-history': - menuitem = Gio.MenuItem.new(label, action_name) - dict_ = {'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', str(jid))} - variant_dict = GLib.Variant('a{sv}', dict_) - menuitem.set_action_and_target_value( - action_name, variant_dict) - menu.append_item(menuitem) - - elif action_name == 'win.execute-command-': - action_name = action_name + control_id - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value( - action_name, GLib.Variant('s', '')) - menu.append_item(menuitem) - - elif action_name == 'app.remove-history': - params = RemoveHistoryActionParams(account=account, jid=jid) - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, - params.to_variant()) - menu.append_item(menuitem) - else: - menu.append(label, action_name + control_id) - - return menu + params = RemoveHistoryActionParams(account=account, jid=jid) + + menulist: MenuItemListT = [ + (_('Information'), f'win.information-{control_id}', None), + (_('Settings…'), f'win.groupchat-settings-{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}', 's("")'), + (_('Search…'), 'win.search-history', None), + (_('Remove History'), 'app.remove-history', params) + ] - return build_menu(groupchat_menu) + return make_menu(menulist) def get_account_menu(account: str) -> Gio.Menu: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8ddce2abfcf778e9117d95904672741… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8ddce2abfcf778e9117d95904672741… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Scripts: Improve link-gtk.py
by Philipp Hörist (＠lovetox) 11 Jan '22

11 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: da1849fb by lovetox at 2022-01-11T21:39:39+01:00 Scripts: Improve link-gtk.py - - - - - 8bcc7abc by lovetox at 2022-01-11T21:39:39+01:00 Add decorators for action callbacks - - - - - 43630cb5 by lovetox at 2022-01-11T21:41:33+01:00 Menus: Refactor - Simplify code - Use structs for actions - - - - - 8ddce2ab by lovetox at 2022-01-11T21:45:41+01:00 Update pyrightconfig.json - - - - - 8 changed files: - gajim/gtk/application.py - gajim/gtk/chat_list_stack.py - gajim/gtk/menus.py - gajim/gtk/structs.py - gajim/gtk/util.py - gajim/gtk/workspace_side_bar.py - pyrightconfig.json - scripts/ci/link-gtk.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -75,9 +75,7 @@ from gajim.gui.dialogs import ShortcutsWindow from gajim.gui.about import AboutDialog from gajim.gui.discovery import ServiceDiscoveryWindow -from gajim.gui.structs import ForgetGroupchatActionParams -from gajim.gui.structs import OpenEventActionParams -from gajim.gtk.structs import RemoveHistoryActionParams +from gajim.gui import structs ActionListT = list[tuple[str, @@ -712,9 +710,9 @@ def _on_file_transfer_action(_action: Gio.SimpleAction, ft.window.show_all() @staticmethod + @structs.actionfunction def _on_open_event_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - params = OpenEventActionParams.from_variant(param) + params: structs.OpenEventActionParams) -> None: if params.type in ('connection-failed', 'subscription-request', @@ -780,10 +778,10 @@ def _on_open_chat_action(_action: Gio.SimpleAction, app.interface.start_chat_from_jid(account, jid) @staticmethod + @structs.actionfunction def _on_remove_history_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - - params = RemoveHistoryActionParams.from_variant(param) + params: structs.RemoveHistoryActionParams + ) -> None: if params.jid is not None: app.storage.archive.remove_history(params.account, params.jid) @@ -795,10 +793,11 @@ def _on_remove_history_action(_action: Gio.SimpleAction, control.reset_view() @staticmethod + @structs.actionfunction def _on_forget_groupchat_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: + params: structs.ForgetGroupchatActionParams + ) -> None: - params = ForgetGroupchatActionParams.from_variant(param) window = get_app_window('StartChatDialog') window.remove_row(params.account, str(params.jid)) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Dict from typing import Optional from typing import cast @@ -26,6 +28,7 @@ from gajim.common import app from gajim.common.events import ApplicationEvent +from . import structs from .chat_filter import ChatFilter from .chat_list import ChatList from .chat_list import ChatRow @@ -85,7 +88,7 @@ def __init__(self, def _add_actions(self) -> None: actions = [ ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), - ('move-chat-to-workspace', 'as', self._move_chat_to_workspace), + ('move-chat-to-workspace', 'a{sv}', self._move_chat_to_workspace), ('mark-as-read', 'as', self._mark_as_read), ] @@ -210,23 +213,22 @@ def _toggle_chat_pinned(self, chat_list.toggle_chat_pinned(account, jid) self.store_open_chats(workspace_id) + @structs.actionmethod def _move_chat_to_workspace(self, _action: Gio.SimpleAction, - param: GLib.Variant + params: structs.MoveChatToWorkspaceAP ) -> None: - new_workspace_id, account, jid = param.unpack() - jid = JID.from_string(jid) current_chatlist = cast(ChatList, self.get_visible_child()) - type_ = current_chatlist.get_chat_type(account, jid) + type_ = current_chatlist.get_chat_type(params.account, params.jid) if type_ is None: return - current_chatlist.remove_chat(account, jid) + current_chatlist.remove_chat(params.account, params.jid) - new_chatlist = self.get_chatlist(new_workspace_id) - new_chatlist.add_chat(account, jid, type_) + new_chatlist = self.get_chatlist(params.workspace_id) + new_chatlist.add_chat(params.account, params.jid, type_) self.store_open_chats(current_chatlist.workspace_id) - self.store_open_chats(new_workspace_id) + self.store_open_chats(params.workspace_id) def _mark_as_read(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/menus.py ===================================== @@ -15,7 +15,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations -from typing import Tuple + from typing import List from typing import Union from typing import Any @@ -40,13 +40,21 @@ from gajim.common.const import URIType from gajim.common.const import URIAction from gajim.common.structs import URI -from gajim.gtk.structs import AddChatActionParams +from gajim.common.structs import VariantMixin +from gajim.gui.structs import AddChatActionParams from gajim.gui.structs import ForgetGroupchatActionParams +from gajim.gui.structs import MoveChatToWorkspaceAP from gajim.gui.structs import RemoveHistoryActionParams +from gajim.gui.util import make_menu_item +from gajim.gui.util import make_menu from gajim.gui.const import ControlType +MenuValueT = Union[None, str, GLib.Variant, VariantMixin] +MenuItemListT = list[tuple[str, str, MenuValueT]] + + def get_singlechat_menu(control_id: str, account: str, jid: JID, @@ -477,55 +485,37 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: - menu = Gio.Menu() - - add_chat = Gio.MenuItem.new(_('Start Chat')) params = AddChatActionParams(account=account, jid=jid, type='contact', select=True) - - add_chat.set_action_and_target_value('win.add-chat', params.to_variant()) - menu.append_item(add_chat) - - menu_items = [ - ('contact-info', _('Information')), - ('subscription-block', _('Block')), - ('subscription-report', _('Report')), - ('subscription-deny', _('Deny')), + value = f's("{jid}")' + menuitems: MenuItemListT = [ + (_('Start Chat'), 'win.add-chat', params), + (_('Information'), 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), ] - for item in menu_items: - action, label = item - action = f'win.{action}-{account}' - menuitem = Gio.MenuItem.new(label, action) - variant = GLib.Variant('s', str(jid)) - menuitem.set_action_and_target_value(action, variant) - menu.append_item(menuitem) - return menu + return make_menu(menuitems) def get_start_chat_row_menu(account: str, jid: JID) -> Gio.Menu: - menu_items: List[Tuple[str, str]] = [ - ('forget-groupchat', _('Forget this Group Chat')), + params = ForgetGroupchatActionParams(account=account, jid=jid) + menuitems: MenuItemListT = [ + (_('Forget this Group Chat'), 'app.forget-groupchat', params), ] - menu = Gio.Menu() - for item in menu_items: - action, label = item - action = f'app.{action}' - menuitem = Gio.MenuItem.new(label, action) - params = ForgetGroupchatActionParams(account=account, jid=jid) - menuitem.set_action_and_target_value(action, params.to_variant()) - menu.append_item(menuitem) - return menu + + return make_menu(menuitems) def get_chat_list_row_menu(workspace_id: str, account: str, - jid: Union[JID, str], + jid: JID, pinned: bool ) -> Gio.Menu: - jid = str(jid) + client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) @@ -560,7 +550,7 @@ def get_chat_list_row_menu(workspace_id: str, action = f'win.{action}' menuitem = Gio.MenuItem.new(label, action) variant_list = GLib.Variant( - 'as', [workspace_id, account, jid]) + 'as', [workspace_id, account, str(jid)]) menuitem.set_action_and_target_value(action, variant_list) menu.append_item(menuitem) else: @@ -575,18 +565,19 @@ def get_chat_list_row_menu(workspace_id: str, def build_workspaces_submenu(current_workspace_id: str, account: str, - jid: str + jid: JID ) -> Gio.Menu: submenu = Gio.Menu() for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: continue name = app.settings.get_workspace_setting(workspace_id, 'name') - action = 'win.move-chat-to-workspace' - menuitem = Gio.MenuItem.new(name, action) - variant_list = GLib.Variant('as', [workspace_id, account, jid]) - menuitem.set_action_and_target_value(action, variant_list) - submenu.append_item(menuitem) + params = MoveChatToWorkspaceAP(workspace_id=workspace_id, + account=account, + jid=jid) + + item = make_menu_item(name, 'win.move-chat-to-workspace', params) + submenu.append_item(item) return submenu ===================================== gajim/gtk/structs.py ===================================== @@ -14,9 +14,15 @@ from __future__ import annotations +from typing import Any +from typing import Callable from typing import Optional +import sys +import inspect +import functools from dataclasses import dataclass +from gi.repository import GLib, Gio from nbxmpp.protocol import JID @@ -49,3 +55,41 @@ class AddChatActionParams(VariantMixin): jid: JID type: str select: bool + + +@dataclass +class MoveChatToWorkspaceAP(VariantMixin): + workspace_id: str + account: str + jid: JID + + +def get_params_class(func: Callable[..., Any]) -> Any: + module = sys.modules[__name__] + params = inspect.signature(func).parameters + cls_string = params['params'].annotation + cls_string = cls_string.rsplit('.', maxsplit=1)[-1] + return getattr(module, cls_string) + + +def actionmethod(func: Callable[[Any, Gio.SimpleAction, Any], None] + ) -> Callable[[Any, Gio.SimpleAction, GLib.Variant], None]: + @functools.wraps(func) + def method_wrapper(obj: Any, + action: Gio.SimpleAction, + param: GLib.Variant) -> None: + params_cls = get_params_class(func) + params = params_cls.from_variant(param) + return func(obj, action, params) + return method_wrapper + + +def actionfunction(func: Callable[[Gio.SimpleAction, Any], None] + ) -> Callable[[Gio.SimpleAction, GLib.Variant], None]: + @functools.wraps(func) + def func_wrapper(action: Gio.SimpleAction, + param: GLib.Variant) -> None: + params_cls = get_params_class(func) + params = params_cls.from_variant(param) + return func(action, params) + return func_wrapper ===================================== gajim/gtk/util.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any from typing import List from typing import Tuple @@ -36,6 +38,7 @@ pass from gi.repository import Gdk +from gi.repository import Gio from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango @@ -54,6 +57,7 @@ from gajim.common.const import StyleAttr from gajim.common.ged import EventHelper as CommonEventHelper from gajim.common.styling import PlainBlock +from gajim.common.structs import VariantMixin from .const import GajimIconSet from .const import WINDOW_MODULES @@ -62,6 +66,9 @@ log = logging.getLogger('gajim.gui.util') +MenuValueT = Union[None, str, GLib.Variant, VariantMixin] + + class NickCompletionGenerator: def __init__(self, self_nick: str) -> None: self.nick = self_nick @@ -901,3 +908,28 @@ def get_key_theme() -> Optional[str]: if settings is None: return None return settings.get_property('gtk-key-theme-name') + + +def make_menu_item(label: str, + action: str, + value: MenuValueT = None) -> Gio.MenuItem: + + if value is None: + return Gio.MenuItem.new(label, action) + + item = Gio.MenuItem.new(label) + if isinstance(value, str): + item.set_detailed_action(f'{action}::value') + elif isinstance(value, VariantMixin): + item.set_action_and_target_value(action, value.to_variant()) + else: + item.set_action_and_target_value(action, value) + return item + + +def make_menu(menuitems: list[tuple[str, str, MenuValueT]]) -> Gio.Menu: + menu = Gio.Menu() + for item in menuitems: + menuitem = make_menu_item(*item) + menu.append_item(menuitem) + return menu ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -25,6 +25,7 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk +from nbxmpp.protocol import JID from gajim.common import app from gajim.common.const import AvatarSize @@ -32,6 +33,7 @@ from .chat_list_stack import ChatListStack from .chat_page import ChatPage +from .structs import MoveChatToWorkspaceAP from .util import open_window log = logging.getLogger('gajim.gui.workspace_sidebar') @@ -148,9 +150,11 @@ def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: if workspace_row.workspace_id == 'add': return - app.window.activate_action( - 'move-chat-to-workspace', - GLib.Variant('as', [workspace_row.workspace_id, account, jid])) + params = MoveChatToWorkspaceAP(workspace_id=workspace_row.workspace_id, + account=account, + jid=JID.from_string(jid)) + app.window.activate_action('move-chat-to-workspace', + params.to_variant()) def _get_row_before(self, row): return self.get_row_at_index(row.get_index() - 1) ===================================== pyrightconfig.json ===================================== @@ -38,7 +38,8 @@ "gajim/gtk/conversation/scrolled.py", "gajim/gtk/main_stack.py", "gajim/gtk/notification.py", - "gajim/gtk/side_bar_switcher.py", + "gajim/gtk/structs.py", + "gajim/gtk/sidebar_switcher.py", "gajim/gtk/status_icon.py", "gajim/gtk/status_message_selector.py", "gajim/gtk/status_selector.py", ===================================== scripts/ci/link-gtk.py ===================================== @@ -21,6 +21,8 @@ def cleanup_dir(target_dir: Path) -> None: for path in target_dir.iterdir(): if path.name in IGNORED_FILES: continue + if path.name in IGNORED_DIRS: + continue path.unlink() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a916538ff7aa6519d33ad9239c8f1f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a916538ff7aa6519d33ad9239c8f1f7… You're receiving this email because of your account on dev.gajim.org.

1 0

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

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a916538f by wurstsalat at 2022-01-11T19:37:11+01:00 AvatarSelector: Typing - - - - - 1 changed file: - gajim/gtk/avatar_selector.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -110,7 +110,7 @@ def prepare_crop_area(self, path: str) -> None: self._crop_area.show() def _on_load_clicked(self, _button: Gtk.Button) -> None: - def _on_file_selected(path): + def _on_file_selected(path: str) -> None: self.prepare_crop_area(path) AvatarChooserDialog(_on_file_selected, @@ -240,8 +240,8 @@ def set_pixbuf(self, pixbuf: GdkPixbuf.Pixbuf) -> None: self._crop.width = 2 * self._base_width self._crop.height = 2 * self._base_height - self._crop.x = abs((width - self._crop.width) / 2) - self._crop.y = abs((height - self._crop.height) / 2) + self._crop.x = int(abs((width - self._crop.width) / 2)) + self._crop.y = int(abs((height - self._crop.height) / 2)) self._scale = 0.0 self._image.x = 0 @@ -570,10 +570,10 @@ def _on_motion_notify(self, top = self._crop.y bottom = self._crop.y + self._crop.height - 1 - self._crop.x = left - self._crop.y = top - self._crop.width = right - left + 1 - self._crop.height = bottom - top + 1 + self._crop.x = int(left) + self._crop.y = int(top) + self._crop.width = int(right - left + 1) + self._crop.height = int(bottom - top + 1) damage = self._crop_to_widget() self.queue_draw_area( @@ -590,8 +590,8 @@ def _update_pixbufs(self) -> None: if scale * width > allocation.width: scale = allocation.width / float(width) - dest_width = width * scale - dest_height = height * scale + dest_width = int(width * scale) + dest_height = int(height * scale) if (self._pixbuf is None or self._pixbuf.get_width != allocation.width or @@ -628,25 +628,25 @@ def _update_pixbufs(self) -> None: (dest_height / self._base_height))) crop_scale = float(min(scale_to_80, scale_to_image)) - self._crop.width = crop_scale * self._base_width / scale - self._crop.height = crop_scale * self._base_height / scale - self._crop.x = ( - self._browse_pixbuf.get_width() - self._crop.width) / 2 - self._crop.y = ( - self._browse_pixbuf.get_height() - self._crop.height) / 2 + self._crop.width = int(crop_scale * self._base_width / scale) + self._crop.height = int(crop_scale * self._base_height / scale) + self._crop.x = int(( + self._browse_pixbuf.get_width() - self._crop.width) / 2) + self._crop.y = int(( + self._browse_pixbuf.get_height() - self._crop.height) / 2) self._scale = scale - self._image.x = (allocation.width - dest_width) / 2 - self._image.y = (allocation.height - dest_height) / 2 + self._image.x = int((allocation.width - dest_width) / 2) + self._image.y = int((allocation.height - dest_height) / 2) self._image.width = dest_width self._image.height = dest_height def _crop_to_widget(self) -> Gdk.Rectangle: crop = Gdk.Rectangle() - crop.x = self._image.x + self._crop.x * self._scale - crop.y = self._image.y + self._crop.y * self._scale - crop.width = self._crop.width * self._scale - crop.height = self._crop.height * self._scale + crop.x = int(self._image.x + self._crop.x * self._scale) + crop.y = int(self._image.y + self._crop.y * self._scale) + crop.width = int(self._crop.width * self._scale) + crop.height = int(self._crop.height * self._scale) return crop def _update_cursor(self, x_coord: float, y_coord: float) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a916538ff7aa6519d33ad9239c8f1f7b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a916538ff7aa6519d33ad9239c8f1f7b… 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