Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Archive: Respect minimum datetime on Windows
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 49ddc9a1 by wurstsalat at 2021-12-09T08:50:01+01:00 Archive: Respect minimum datetime on Windows - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -595,7 +595,7 @@ def search_log(self, account, jid, query, from_users=None, before=None, before_ts = before.timestamp() if after is None: - after_ts = datetime.datetime(1900, 1, 1).timestamp() + after_ts = datetime.datetime(1971, 1, 1).timestamp() else: after_ts = after.timestamp() @@ -651,7 +651,7 @@ def search_all_logs(self, query, from_users=None, before=None, after=None): before_ts = before.timestamp() if after is None: - after_ts = datetime.datetime(1900, 1, 1).timestamp() + after_ts = datetime.datetime(1971, 1, 1).timestamp() else: after_ts = after.timestamp() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49ddc9a1c708db7694bdc20a84e9e8a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49ddc9a1c708db7694bdc20a84e9e8a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint errors
by Philipp Hörist (＠lovetox) 09 Dec '21

09 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ee3a733 by lovetox at 2021-12-09T01:22:58+01:00 Fix pylint errors - - - - - 5 changed files: - gajim/common/modules/adhoc_commands.py - gajim/common/socks5.py - gajim/gajim_remote.py - gajim/gtk/controls/base.py - pylintrc Changes: ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -303,7 +303,7 @@ def _execute_command_received(self, _con, stanza, _properties): if sessionid is None: # we start a new command session # only if we are visible for the jid and command exist - if node not in self._commands.keys(): + if node not in self._commands: self._con.connection.send( nbxmpp.Error( stanza, Namespace.STANZAS + ' item-not-found')) ===================================== gajim/common/socks5.py ===================================== @@ -85,7 +85,7 @@ def start_listener(self, port, sha_str, sha_handler, file_props, log.debug('Start listening for socks5 connection') sid = file_props.sid self.sha_handlers[sha_str] = (sha_handler, sid) - if self.listener is None or self.listener.connections == []: + if self.listener is None or not self.listener.connections: self.listener = Socks5Listener(self.idlequeue, port, file_props, fingerprint=fingerprint) self.listener.queue = self ===================================== gajim/gajim_remote.py ===================================== @@ -211,7 +211,7 @@ def __init__(self): } self.sbus = None - if self.argv_len < 2 or sys.argv[1] not in self.commands.keys(): + if self.argv_len < 2 or sys.argv[1] not in self.commands: # no args or bad args send_error(self.compose_help()) self.command = sys.argv[1] ===================================== gajim/gtk/controls/base.py ===================================== @@ -275,15 +275,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: def _connect_contact_signals(self): raise NotImplementedError - def _process_jingle_av_event(self, *args): - raise NotImplementedError - - def get_our_nick(self): - raise NotImplementedError - - def room_name(self): - raise NotImplementedError - def _get_action(self, name: str) -> Gio.Action: return app.window.lookup_action(f'{name}{self.control_id}') ===================================== pylintrc ===================================== @@ -146,7 +146,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib. # (useful for modules/projects where namespaces are manipulated during runtime # and thus existing member attributes cannot be deduced by static analysis. It # supports qualified module names, as well as Unix pattern matching. -ignored-modules=gi.repository,gajim.gui +ignored-modules=gi.repository,gajim.gui,cairo # Show a hint with possible names when a member name was not found. The aspect # of finding the hint is based on edit distance. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ee3a7335f73a632e68f13a8c0d96bba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ee3a7335f73a632e68f13a8c0d96bba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Docker: Update requirements.txt
by Philipp Hörist (＠lovetox) 08 Dec '21

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9cd96bda by lovetox at 2021-12-09T00:39:00+01:00 Docker: Update requirements.txt - - - - - 1 changed file: - docker/requirements.txt Changes: ===================================== docker/requirements.txt ===================================== @@ -1,5 +1,5 @@ -git+https://dev.gajim.org/gajim/python-nbxmpp.git@master PyGObject +pycairo>=1.20 mypy pylint codespell View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9cd96bda746ecfef48bf1cd11d3dfa5c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9cd96bda746ecfef48bf1cd11d3dfa5c… You're receiving this email because of your account on dev.gajim.org.

1 0

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

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8c57aa1 by lovetox at 2021-12-08T23:47:57+01:00 Update .gitignore - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== @@ -34,3 +34,6 @@ syntax: regexp ^scripts\/gajim.* !MANIFEST.in + +gajim/gui/* +!gajim/gui/__init__.py \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d8c57aa10668136adc31e227a360202a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d8c57aa10668136adc31e227a360202a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add drag and drop for moving chats between workspaces
by Daniel Brötzmann (＠wurstsalat) 08 Dec '21

08 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 00c68673 by wurstsalat at 2021-12-08T23:27:48+01:00 Add drag and drop for moving chats between workspaces - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -230,12 +230,6 @@ .workspace-sidebar-item image { border-radius: 9px; margin: 6px; } -.workspace-sidebar-item.drag-hover-top { - border-top: 1px solid #4e9a06; -} -.workspace-sidebar-item.drag-hover-bottom { - border-bottom: 1px solid #4e9a06; -} .workspace-add:hover, .workspace-add:focus { background: transparent; ===================================== gajim/gtk/chat_list.py ===================================== @@ -24,6 +24,7 @@ from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk +import cairo from nbxmpp import JID @@ -71,6 +72,16 @@ def __init__(self, workspace_id): self.connect('enter-notify-event', self._on_mouse_focus_changed) self.connect('leave-notify-event', self._on_mouse_focus_changed) + # Drag and Drop + entries = [Gtk.TargetEntry.new( + 'CHAT_LIST_ITEM', + Gtk.TargetFlags.SAME_APP, + 0)] + self.drag_dest_set( + Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP, + entries, + Gdk.DragAction.MOVE) + self.register_events([ ('account-enabled', ged.GUI2, self._on_account_changed), ('account-disabled', ged.GUI2, self._on_account_changed), @@ -507,6 +518,18 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self._ui.eventbox.connect('button-press-event', self._on_button_press) self._ui.close_button.connect('clicked', self._on_close_button_clicked) + # Drag and Drop + entries = [Gtk.TargetEntry.new( + 'CHAT_LIST_ITEM', + Gtk.TargetFlags.SAME_APP, + 0)] + self._ui.eventbox.drag_source_set( + Gdk.ModifierType.BUTTON1_MASK, + entries, + Gdk.DragAction.MOVE) + self._ui.eventbox.connect('drag-begin', self._on_drag_begin) + self._ui.eventbox.connect('drag-data-get', self._on_drag_data_get) + if self.type == 'groupchat': self._ui.group_chat_indicator.show() @@ -621,6 +644,31 @@ def _popup_menu(self, event): popover.set_pointing_to(rectangle) popover.popup() + def _on_drag_begin(self, + widget: Gtk.Widget, + drag_context: Gdk.DragContext + ) -> None: + # Use rendered ChatListRow as drag icon + alloc = self.get_allocation() + surface = cairo.ImageSurface( + cairo.Format.ARGB32, alloc.width, alloc.height) + context = cairo.Context(surface) + self.draw(context) + dest_x, dest_y = widget.translate_coordinates(self, 0, 0) + surface.set_device_offset(-dest_x, -dest_y) + Gtk.drag_set_icon_surface(drag_context, surface) + + def _on_drag_data_get(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: + drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM') + data = f'{self.account} {self.jid}'.encode('utf-8') + selection_data.set(drop_type, 32, data) + def toggle_pinned(self) -> None: self._pinned = not self._pinned ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -15,6 +15,8 @@ from typing import Any from typing import List +import logging + from gi.repository import Gdk from gi.repository import Gio from gi.repository import GLib @@ -26,6 +28,8 @@ from .util import open_window +log = logging.getLogger('gajim.gui.workspace_sidebar') + class WorkspaceSideBar(Gtk.ListBox): def __init__(self, chat_page): @@ -35,10 +39,16 @@ def __init__(self, chat_page): self.get_style_context().add_class('workspace-sidebar') # Drag and Drop - entries = [Gtk.TargetEntry.new( - 'WORKSPACE_SIDEBAR_ITEM', - Gtk.TargetFlags.SAME_APP, - 0)] + entries = [ + Gtk.TargetEntry.new( + 'WORKSPACE_SIDEBAR_ITEM', + Gtk.TargetFlags.SAME_APP, + 0), + Gtk.TargetEntry.new( + 'CHAT_LIST_ITEM', + Gtk.TargetFlags.SAME_APP, + 0) + ] self.drag_dest_set( Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP, entries, @@ -50,8 +60,6 @@ def __init__(self, chat_page): self.connect('drag-motion', self._on_drag_motion) self.connect('drag-data-received', self._on_drag_data_received) - self.connect('drag-leave', self._on_drag_leave) - self.connect('row-activated', self._on_row_activated) self.add(AddWorkspace('add')) @@ -63,17 +71,15 @@ def __init__(self, chat_page): self._on_chat_selected) self._workspaces = {} - def _on_drag_motion(self, _widget, _drag_context, _x_coord, y_coord, - _time): + def _on_drag_motion(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + _x_coord: int, + y_coord: int, + _time: int + ) -> None: row = self.get_row_at_y(y_coord) - if self.row_before: - self.row_before.get_style_context().remove_class( - 'drag-hover-bottom') - if self.row_after: - self.row_after.get_style_context().remove_class( - 'drag-hover-top') - if row: alloc = row.get_allocation() hover_row_y = alloc.y @@ -91,23 +97,27 @@ def _on_drag_motion(self, _widget, _drag_context, _x_coord, y_coord, if self.drag_row in (self.row_before, self.row_after): return False - if self.row_before and self.row_before.workspace_id != 'add': - self.row_before.get_style_context().add_class('drag-hover-bottom') - if self.row_after: - self.row_after.get_style_context().add_class('drag-hover-top') return True - def _on_drag_data_received(self, _widget, _drag_context, _x_coord, - _y_coord, selection_data, _info, _time): - if self.row_before: - self.row_before.get_style_context().remove_class( - 'drag-hover-bottom') - if self.row_after: - self.row_after.get_style_context().remove_class( - 'drag-hover-top') + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + _x_coord: int, + y_coord: int, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: + data = selection_data.get_data().decode('utf-8') + item_type = selection_data.get_data_type().name() + if item_type == 'WORKSPACE_SIDEBAR_ITEM': + self._process_workspace_drop(data) + elif item_type == 'CHAT_LIST_ITEM': + self._process_chat_list_drop(data, y_coord) + else: + log.debug('Unknown item type dropped') - data = selection_data.get_data() - workspace_id = data.decode('utf-8') + def _process_workspace_drop(self, workspace_id: str) -> None: row = self.get_workspace_by_id(workspace_id) if row in (self.row_after, None): @@ -126,13 +136,15 @@ def _on_drag_data_received(self, _widget, _drag_context, _x_coord, self.store_workspace_order() app.window.activate_workspace(workspace_id) - def _on_drag_leave(self, _widget, _drag_context, _time): - if self.row_before: - self.row_before.get_style_context().remove_class( - 'drag-hover-bottom') - if self.row_after: - self.row_after.get_style_context().remove_class( - 'drag-hover-top') + 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) + if workspace_row.workspace_id == 'add': + return + + app.window.activate_action( + 'move-chat-to-workspace', + GLib.Variant('as', [workspace_row.workspace_id, account, jid])) def _get_row_before(self, row): return self.get_row_at_index(row.get_index() - 1) @@ -141,7 +153,7 @@ def _get_row_after(self, row): return self.get_row_at_index(row.get_index() + 1) def _get_last_workspace_row(self): - # len(children) would include AddWorkspace + # Calling len(children) would include AddWorkspace return self.get_row_at_index(len(self.get_children()) - 1) def set_drag_row(self, row): @@ -219,8 +231,6 @@ def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) self.get_style_context().add_class('workspace-sidebar-item') - self._workspace_id = workspace_id - self._unread_label = Gtk.Label() self._unread_label.get_style_context().add_class( 'unread-counter') @@ -286,7 +296,7 @@ def _get_workspace_menu(self) -> Gio.Menu: action, label = item action = f'win.{action}' menuitem = Gio.MenuItem.new(label, action) - variant = GLib.Variant('s', self._workspace_id) + variant = GLib.Variant('s', self.workspace_id) menuitem.set_action_and_target_value(action, variant) menu.append_item(menuitem) return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00c68673ccec7a525fea5ea59979ad97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00c68673ccec7a525fea5ea59979ad97… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Avatar: Improve type annotations
by Philipp Hörist (＠lovetox) 08 Dec '21

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7b8e93d8 by lovetox at 2021-12-08T21:38:56+01:00 Avatar: Improve type annotations - - - - - 979e8cd9 by lovetox at 2021-12-08T22:20:08+01:00 Contacts: Add type annotations - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/gtk/avatar.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1174,8 +1174,8 @@ def to_user_string(error: StanzaError) -> str: return condition -def get_groupchat_name(con, jid): - name = con.get_module('Bookmarks').get_name_from_bookmark(jid) +def get_groupchat_name(client: types.Client, jid: Union[str, JID]) -> str: + name = client.get_module('Bookmarks').get_name_from_bookmark(jid) if name: return name ===================================== gajim/common/modules/contacts.py ===================================== @@ -12,20 +12,27 @@ # 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 Dict # pylint: disable=unused-import +from typing import Iterator +from typing import Optional +from typing import Union from typing import Tuple +import logging from functools import partial +import cairo from nbxmpp.protocol import JID from gajim.common import app +from gajim.common import types from gajim.common.const import PresenceShowExt +from gajim.common.const import SimpleClientState from gajim.common.structs import UNKNOWN_PRESENCE from gajim.common.structs import UNKNOWN_MUC_PRESENCE from gajim.common.helpers import Observable -from gajim.common.types import ConnectionT from gajim.common.modules.base import BaseModule from gajim.common.helpers import get_groupchat_name @@ -43,21 +50,29 @@ def __init__(self, account, jid): class Contacts(BaseModule): - def __init__(self, con: ConnectionT) -> None: - BaseModule.__init__(self, con) + def __init__(self, client: types.Client) -> None: + BaseModule.__init__(self, client) - self._contacts = {} + self._contacts: dict[JID, Union[BareContact, GroupchatContact]] = {} self._con.connect_signal('state-changed', self._on_client_state_changed) self._con.connect_signal('resume-failed', self._on_client_resume_failed) - def _on_client_resume_failed(self, _client, _signal_name): + def _on_client_resume_failed(self, + _client: types.Client, + _signal_name: str) -> None: self._reset_presence() - def _on_client_state_changed(self, _client, _signal_name, state): + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: SimpleClientState) -> None: if state.is_disconnected: self._reset_presence() - def add_contact(self, jid, groupchat=False): + def add_contact(self, + jid: Union[str, JID], + groupchat: bool = False) -> Union[BareContact, + GroupchatContact]: if isinstance(jid, str): jid = JID.from_string(jid) @@ -73,7 +88,13 @@ def add_contact(self, jid, groupchat=False): self._contacts[jid] = contact return contact - def get_contact(self, jid, groupchat=False): + def get_contact(self, + jid: Union[str, JID], + groupchat: bool = False) -> Union[BareContact, + ResourceContact, + GroupchatContact, + GroupchatParticipant]: + if isinstance(jid, str): jid = JID.from_string(jid) @@ -90,54 +111,67 @@ def get_contact(self, jid, groupchat=False): contact = contact.get_resource(resource) return contact - def get_group_chat_contact(self, jid): + def get_group_chat_contact(self, + jid: Union[str, JID] + ) -> Union[BareContact, + ResourceContact, + GroupchatContact, + GroupchatParticipant]: + return self.get_contact(jid, groupchat=True) - def get_contacts_with_domain(self, domain): - contacts = [] + def get_contacts_with_domain(self, + domain: str) -> list[Union[BareContact, + GroupchatContact]]: + + contacts: list[Union[BareContact, GroupchatContact]] = [] for contact in self._contacts.values(): if contact.jid.domain == domain: contacts.append(contact) return contacts - def _reset_presence(self): + def _reset_presence(self) -> None: for contact in self._contacts.values(): if contact.is_groupchat or contact.is_pm_contact: continue contact.update_presence(UNKNOWN_PRESENCE) - def force_chatstate_update(self): + def force_chatstate_update(self) -> None: for contact in self._contacts.values(): contact.force_chatstate_update() class CommonContact(Observable): - def __init__(self, logger, jid, account): + def __init__(self, + logger: logging.Logger, + jid: JID, + account: str) -> None: + Observable.__init__(self, logger) self._jid = jid self._account = account self._resources = {} - def _module(self, name): + def _module(self, name: str) -> BaseModule: return app.get_client(self._account).get_module(name) @property - def jid(self): + def jid(self) -> JID: return self._jid @property - def account(self): + def account(self) -> str: return self._account def _on_signal(self, _contact, signal_name, *args, **kwargs): self.notify(signal_name, *args, **kwargs) - def supports(self, requested_feature): + def supports(self, requested_feature: str) -> bool: return self._supports(self._jid, requested_feature) @staticmethod - def _supports(jid, requested_feature): + def _supports(jid, requested_feature: str) -> bool: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info is None: return False @@ -145,14 +179,14 @@ def _supports(jid, requested_feature): return disco_info.supports(requested_feature) @property - def is_groupchat(self): + def is_groupchat(self) -> bool: return False @property - def is_pm_contact(self): + def is_pm_contact(self) -> bool: return False - def force_chatstate_update(self): + def force_chatstate_update(self) -> None: for contact in self._resources.values(): contact.notify('chatstate-update') @@ -168,13 +202,13 @@ def __init__(self, logger, jid, account): self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') - def supports(self, requested_feature): + def supports(self, requested_feature: str) -> bool: for resource in self.iter_resources(): if resource.supports(requested_feature): return True return False - def add_resource(self, resource): + def add_resource(self, resource: str) -> ResourceContact: jid = self._jid.new_with(resource=resource) contact = ResourceContact(self._log, jid, self._account) self._resources[resource] = contact @@ -184,26 +218,26 @@ def add_resource(self, resource): contact.connect('caps-update', self._on_signal) return contact - def get_resource(self, resource): + def get_resource(self, resource: str) -> ResourceContact: contact = self._resources.get(resource) if contact is None: contact = self.add_resource(resource) return contact - def get_resources(self): - resources = [] + def get_resources(self) -> list[ResourceContact]: + resources: list[ResourceContact] = [] for contact in self._resources.values(): if contact.is_available: resources.append(contact) return resources - def iter_resources(self): + def iter_resources(self) -> Iterator[ResourceContact]: for contact in self._resources.values(): if contact.is_available: yield contact @property - def is_available(self): + def is_available(self) -> bool: # pylint: disable=R1729 return any([contact.is_available for contact in self._resources.values()]) @@ -224,7 +258,7 @@ def chatstate(self): return min(chatstates) @property - def name(self): + def name(self) -> str: roster_name = self._get_roster_attr('name') if roster_name: return roster_name @@ -236,16 +270,16 @@ def name(self): return self._jid.localpart @property - def avatar_sha(self): + def avatar_sha(self) -> Optional[str]: return app.storage.cache.get_contact(self._jid, 'avatar') def get_avatar(self, - size, - scale, - add_show=True, - pixbuf=False, - default=False, - style='circle'): + size: int, + scale: int, + add_show: bool = True, + pixbuf: bool = False, + default: bool = False, + style: str = 'circle'): show = self.show if add_show else None @@ -281,12 +315,12 @@ def get_avatar(self, transport_icon=transport_icon, style=style) - def update_presence(self, presence_data): + def update_presence(self, presence_data) -> None: for contact in self._resources.values(): contact.update_presence(presence_data, notify=False) self.notify('presence-update') - def update_avatar(self, sha): + def update_avatar(self, sha: str) -> None: if self._avatar_sha == sha: return @@ -296,19 +330,19 @@ def update_avatar(self, sha): app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') - def _get_roster_attr(self, attr): + def _get_roster_attr(self, attr: str): item = self._module('Roster').get_item(self._jid) if item is None: return None return getattr(item, attr) @property - def is_in_roster(self): + def is_in_roster(self) -> bool: item = self._module('Roster').get_item(self._jid) return item is not None @property - def is_gateway(self): + def is_gateway(self) -> bool: disco_info = app.storage.cache.get_last_disco_info(self._jid) if disco_info is None: return False @@ -327,28 +361,28 @@ def groups(self): return self._get_roster_attr('groups') @property - def is_subscribed(self): + def is_subscribed(self) -> bool: return self.subscription in ('from', 'both') @property - def is_blocked(self): + def is_blocked(self) -> bool: return self._module('Blocking').is_blocked(self._jid) - def set_blocked(self): + def set_blocked(self) -> None: self.update_presence(UNKNOWN_PRESENCE) self.notify('blocking-update') - def set_unblocked(self): + def set_unblocked(self) -> None: self.notify('blocking-update') class ResourceContact(CommonContact): - def __init__(self, logger, jid, account): + def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self._presence = UNKNOWN_PRESENCE - def supports(self, requested_feature): + def supports(self, requested_feature: str) -> bool: if not self.is_available: return False return CommonContact.supports(self, requested_feature) @@ -366,7 +400,7 @@ def identity_type(self): return None @property - def is_available(self): + def is_available(self) -> bool: return self._presence.available @property @@ -391,14 +425,14 @@ def idle_time(self): def chatstate(self): return self._module('Chatstate').get_remote_chatstate(self._jid) - def update_presence(self, presence_data, notify=True): + def update_presence(self, presence_data, notify: bool = True) -> None: self._presence = presence_data if notify: self.notify('presence-update') class GroupchatContact(CommonContact): - def __init__(self, logger, jid, account): + def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self.settings = GroupChatSettings(account, str(jid)) @@ -407,7 +441,7 @@ def __init__(self, logger, jid, account): def is_groupchat(self): return True - def add_resource(self, resource): + def add_resource(self, resource: str) -> GroupchatParticipant: jid = self._jid.new_with(resource=resource) contact = GroupchatParticipant(self._log, jid, self._account) self._resources[resource] = contact @@ -419,22 +453,22 @@ def add_resource(self, resource): contact.connect('user-avatar-update', self._on_user_signal) return contact - def get_resource(self, resource): + def get_resource(self, resource: str) -> GroupchatParticipant: contact = self._resources.get(resource) if contact is None: contact = self.add_resource(resource) return contact @property - def name(self): + def name(self) -> str: client = app.get_client(self._account) return get_groupchat_name(client, self._jid) @property - def avatar_sha(self): + def avatar_sha(self) -> Optional[str]: return app.storage.cache.get_muc(self._jid, 'avatar') - def get_avatar(self, size, scale): + def get_avatar(self, size: int, scale: int) -> Optional[cairo.ImageSurface]: transport_icon = None disco_info = self.get_disco() if disco_info is not None: @@ -449,21 +483,23 @@ def get_avatar(self, size, scale): scale, transport_icon=transport_icon) - def _on_user_signal(self, contact, signal_name, *args): + def _on_user_signal(self, + contact: GroupchatParticipant, + signal_name: str, *args: Any) -> None: self.notify(signal_name, contact, *args) - def update_avatar(self, *args): + def update_avatar(self, *args) -> None: app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') - def get_self(self): + def get_self(self) -> Optional[GroupchatParticipant]: nick = self.nickname if nick is None: return None return self.get_resource(nick) @property - def nickname(self): + def nickname(self) -> Optional[str]: muc_data = self._module('MUC').get_muc_data(self._jid) if muc_data is None: return None @@ -477,27 +513,27 @@ def occupant_jid(self): return muc_data.occupant_jid @property - def is_joined(self): + def is_joined(self) -> bool: muc_data = self._module('MUC').get_muc_data(self._jid) if muc_data is None: return False return muc_data.state.is_joined @property - def is_joining(self): + def is_joining(self) -> bool: muc_data = self._module('MUC').get_muc_data(self._jid) if muc_data is None: return False return muc_data.state.is_joining @property - def is_not_joined(self): + def is_not_joined(self) -> bool: muc_data = self._module('MUC').get_muc_data(self._jid) if muc_data is None: return True return muc_data.state.is_not_joined - def set_not_joined(self): + def set_not_joined(self) -> None: for contact in self._resources.values(): contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False) @@ -508,14 +544,14 @@ def get_user_nicknames(self): def get_disco(self, max_age=0): return app.storage.cache.get_last_disco_info(self.jid, max_age=max_age) - def can_notify(self): + def can_notify(self) -> bool: all_ = app.settings.get('notify_on_all_muc_messages') room = self.settings.get('notify_on_all_messages') return all_ or room class GroupchatParticipant(CommonContact): - def __init__(self, logger, jid, account): + def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self.settings = ContactSettings(account, str(jid)) @@ -524,17 +560,17 @@ def __init__(self, logger, jid, account): self._presence = UNKNOWN_MUC_PRESENCE - def supports(self, requested_feature): + def supports(self, requested_feature: str) -> bool: if not self.is_available: return False return CommonContact.supports(self, requested_feature) @property - def is_pm_contact(self): + def is_pm_contact(self) -> bool: return True @property - def is_in_roster(self): + def is_in_roster(self) -> bool: return False @property @@ -545,7 +581,7 @@ def set_presence(self, presence): self._presence = presence @property - def is_available(self): + def is_available(self) -> bool: return self._presence.available @property @@ -563,7 +599,7 @@ def idle_time(self): return self._presence.idle_time @property - def name(self): + def name(self) -> str: return self._jid.resource @property @@ -587,16 +623,16 @@ def avatar_sha(self): return self._client.get_module('VCardAvatars').get_avatar_sha(self._jid) def get_avatar(self, - size, - scale, - add_show=True, - style='circle'): + size: int, + scale: int, + add_show: bool = True, + style: str = 'circle') -> cairo.ImageSurface: show = self.show if add_show else None return app.interface.avatar_storage.get_surface( self, size, scale, show, style=style) - def update_presence(self, presence, *args, notify=True): + def update_presence(self, presence, *args, notify: bool = True) -> None: if not notify: self._presence = presence return @@ -626,11 +662,11 @@ def update_presence(self, presence, *args, notify=True): for signal in signals: self.notify(signal, *args) - def set_state(self, state, presence): + def set_state(self, state, presence) -> None: self._presence = presence self.notify(state) - def update_avatar(self, *args): + def update_avatar(self, *args) -> None: app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('user-avatar-update') ===================================== gajim/gtk/avatar.py ===================================== @@ -33,7 +33,6 @@ from gajim.common.helpers import get_groupchat_name from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr -from gajim.common.modules.contacts import Contacts from .const import DEFAULT_WORKSPACE_COLOR from .util import load_pixbuf @@ -367,7 +366,7 @@ def get_pixbuf(self, show: Optional[str] = None, default: bool = False, transport_icon: Optional[str] = None, - style: str = 'circle') -> cairo.ImageSurface: + style: str = 'circle') -> Optional[GdkPixbuf.Pixbuf]: surface = self.get_surface( contact, size, scale, show, default, transport_icon, style) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24686eeddf2785e9d47a827ac8ad323… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24686eeddf2785e9d47a827ac8ad323… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Avatar: Add type annotations
by Philipp Hörist (＠lovetox) 08 Dec '21

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb8b56c2 by lovetox at 2021-12-08T21:31:32+01:00 Avatar: Add type annotations - - - - - ef536737 by lovetox at 2021-12-08T21:31:53+01:00 StatusSelector: Add type annotations - - - - - d1028e5b by lovetox at 2021-12-08T21:32:27+01:00 Avatar: Remove unused method - - - - - 24686eed by lovetox at 2021-12-08T21:35:12+01:00 Remove obsolete Contact code - - - - - 5 changed files: - gajim/common/modules/chatstates.py - gajim/common/modules/ping.py - gajim/common/types.py - gajim/gtk/avatar.py - gajim/gtk/status_selector.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -32,7 +32,6 @@ from gajim.common.structs import OutgoingMessage from gajim.common.modules.base import BaseModule -from gajim.common.types import ContactT from gajim.common.types import ConnectionT @@ -184,13 +183,13 @@ def get_remote_chatstate(self, jid): return self._remote_chatstate.get(jid) @ensure_enabled - def set_active(self, contact: ContactT) -> None: + def set_active(self, contact) -> None: if contact.settings.get('send_chatstate') == 'disabled': return self._last_mouse_activity[contact.jid] = time.time() self._chatstates[contact.jid] = State.ACTIVE - def get_active_chatstate(self, contact: ContactT) -> Optional[str]: + def get_active_chatstate(self, contact) -> Optional[str]: # determines if we add 'active' on outgoing messages if contact.settings.get('send_chatstate') == 'disabled': return None @@ -207,7 +206,7 @@ def get_active_chatstate(self, contact: ContactT) -> Optional[str]: return 'active' @ensure_enabled - def block_chatstates(self, contact: ContactT, block: bool) -> None: + def block_chatstates(self, contact, block: bool) -> None: # Block sending chatstates to a contact # Used for example if we cycle through the MUC nick list, which # produces a lot of buffer 'changed' signals from the input textview. @@ -218,7 +217,7 @@ def block_chatstates(self, contact: ContactT, block: bool) -> None: self._blocked.remove(contact.jid) @ensure_enabled - def set_chatstate_delayed(self, contact: ContactT, state: State) -> None: + def set_chatstate_delayed(self, contact, state: State) -> None: # Used when we go from Composing -> Active after deleting all text # from the Textview. We delay the Active state because maybe the # User starts writing again. @@ -227,7 +226,7 @@ def set_chatstate_delayed(self, contact: ContactT, state: State) -> None: 2, self.set_chatstate, contact, state) @ensure_enabled - def set_chatstate(self, contact: ContactT, state: State) -> None: + def set_chatstate(self, contact, state: State) -> None: # Don’t send chatstates to ourself if self._con.get_own_jid().bare_match(contact.jid): return @@ -298,7 +297,7 @@ def _send_chatstate(self, contact, chatstate): self._con.send_message(message) @ensure_enabled - def set_mouse_activity(self, contact: ContactT, was_paused: bool) -> None: + def set_mouse_activity(self, contact, was_paused: bool) -> None: if contact.settings.get('send_chatstate') == 'disabled': return self._last_mouse_activity[contact.jid] = time.time() @@ -309,7 +308,7 @@ def set_mouse_activity(self, contact: ContactT, was_paused: bool) -> None: self.set_chatstate(contact, State.ACTIVE) @ensure_enabled - def set_keyboard_activity(self, contact: ContactT) -> None: + def set_keyboard_activity(self, contact) -> None: self._last_keyboard_activity[contact.jid] = time.time() def remove_delay_timeout(self, contact): ===================================== gajim/common/modules/ping.py ===================================== @@ -25,7 +25,6 @@ from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.types import ConnectionT -from gajim.common.types import ContactsT from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -43,7 +42,7 @@ def __init__(self, con: ConnectionT) -> None: self.handlers = [] @as_task - def send_ping(self, contact: ContactsT) -> Generator: + def send_ping(self, contact) -> Generator: _task = yield if not app.account_is_available(self._account): ===================================== gajim/common/types.py ===================================== @@ -38,9 +38,11 @@ # pylint: disable=unused-import from gajim.common.client import Client from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf - from gajim.common.contacts import Contact - from gajim.common.contacts import GC_Contact - from gajim.common.contacts import LegacyContactsAPI + from gajim.common.modules.contacts import CommonContact + from gajim.common.modules.contacts import BareContact + from gajim.common.modules.contacts import ResourceContact + from gajim.common.modules.contacts import GroupchatContact + from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkEventsController @@ -53,8 +55,6 @@ InterfaceT = Union['Interface'] ConnectionT = Union['Client', 'ConnectionZeroconf'] -ContactsT = Union['Contact', 'GC_Contact'] -ContactT = Union['Contact'] CSSConfigT = Union['CSSConfig'] # PEP ===================================== gajim/gtk/avatar.py ===================================== @@ -12,22 +12,28 @@ # 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 Optional, Union + import logging import hashlib from math import pi from functools import lru_cache from collections import defaultdict +from pathlib import Path from gi.repository import Gdk from gi.repository import GdkPixbuf import cairo +from nbxmpp.protocol import JID +from gajim.common import types from gajim.common import app from gajim.common import configpaths from gajim.common.helpers import Singleton from gajim.common.helpers import get_groupchat_name from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from gajim.common.modules.contacts import Contacts from .const import DEFAULT_WORKSPACE_COLOR from .util import load_pixbuf @@ -42,7 +48,18 @@ log = logging.getLogger('gajim.gui.avatar') -def generate_avatar(letters, color, size, scale): +AvatarCacheT = dict[JID, dict[tuple[int, int, Optional[str]], + cairo.ImageSurface]] + +ContactT = Union[types.BareContact, + types.GroupchatContact, + types.GroupchatParticipant] + +def generate_avatar(letters: str, + color: tuple[float, float, float], + size: int, + scale: int) -> cairo.ImageSurface: + # Get color for nickname with XEP-0392 color_r, color_g, color_b = color @@ -84,7 +101,12 @@ def generate_avatar(letters, color, size, scale): @lru_cache(maxsize=None) -def generate_default_avatar(letter, color_string, size, scale, style='circle'): +def generate_default_avatar(letter: str, + color_string: str, + size: int, + scale: int, + style: str = 'circle') -> cairo.ImageSurface: + color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) surface = clip(surface, style) @@ -93,14 +115,21 @@ def generate_default_avatar(letter, color_string, size, scale, style='circle'): @lru_cache(maxsize=None) -def make_workspace_avatar(letter, color, size, scale, style='round-corners'): +def make_workspace_avatar(letter: str, + color: tuple[float, float, float], + size: int, + scale: int, + style: str = 'round-corners') -> cairo.ImageSurface: + surface = generate_avatar(letter, color, size, scale) surface = clip(surface, style) surface.set_device_scale(scale, scale) return surface -def add_status_to_avatar(surface, show): +def add_status_to_avatar(surface: cairo.ImageSurface, + show) -> cairo.ImageSurface: + width = surface.get_width() height = surface.get_height() @@ -149,7 +178,10 @@ def add_status_to_avatar(surface, show): return context.get_target() -def get_icon_avatar(size, scale, icon_name): +def get_icon_avatar(size: int, + scale: int, + icon_name: str) -> cairo.ImageSurface: + if scale is not None: size = size * scale @@ -171,7 +203,7 @@ def get_icon_avatar(size, scale, icon_name): @lru_cache(maxsize=128) -def get_show_circle(show, size, scale): +def get_show_circle(show, size: int, scale: int) -> cairo.ImageSurface: if not isinstance(show, str): show = show.value @@ -203,7 +235,7 @@ def get_show_circle(show, size, scale): return context.get_target() -def fit(surface: cairo.Surface, size: int) -> cairo.Surface: +def fit(surface: cairo.ImageSurface, size: int) -> cairo.ImageSurface: width = surface.get_width() height = surface.get_height() if width == height: @@ -226,7 +258,7 @@ def fit(surface: cairo.Surface, size: int) -> cairo.Surface: return context.get_target() -def square(surface, size): +def square(surface: cairo.ImageSurface, size: int) -> cairo.ImageSurface: width = surface.get_width() height = surface.get_height() if width == height: @@ -250,7 +282,7 @@ def square(surface, size): return context.get_target() -def clip(surface, mode): +def clip(surface: cairo.ImageSurface, mode: str) -> cairo.ImageSurface: if mode == 'circle': return clip_circle(surface) if mode == 'round-corners': @@ -258,7 +290,7 @@ def clip(surface, mode): raise ValueError('clip mode unknown: %s' % mode) -def clip_circle(surface): +def clip_circle(surface: cairo.ImageSurface) -> cairo.ImageSurface: new_surface = cairo.ImageSurface(cairo.Format.ARGB32, surface.get_width(), surface.get_height()) @@ -280,7 +312,7 @@ def clip_circle(surface): return context.get_target() -def round_corners(surface): +def round_corners(surface: cairo.ImageSurface) -> cairo.ImageSurface: new_surface = cairo.ImageSurface(cairo.Format.ARGB32, surface.get_width(), surface.get_height()) @@ -308,7 +340,7 @@ def round_corners(surface): return context.get_target() -def convert_to_greyscale(surface): +def convert_to_greyscale(surface: cairo.ImageSurface) -> cairo.ImageSurface: context = cairo.Context(surface) context.set_operator(cairo.Operator.HSL_COLOR) context.set_source_rgb(1, 1, 1) @@ -323,31 +355,32 @@ def convert_to_greyscale(surface): class AvatarStorage(metaclass=Singleton): def __init__(self): - self._cache = defaultdict(dict) + self._cache: AvatarCacheT = defaultdict(dict) - def invalidate_cache(self, jid): + def invalidate_cache(self, jid: JID) -> None: self._cache.pop(jid, None) def get_pixbuf(self, - contact, - size, - scale, - show=None, - default=False, - transport_icon=None, - style='circle'): + contact: ContactT, + size: int, + scale: int, + show: Optional[str] = None, + default: bool = False, + transport_icon: Optional[str] = None, + style: str = 'circle') -> cairo.ImageSurface: + surface = self.get_surface( contact, size, scale, show, default, transport_icon, style) return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) def get_surface(self, - contact, - size, - scale, - show=None, - default=False, - transport_icon=None, - style='circle'): + contact: ContactT, + size: int, + scale: int, + show: Optional[str] = None, + default: bool = False, + transport_icon: Optional[str] = None, + style: str = 'circle') -> cairo.ImageSurface: jid = contact.jid @@ -382,13 +415,13 @@ def get_surface(self, return surface def get_muc_surface(self, - account, - jid, - size, - scale, - default=False, - transport_icon=None, - style='circle'): + account: str, + jid: JID, + size: int, + scale: int, + default: bool = False, + transport_icon: Optional[str] = None, + style: str = 'circle') -> Optional[cairo.ImageSurface]: if transport_icon is not None: surface = get_icon_avatar(size, scale, transport_icon) @@ -416,7 +449,11 @@ def get_muc_surface(self, self._cache[jid][(size, scale)] = surface return surface - def get_workspace_surface(self, workspace_id, size, scale): + def get_workspace_surface(self, + workspace_id: str, + size: int, + scale: int) -> Optional[cairo.ImageSurface]: + surface = self._cache[workspace_id].get((size, scale)) if surface is not None: return surface @@ -438,18 +475,8 @@ def get_workspace_surface(self, workspace_id, size, scale): self._cache[workspace_id][(size, scale)] = surface return surface - def prepare_for_publish(self, path): - success, data = self._load_for_publish(path) - if not success: - return None, None - - sha = self.save_avatar(data) - if sha is None: - return None, None - return data, sha - @staticmethod - def _load_for_publish(path): + def _load_for_publish(path: str) -> Optional[tuple[bool, bytes]]: pixbuf = load_pixbuf(path) if pixbuf is None: return None @@ -466,7 +493,7 @@ def _load_for_publish(path): return pixbuf.save_to_bufferv('png', [], []) @staticmethod - def save_avatar(data): + def save_avatar(data: bytes) -> Optional[str]: """ Save an avatar to the harddisk @@ -488,13 +515,17 @@ def save_avatar(data): return sha @staticmethod - def get_avatar_path(filename): + def get_avatar_path(filename: str) -> Optional[Path]: path = configpaths.get('AVATAR') / filename if not path.is_file(): return None return path - def surface_from_filename(self, filename, size, scale): + def surface_from_filename(self, + filename: str, + size: int, + scale: int) -> Optional[cairo.ImageSurface]: + size = size * scale path = self.get_avatar_path(filename) if path is None: @@ -507,7 +538,11 @@ def surface_from_filename(self, filename, size, scale): surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) return fit(surface, size) - def _load_surface_from_storage(self, filename, size, scale): + def _load_surface_from_storage(self, + filename: str, + size: int, + scale: int) -> Optional[cairo.ImageSurface]: + size = size * scale path = self.get_avatar_path(filename) if path is None: @@ -519,7 +554,12 @@ def _load_surface_from_storage(self, filename, size, scale): surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) return fit(surface, size) - def _get_avatar_from_storage(self, contact, size, scale, style): + def _get_avatar_from_storage(self, + contact: ContactT, + size: int, + scale: int, + style: str) -> Optional[cairo.ImageSurface]: + avatar_sha = contact.avatar_sha if avatar_sha is None: return None @@ -530,7 +570,7 @@ def _get_avatar_from_storage(self, contact, size, scale, style): return clip(surface, style) @staticmethod - def _generate_letter(name): + def _generate_letter(name: str) -> str: for letter in name: if letter.isalpha(): return letter.capitalize() ===================================== gajim/gtk/status_selector.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any, Optional + from gi.repository import Gtk from gi.repository import Pango @@ -28,7 +30,7 @@ class StatusSelector(Gtk.MenuButton): - def __init__(self, account=None, compact=False): + def __init__(self, account: Optional[str] = None, compact: bool = False): Gtk.MenuButton.__init__(self) self.set_direction(Gtk.ArrowType.UP) self._account = account @@ -55,7 +57,7 @@ def __init__(self, account=None, compact=False): app.ged.register_event_handler('our-show', ged.POSTGUI, self.update) - def _create_popover(self): + def _create_popover(self) -> None: popover_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) popover_box.get_style_context().add_class('margin-3') popover_items = [ @@ -98,12 +100,12 @@ def _create_popover(self): self._status_popover.add(popover_box) self.set_popover(self._status_popover) - def _on_change_status(self, button): + def _on_change_status(self, button: Gtk.Button) -> None: self._status_popover.popdown() new_status = button.get_name() app.interface.change_status(status=new_status, account=self._account) - def update(self, *args, **kwargs): + def update(self, *args: Any, **kwargs: Any) -> None: if self._account is None: show = get_global_show() else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d2d217b6932cbd3d7c1eaa60e800a47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d2d217b6932cbd3d7c1eaa60e800a47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: About: Remove Workaround
by Philipp Hörist (＠lovetox) 08 Dec '21

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 251439bf by lovetox at 2021-12-08T18:35:10+01:00 About: Remove Workaround https://gitlab.gnome.org/GNOME/gtk/issues/1561 is fixed and merged - - - - - eaeae1f4 by lovetox at 2021-12-08T20:00:49+01:00 About: Add type annotations - - - - - d2d217b6 by lovetox at 2021-12-08T20:01:40+01:00 About: Remove unnecessary code - - - - - 1 changed file: - gajim/gtk/about.py Changes: ===================================== gajim/gtk/about.py ===================================== @@ -47,7 +47,7 @@ def __init__(self): GLib.MINOR_VERSION, GLib.MICRO_VERSION])) - comments = [] + comments: list[str] = [] comments.append(_('A GTK XMPP client')) comments.append(_('GTK Version: %s') % gtk_ver) comments.append(_('GLib Version: %s') % glib_ver) @@ -69,29 +69,12 @@ def __init__(self): self.set_translator_credits(_('translator-credits')) self.set_logo_icon_name('org.gajim.Gajim') - self.connect( - 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) - - self.show() self.connect('activate-link', self._on_activate_link) - # See https://gitlab.gnome.org/GNOME/gtk/issues/1561 - self._connect_link_handler(self) + self.show() @staticmethod - def _on_activate_link(_label, uri): + def _on_activate_link(_label: Gtk.Label, uri: str) -> int: # We have to use this, because the default GTK handler # is not cross-platform compatible open_uri(uri) return Gdk.EVENT_STOP - - def _connect_link_handler(self, parent): - def _find_child(parent_): - if not hasattr(parent_, 'get_children'): - return - - for child in parent_.get_children(): - if isinstance(child, Gtk.Label): - if 'href' in child.get_label(): - child.connect('activate-link', self._on_activate_link) - _find_child(child) - _find_child(parent) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4a60a9e3d42da52a6b3d6d99b642805… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4a60a9e3d42da52a6b3d6d99b642805… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ScrolledView: Improve annotations
by Philipp Hörist (＠lovetox) 08 Dec '21

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a60a9e3 by lovetox at 2021-12-08T16:21:02+01:00 ScrolledView: Improve annotations - - - - - 1 changed file: - gajim/gtk/conversation/scrolled.py Changes: ===================================== gajim/gtk/conversation/scrolled.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 Optional from gi.repository import Gtk @@ -35,8 +37,8 @@ class ScrolledView(Gtk.ScrolledWindow): ) } - def __init__(self, *args, **kwargs): - Gtk.ScrolledWindow.__init__(self, *args, **kwargs) + def __init__(self) -> None: + Gtk.ScrolledWindow.__init__(self) self.set_overlay_scrolling(False) self.get_style_context().add_class('scrolled-no-border') @@ -56,7 +58,7 @@ def __init__(self, *args, **kwargs): # horizontally under certain conditions (applies to GroupchatControl) self.get_hscrollbar().hide() - self._current_upper: int = 0 + self._current_upper: float = 0 self._autoscroll: bool = True self._request_history_at_upper: Optional[float] = None self._upper_complete: bool = False @@ -91,7 +93,10 @@ def set_history_complete(self, before: bool, complete: bool) -> None: def get_lower_complete(self) -> bool: return self._lower_complete - def _on_adj_upper_changed(self, adj, *args): + def _on_adj_upper_changed(self, + adj: Gtk.Adjustment, + _pspec: GObject.ParamSpec) -> None: + upper = adj.get_upper() diff = upper - self._current_upper @@ -114,7 +119,10 @@ def _on_adj_upper_changed(self, adj, *args): self.emit('autoscroll-changed', self._autoscroll) self._requesting = None - def _on_adj_value_changed(self, adj, *args): + def _on_adj_value_changed(self, + adj: Gtk.Adjustment, + _pspec: GObject.ParamSpec) -> None: + if self._requesting is not None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a60a9e3d42da52a6b3d6d99b642805c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a60a9e3d42da52a6b3d6d99b642805c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Settings: Add finalize check
by Philipp Hörist (＠lovetox) 08 Dec '21

08 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae32e629 by lovetox at 2021-12-08T13:39:37+01:00 Settings: Add finalize check - - - - - bd12add5 by lovetox at 2021-12-08T13:40:00+01:00 PopoverSetting: Destroy popover - - - - - 97c1cc8c by lovetox at 2021-12-08T13:52:41+01:00 Preferences: Add finalize check - - - - - 2 changed files: - gajim/gtk/preferences.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -95,6 +95,7 @@ def __init__(self): self._ui.audio_video_info_bar.set_revealed(not app.is_installed('AV')) self.connect('key-press-event', self._on_key_press) + self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) self.show_all() @@ -145,6 +146,10 @@ def _check_emoji_theme(): if settings_theme not in emoji_themes: app.settings.set('emoticons_theme', 'font') + def _on_destroy(self, _widget): + self._prefs.clear() + app.check_finalize(self) + class PreferenceBox(SettingsBox): def __init__(self, settings): ===================================== gajim/gtk/settings.py ===================================== @@ -104,6 +104,13 @@ def __init__(self, account=None, jid=None, extend=None): self.map[setting] = callback self.connect('row-activated', self.on_row_activated) + self.connect('destroy', self.__on_destroy) + + @staticmethod + def __on_destroy(widget): + app.check_finalize(widget) + for row in widget.get_children(): + app.check_finalize(row) @staticmethod def on_row_activated(_listbox, row): @@ -717,6 +724,7 @@ def update_entries(self, entries): self._add_menu_entries() def _on_destroy(self, *args): + self._popover.destroy() app.settings.disconnect_signals(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/09b965e51c50ab5c25d5260469db17f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/09b965e51c50ab5c25d5260469db17f… 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