Commits February 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] StartChat: Don't assume contact type without server response
by Daniel Brötzmann (＠wurstsalat) 25 Feb '22

25 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c0f5c2f3 by wurstsalat at 2022-02-25T23:14:16+01:00 StartChat: Don't assume contact type without server response - - - - - 2 changed files: - gajim/data/gui/start_chat_dialog.ui - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -547,108 +547,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Start New Chat</property> - <style> - <class name="large-header"/> - <class name="margin-12"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Gajim was not able to gather infos about this address.</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">avatar-default-symbolic</property> - <property name="icon_size">6</property> - <style> - <class name="dim-label"/> - <class name="margin-12"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-bottom">6</property> - <property name="label" translatable="yes">You can start a direct message chat, if you are sure this address is correct.</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="margin-12"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Start New Chat</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <signal name="clicked" handler="_on_no_disco_continue" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <style> - <class name="margin-18"/> - </style> - </object> - <packing> - <property name="name">no-disco</property> - <property name="position">5</property> - </packing> + <placeholder/> </child> </object> <object class="GtkBox" id="placeholder"> ===================================== gajim/gtk/start_chat.py ===================================== @@ -374,9 +374,7 @@ def _start_new_chat(self, row: ContactRow) -> None: def _disco_info(self, row: ContactRow) -> None: if not app.account_is_available(row.account): - # Account is disconnected: offer to open 1:1 chat anyway - self._new_chat_row = row - self._ui.stack.set_visible_child_name('no-disco') + self._show_error_page(_('You are offline.')) return self._ui.stack.set_visible_child_name('progress') @@ -407,10 +405,9 @@ def _disco_info_received(self, task: Task) -> None: self._show_error_page(error.get_text()) return except TimeoutStanzaError: - # We reached the 10s timeout, but we should - # offer to open a chat anyway - self._new_chat_row = row - self._ui.stack.set_visible_child_name('no-disco') + # We reached the 10s timeout and we cannot + # assume which kind contact this is. + self._show_error_page(_('This address is not reachable.')) return if result.is_muc: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0f5c2f35feb112d880611b9478c93b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0f5c2f35feb112d880611b9478c93b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PlainWidget: Make selection transparent if there is no focus
by Daniel Brötzmann (＠wurstsalat) 25 Feb '22

25 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 492a7580 by wurstsalat at 2022-02-25T13:55:28+01:00 PlainWidget: Make selection transparent if there is no focus When focusing out it is expected to clear text selection. Clearing text selection itself clears middle mouse button's clipboard layer. To work around this, we apply transparency to the selection for as long as we don't have focus. - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -32,6 +32,11 @@ .message-input-focus { border-radius: 4px; } +.transparent-selection > selection { + background-color: transparent; + color: @theme_fg_color; +} + row:backdrop { transition: none; } .conversation-row:hover button { ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -89,6 +89,7 @@ def __init__(self, account: str, selectable: bool) -> None: self.connect('populate-popup', self._on_populate_popup) self.connect('activate-link', self._on_activate_link) + self.connect('focus-in-event', self._on_focus_in) self.connect('focus-out-event', self._on_focus_out) def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: @@ -126,10 +127,17 @@ def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: open_uri(uri, self._account) return Gdk.EVENT_STOP - def _on_focus_out(self, - widget: MessageLabel, - event: Gdk.EventFocus) -> None: - self.select_region(0, 0) + @staticmethod + def _on_focus_in(widget: MessageLabel, + _event: Gdk.EventFocus + ) -> None: + widget.get_style_context().remove_class('transparent-selection') + + @staticmethod + def _on_focus_out(widget: MessageLabel, + _event: Gdk.EventFocus + ) -> None: + widget.get_style_context().add_class('transparent-selection') class MessageTextview(Gtk.TextView): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/492a75802fffa6b64fb8b51bbcd6b7a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/492a75802fffa6b64fb8b51bbcd6b7a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatJoin: Fix spinner size
by Daniel Brötzmann (＠wurstsalat) 25 Feb '22

25 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 06ce1f4c by wurstsalat at 2022-02-25T12:47:23+01:00 GroupchatJoin: Fix spinner size - - - - - 88de7334 by wurstsalat at 2022-02-25T13:08:39+01:00 StartChat: Validate search text - - - - - 2 changed files: - gajim/gtk/groupchat_join.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -196,6 +196,7 @@ def __init__(self) -> None: self.set_vexpand(True) self.set_homogeneous(True) self._spinner = Gtk.Spinner() + self._spinner.set_halign(Gtk.Align.CENTER) self.add(self._spinner) self.show_all() ===================================== gajim/gtk/start_chat.py ===================================== @@ -537,11 +537,24 @@ def _on_global_search_toggle(self, button: Gtk.ToggleButton) -> None: self._set_listbox(self._ui.listbox) self._global_search_listbox.remove_all() - def _on_search_changed(self, entry: Gtk.SearchEntry) -> None: + def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: + self._show_search_entry_error(False) + if self._global_search_active(): return - search_text = entry.get_text() + search_text = search_entry.get_text() + if not search_text: + self._remove_new_jid_row() + return + + try: + validate_jid(search_text) + except ValueError: + self._show_search_entry_error(True) + self._remove_new_jid_row() + return + if '@' in search_text: self._add_new_jid_row() self._update_new_jid_rows(search_text) @@ -549,6 +562,15 @@ def _on_search_changed(self, entry: Gtk.SearchEntry) -> None: self._remove_new_jid_row() self._ui.listbox.invalidate_filter() + def _show_search_entry_error(self, state: bool): + icon_name = 'dialog-warning-symbolic' if state else None + self._ui.search_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, + icon_name) + self._ui.search_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, + _('Invalid Address')) + def _add_new_jid_row(self) -> None: if self.new_contact_row_visible: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/38635ea765b5766d33a789909e38b1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/38635ea765b5766d33a789909e38b1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Contacts: Typing
by Daniel Brötzmann (＠wurstsalat) 25 Feb '22

25 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 38635ea7 by wurstsalat at 2022-02-25T12:21:24+01:00 Contacts: Typing - - - - - 2 changed files: - gajim/common/helpers.py - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -31,6 +31,7 @@ from typing import Callable from typing import Optional from typing import Union +from typing import TYPE_CHECKING import sys import re @@ -97,6 +98,8 @@ from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX from gajim.common.structs import URI from gajim.common import types +if TYPE_CHECKING: + from gajim.common.modules.util import LogAdapter HAS_PYWIN32 = False if os.name == 'nt': @@ -1182,7 +1185,7 @@ def get_tls_error_phrase(tls_error: Gio.TlsCertificateFlags) -> str: class Observable: - def __init__(self, log_: Optional[logging.Logger] = None): + def __init__(self, log_: Union[logging.Logger, LogAdapter, None] = None): self._log = log_ self._callbacks: types.ObservableCbDict = defaultdict(list) ===================================== gajim/common/modules/contacts.py ===================================== @@ -20,11 +20,11 @@ from typing import Union from typing import overload -import logging from functools import partial import cairo from nbxmpp.const import Affiliation +from nbxmpp.const import Chatstate from nbxmpp.const import Role from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID @@ -46,6 +46,7 @@ from gajim.common.structs import MUCPresenceData from gajim.common.helpers import Observable from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import LogAdapter from gajim.common.helpers import get_groupchat_name @@ -122,7 +123,8 @@ def add_contact(self, def get_contact(self, jid: Union[str, JID], - groupchat: bool = False) -> types.ContactT: + groupchat: bool = False + ) -> types.ContactT: if isinstance(jid, str): jid = JID.from_string(jid) @@ -150,8 +152,9 @@ def get_group_chat_contact(self, return self.get_contact(jid, groupchat=True) def get_contacts_with_domain(self, - domain: str) -> list[Union[BareContact, - GroupchatContact]]: + domain: str + ) -> list[Union[BareContact, + GroupchatContact]]: contacts: list[Union[BareContact, GroupchatContact]] = [] for contact in self._contacts.values(): @@ -163,6 +166,7 @@ def _reset_presence(self) -> None: for contact in self._contacts.values(): if contact.is_groupchat or contact.is_pm_contact: continue + assert isinstance(contact, BareContact) contact.update_presence(UNKNOWN_PRESENCE) def force_chatstate_update(self) -> None: @@ -172,16 +176,15 @@ def force_chatstate_update(self) -> None: class CommonContact(Observable): def __init__(self, - logger: logging.Logger, + logger: LogAdapter, jid: JID, - account: str) -> None: + account: str + ) -> None: Observable.__init__(self, logger) self._jid = jid self._account = account - self._resources = {} - def _module(self, name: str) -> BaseModule: return app.get_client(self._account).get_module(name) @@ -193,14 +196,22 @@ def jid(self) -> JID: def account(self) -> str: return self._account - def _on_signal(self, _contact, signal_name, *args, **kwargs): + def _on_signal(self, + _contact: Union[BareContact, + ResourceContact, + GroupchatContact, + GroupchatParticipant], + signal_name: str, + *args: Any, + **kwargs: Any + ) -> None: self.notify(signal_name, *args, **kwargs) def supports(self, requested_feature: str) -> bool: return self._supports(self._jid, requested_feature) @staticmethod - def _supports(jid, requested_feature: str) -> bool: + def _supports(jid: JID, requested_feature: str) -> bool: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info is None: return False @@ -222,19 +233,16 @@ def is_jingle_available(self) -> bool: def get_address(self, _prefer_real: bool = True) -> JID: return self._jid - def force_chatstate_update(self) -> None: - for contact in self._resources.values(): - contact.notify('chatstate-update') - - def __repr__(self): + def __repr__(self) -> str: return f'{self.jid} ({self._account})' class BareContact(CommonContact): - def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: + def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self.settings = ContactSettings(account, jid) + self._resources: dict[str, ResourceContact] = {} self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') @@ -246,6 +254,7 @@ def supports(self, requested_feature: str) -> bool: def add_resource(self, resource: str) -> ResourceContact: jid = self._jid.new_with(resource=resource) + assert isinstance(self._log, LogAdapter) contact = ResourceContact(self._log, jid, self._account) self._resources[resource] = contact contact.connect('presence-update', self._on_signal) @@ -286,23 +295,31 @@ def show(self): return max(show_values) @property - def chatstate(self): + def chatstate(self) -> Optional[Chatstate]: chatstates = {contact.chatstate for contact in self._resources.values()} chatstates.discard(None) if not chatstates: return None return min(chatstates) + def force_chatstate_update(self) -> None: + for contact in self._resources.values(): + contact.notify('chatstate-update') + @property def name(self) -> str: roster_name = self._get_roster_attr('name') if roster_name: + assert isinstance(roster_name, str) return roster_name nickname = app.storage.cache.get_contact(self._jid, 'nickname') if nickname: return nickname if self._jid.is_domain: + assert self._jid.domain is not None return self._jid.domain + + assert self._jid.localpart is not None return self._jid.localpart def get_tune(self) -> Optional[TuneData]: @@ -329,10 +346,11 @@ def get_avatar(self, if self.is_gateway: show = None disco_info = app.storage.cache.get_last_disco_info(self._jid) - if disco_info.gateway_type == 'sms': - transport_icon = 'gajim-agent-sms' - if disco_info.gateway_type == 'irc': - transport_icon = 'gajim-agent-irc' + if disco_info is not None: + if disco_info.gateway_type == 'sms': + transport_icon = 'gajim-agent-sms' + if disco_info.gateway_type == 'irc': + transport_icon = 'gajim-agent-irc' else: for resource_contact in self.iter_resources(): if resource_contact.identity_type == 'sms': @@ -372,7 +390,7 @@ def update_avatar(self, sha: str) -> None: app.app.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') - def _get_roster_attr(self, attr: str): + def _get_roster_attr(self, attr: str) -> Union[list[str], str, None]: item = self._module('Roster').get_item(self._jid) if item is None: return None @@ -391,18 +409,24 @@ def is_gateway(self) -> bool: return disco_info.is_gateway @property - def ask(self): - return self._get_roster_attr('ask') + def ask(self) -> str: + ask = self._get_roster_attr('ask') + assert isinstance(ask, str) + return ask @property - def subscription(self): - return self._get_roster_attr('subscription') + def subscription(self) -> str: + subscription = self._get_roster_attr('subscription') + assert isinstance(subscription, str) + return subscription @property - def groups(self) -> list[str]: + def groups(self) -> set[str]: groups = self._get_roster_attr('groups') if groups is None: - return [] + return set() + + assert isinstance(groups, set) return groups @property @@ -428,7 +452,7 @@ def is_jingle_available(self) -> bool: class ResourceContact(CommonContact): - def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: + def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self._presence = UNKNOWN_PRESENCE @@ -440,6 +464,7 @@ def supports(self, requested_feature: str) -> bool: @property def resource(self) -> str: + assert self._jid.resource is not None return self._jid.resource @property @@ -477,22 +502,24 @@ def idle_time(self) -> Optional[float]: return self._presence.idle_time @property - def chatstate(self): + def chatstate(self) -> Chatstate: return self._module('Chatstate').get_remote_chatstate(self._jid) def update_presence(self, presence_data: PresenceData, - notify: bool = True) -> None: + notify: bool = True + ) -> None: self._presence = presence_data if notify: self.notify('presence-update') class GroupchatContact(CommonContact): - def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: + def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self.settings = GroupChatSettings(account, jid) + self._resources: dict[str, GroupchatParticipant] = {} @property def is_groupchat(self) -> bool: @@ -500,6 +527,7 @@ def is_groupchat(self) -> bool: def add_resource(self, resource: str) -> GroupchatParticipant: jid = self._jid.new_with(resource=resource) + assert isinstance(self._log, LogAdapter) contact = GroupchatParticipant(self._log, jid, self._account) self._resources[resource] = contact contact.connect('user-joined', self._on_user_signal) @@ -542,13 +570,18 @@ def get_avatar(self, size: int, scale: int) -> Optional[cairo.ImageSurface]: def _on_user_signal(self, contact: GroupchatParticipant, - signal_name: str, *args: Any) -> None: + signal_name: str, *args: Any + ) -> None: self.notify(signal_name, contact, *args) - def update_avatar(self, *args) -> None: + def update_avatar(self, *args: Any) -> None: app.app.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') + def force_chatstate_update(self) -> None: + for contact in self._resources.values(): + contact.notify('chatstate-update') + def get_self(self) -> Optional[GroupchatParticipant]: nick = self.nickname if nick is None: @@ -563,7 +596,7 @@ def nickname(self) -> Optional[str]: return muc_data.nick @property - def occupant_jid(self): + def occupant_jid(self) -> Optional[JID]: muc_data = self._module('MUC').get_muc_data(self._jid) if muc_data is None: return None @@ -615,10 +648,10 @@ def can_notify(self) -> bool: class GroupchatParticipant(CommonContact): - def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: + def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) - self.settings = ContactSettings(account, str(jid)) + self.settings = ContactSettings(account, jid) self._client = app.get_client(self._account) @@ -626,6 +659,7 @@ def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: @property def resource(self) -> str: + assert self._jid.resource is not None return self._jid.resource def get_address(self, prefer_real: bool = True) -> JID: @@ -674,6 +708,7 @@ def idle_time(self) -> Optional[float]: @property def name(self) -> str: + assert self._jid.resource is not None return self._jid.resource @property @@ -696,18 +731,19 @@ def role(self) -> Role: return self._presence.role @property - def chatstate(self): + def chatstate(self) -> Chatstate: return self._module('Chatstate').get_remote_chatstate(self._jid) @property - def avatar_sha(self): + def avatar_sha(self) -> str: return self._client.get_module('VCardAvatars').get_avatar_sha(self._jid) def get_avatar(self, size: int, scale: int, add_show: bool = True, - style: str = 'circle') -> cairo.ImageSurface: + style: str = 'circle' + ) -> cairo.ImageSurface: show = self.show.value if add_show else None return app.app.avatar_storage.get_surface( @@ -716,7 +752,8 @@ def get_avatar(self, def update_presence(self, presence: MUCPresenceData, *args: Any, - notify: bool = True) -> None: + notify: bool = True + ) -> None: if not notify: self._presence = presence return @@ -731,7 +768,7 @@ def update_presence(self, self.notify('user-left', *args) return - signals = [] + signals: list[str] = [] if self._presence.affiliation != presence.affiliation: signals.append('user-affiliation-changed') @@ -746,10 +783,6 @@ def update_presence(self, for signal in signals: self.notify(signal, *args) - def set_state(self, state, presence: MUCPresenceData) -> None: - self._presence = presence - self.notify(state) - - def update_avatar(self, *args) -> None: + def update_avatar(self, *args: Any) -> None: app.app.avatar_storage.invalidate_cache(self._jid) self.notify('user-avatar-update') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/38635ea765b5766d33a789909e38b1a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/38635ea765b5766d33a789909e38b1a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update tune info with media playback switch
by Daniel Brötzmann (＠wurstsalat) 24 Feb '22

24 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 523820b4 by André Apitzsch at 2022-02-24T15:17:41+00:00 Update tune info with media playback switch - - - - - 2 changed files: - gajim/common/modules/user_tune.py - gajim/gtk/accounts.py Changes: ===================================== gajim/common/modules/user_tune.py ===================================== @@ -70,11 +70,12 @@ def _tune_received(self, _con, _stanza, properties): contact.notify('tune-update', data) @store_publish - def set_tune(self, tune): + def set_tune(self, tune, force=False): if not self._con.get_module('PEP').supported: return - if not app.settings.get_account_setting(self._account, 'publish_tune'): + if not force and not app.settings.get_account_setting( + self._account, 'publish_tune'): return if tune == self._current_tune: @@ -87,16 +88,9 @@ def set_tune(self, tune): def set_enabled(self, enable): if enable: - app.settings.set_account_setting(self._account, - 'publish_tune', - True) self._publish_current_tune() - else: - self.set_tune(None) - app.settings.set_account_setting(self._account, - 'publish_tune', - False) + self.set_tune(None, force=True) def _publish_current_tune(self): self.set_tune(MusicTrackListener.get().current_tune) ===================================== gajim/gtk/accounts.py ===================================== @@ -737,6 +737,7 @@ def __init__(self, account: str) -> None: Setting(SettingKind.SWITCH, _('Media Playback'), SettingType.ACCOUNT_CONFIG, 'publish_tune', + callback=self._publish_tune, desc=_('Disclose information about media that is ' 'currently being played on your system.')), @@ -812,6 +813,9 @@ def _reset_gc_send_chatstate(button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_group_chat_settings('send_chatstate', None) + def _publish_tune(self, state: bool, _data: Any) -> None: + app.connections[self._account].get_module('UserTune').set_enabled(state) + def _send_read_marker(self, state: bool, _data: Any) -> None: app.settings.set_account_setting( self._account, 'send_marker_default', state) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/523820b48e25195588a07df7218838f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/523820b48e25195588a07df7218838f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: AboutDialog: Fix close button
by Daniel Brötzmann (＠wurstsalat) 24 Feb '22

24 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 83ec615c by wurstsalat at 2022-02-24T10:18:07+01:00 AboutDialog: Fix close button - - - - - 1323fb7f by wurstsalat at 2022-02-24T10:24:04+01:00 AboutDialog: Add cairo versions - - - - - 1 changed file: - gajim/gtk/about.py Changes: ===================================== gajim/gtk/about.py ===================================== @@ -19,6 +19,8 @@ from gi.repository import GLib from gi.repository import GObject +import cairo + from gajim.common import app from gajim.common.helpers import open_uri from gajim.common.i18n import _ @@ -46,15 +48,20 @@ def __init__(self): glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, GLib.MINOR_VERSION, GLib.MICRO_VERSION])) + cairo_ver = cairo.cairo_version_string() + python_cairo_ver = cairo.version comments: list[str] = [] - comments.append(_('A GTK XMPP client')) + comments.append(_('A fully-featured XMPP chat client')) + comments.append('') comments.append(_('GTK Version: %s') % gtk_ver) comments.append(_('GLib Version: %s') % glib_ver) comments.append(_('PyGObject Version: %s') % gobject_ver) + comments.append(_('Cairo Version: %s') % cairo_ver) + comments.append(_('python-cairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) - self.set_comments("\n".join(comments)) + self.set_comments('\n'.join(comments)) self.add_credit_section(_('Current Developers'), DEVS_CURRENT) self.add_credit_section(_('Past Developers'), DEVS_PAST) @@ -70,6 +77,7 @@ def __init__(self): self.set_logo_icon_name('org.gajim.Gajim') self.connect('activate-link', self._on_activate_link) + self.connect('response', self._on_response) self.show() @staticmethod @@ -78,3 +86,10 @@ def _on_activate_link(_label: Gtk.Label, uri: str) -> int: # is not cross-platform compatible open_uri(uri) return Gdk.EVENT_STOP + + def _on_response(self, + _dialog: Gtk.AboutDialog, + response: Gtk.ResponseType + ) -> None: + if response == Gtk.ResponseType.DELETE_EVENT: + self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/10cb58663bbbf6dcc7e9738ad8a6739… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/10cb58663bbbf6dcc7e9738ad8a6739… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XEP-0260 <candidate port="" /> is optional
by Daniel Brötzmann (＠wurstsalat) 23 Feb '22

23 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 10cb5866 by Stephen Paul Weber at 2022-02-23T18:21:27+01:00 XEP-0260 <candidate port="" /> is optional XEP-0065 specifies that the default is 1080. Previously, sending Gajim a <candidate/> with no port would result in a backtrace, since int() does not accept NoneType. Now it will correctly fall back to the default port. - - - - - 1 changed file: - gajim/common/jingle_transport.py Changes: ===================================== gajim/common/jingle_transport.py ===================================== @@ -154,16 +154,13 @@ def make_transport(self, candidates=None, add_candidates=True): def parse_transport_stanza(self, transport): candidates = [] for candidate in transport.iterTags('candidate'): - typ = 'direct' # default value - if candidate.has_attr('type'): - typ = candidate['type'] cand = { 'state': 0, 'target': self.ourjid, 'host': candidate['host'], - 'port': int(candidate['port']), + 'port': int(candidate.get('port', 1080)), 'candidate_id': candidate['cid'], - 'type': typ, + 'type': candidate.get('type', 'direct'), 'priority': candidate['priority'] } candidates.append(cand) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/10cb58663bbbf6dcc7e9738ad8a6739e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/10cb58663bbbf6dcc7e9738ad8a6739e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] View: Fix pipeline
by Daniel Brötzmann (＠wurstsalat) 21 Feb '22

21 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 00da4ac4 by wurstsalat at 2022-02-21T10:15:33+01:00 View: Fix pipeline - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -467,9 +467,9 @@ def iter_rows(self) -> Generator[BaseRow, None, None]: for row in cast(list[BaseRow], self.get_children()): yield row - def remove_rows_by_type(self, type: str) -> None: + def remove_rows_by_type(self, row_type: str) -> None: for row in self.iter_rows(): - if row.type == type: + if row.type == row_type: row.destroy() def update_call_rows(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00da4ac4f9e60a170c3da56f8c1e31ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00da4ac4f9e60a170c3da56f8c1e31ff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationView: Remove row filtering for visibility
by Daniel Brötzmann (＠wurstsalat) 20 Feb '22

20 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 255a5ac5 by wurstsalat at 2022-02-20T16:50:42+01:00 ConversationView: Remove row filtering for visibility This approach came with some drawbacks (i.e. message merging complexity) - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking from nbxmpp.structs import MucSubject +from nbxmpp.protocol import JID from gajim.common import app from gajim.common.client import Client @@ -46,7 +47,6 @@ from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow from gajim.common.modules.contacts import BareContact -from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT from .rows.base import BaseRow @@ -100,7 +100,6 @@ def __init__(self, account: str, contact: ChatContactT) -> None: Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_sort_func(self._sort_func) - self.set_filter_func(self._filter_func) self._account = account self._client: Optional[Client] = None if account is not None: @@ -143,7 +142,6 @@ def get_row_at_index(self, index: int) -> BaseRow: return cast(BaseRow, Gtk.ListBox.get_row_at_index(self, index)) def _on_destroy(self, *args: Any) -> None: - self.set_filter_func(None) app.check_finalize(self) def lock(self) -> None: @@ -188,17 +186,6 @@ def _sort_func(row1: BaseRow, row2: BaseRow) -> int: return 0 return -1 if row1.timestamp < row2.timestamp else 1 - def _filter_func(self, row: BaseRow) -> bool: - if not isinstance(self._contact, GroupchatContact): - return True - - if row.type in ('muc-user-joined', 'muc-user-left'): - return self._contact.settings.get('print_join_left') - if row.type == 'muc-user-status': - return self._contact.settings.get('print_status') - - return True - def add_muc_subject(self, subject: MucSubject) -> None: muc_subject = MUCSubject(self._account, subject) self._insert_message(muc_subject) @@ -207,7 +194,8 @@ def add_muc_user_left(self, nick: str, reason: str, error: bool = False) -> None: - + if not self._contact.settings.get('print_join_left'): + return join_left = MUCJoinLeft('muc-user-left', self._account, nick, @@ -216,12 +204,16 @@ def add_muc_user_left(self, self._insert_message(join_left) def add_muc_user_joined(self, nick: str) -> None: + if not self._contact.settings.get('print_join_left'): + return join_left = MUCJoinLeft('muc-user-joined', self._account, nick) self._insert_message(join_left) def add_user_status(self, name: str, show: str, status: str) -> None: + if not self._contact.settings.get('print_status'): + return user_status = UserStatus(self._account, name, show, status) self._insert_message(user_status) @@ -475,6 +467,11 @@ def iter_rows(self) -> Generator[BaseRow, None, None]: for row in cast(list[BaseRow], self.get_children()): yield row + def remove_rows_by_type(self, type: str) -> None: + for row in self.iter_rows(): + if row.type == type: + row.destroy() + def update_call_rows(self) -> None: for row in cast(list[BaseRow], self.get_children()): if isinstance(row, CallRow): @@ -550,8 +547,21 @@ def _on_call_declined(self, ) -> None: self.emit('call-declined', session) - def _on_contact_setting_changed(self, *args: Any) -> None: - self.invalidate_filter() + def _on_contact_setting_changed(self, + value: Any, + setting: str, + _account: Optional[str], + _jid: Optional[JID]) -> None: + if setting == 'print_join_left': + if value: + return + self.remove_rows_by_type('muc-user-joined') + self.remove_rows_by_type('muc-user-left') + + if setting == 'print_status': + if value: + return + self.remove_rows_by_type('muc-user-status') def remove(self, widget: Gtk.Widget) -> None: super().remove(widget) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/255a5ac56ae9c4af070ac37198b817d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/255a5ac56ae9c4af070ac37198b817d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Apply emoji label workaround for MacOS
by Daniel Brötzmann (＠wurstsalat) 20 Feb '22

20 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e8e1d53f by wurstsalat at 2022-02-20T15:47:03+01:00 Apply emoji label workaround for MacOS - - - - - 2 changed files: - gajim/common/settings.py - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -212,7 +212,9 @@ def _setup_installation_defaults() -> None: if IS_PORTABLE: APP_SETTINGS['use_keyring'] = False - if sys.platform == 'win32': + if sys.platform in ('win32', 'darwin'): + # Cairo does not support color emojis fonts on + # Windows and MacOS APP_SETTINGS['dev_use_message_label'] = False @staticmethod ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -51,9 +51,10 @@ def __init__(self, account: str, selectable: bool) -> None: self._account = account - # We use a Gtk.Textview on Windows, since there is no support for - # rendering color fonts (Emojis) on Windows yet, see: + # We use a Gtk.Textview on Windows and MacOS, since there is no support + # for rendering color fonts (Emojis) on Windows/MacOS yet, see: # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/244 + # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/9 if app.settings.get('dev_use_message_label'): self._text_widget = MessageLabel(self._account, selectable) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8e1d53f41e3a482350aef3a22f00f4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8e1d53f41e3a482350aef3a22f00f4b… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2022