Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] Respect timestamp formatting on message copy
by Daniel Brötzmann (＠wurstsalat) 20 Feb '22

20 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b45ab768 by wurstsalat at 2022-02-20T14:44:50+01:00 Respect timestamp formatting on message copy - - - - - 1 changed file: - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -35,6 +35,7 @@ from gajim.common.const import Trust from gajim.common.const import TRUST_SYMBOL_DATA from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import from_one_line from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context from gajim.common.helpers import message_needs_highlight @@ -309,10 +310,12 @@ def is_mergeable(self, message: MessageRow) -> bool: return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME def on_copy_message(self, _widget: Gtk.Widget) -> None: - timestamp = self.timestamp.strftime('%x, %X') + time_format = from_one_line(app.settings.get('chat_timestamp_format')) + timestamp_formatted = self.timestamp.strftime(time_format) + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) text = self._message_widget.get_text() - clip.set_text(f'{timestamp} - {self.name}: {text}', -1) + clip.set_text(f'{timestamp_formatted} - {self.name}: {text}', -1) def on_quote_message(self, _widget: Gtk.Widget) -> None: self.emit('quote', self._message_widget.get_text()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b45ab768f7f923e228fe10074b049507… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b45ab768f7f923e228fe10074b049507… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Fix assertion error
by Daniel Brötzmann (＠wurstsalat) 20 Feb '22

20 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9af64847 by wurstsalat at 2022-02-20T14:32:32+01:00 Profile: Fix assertion error - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -165,7 +165,7 @@ def _on_access_model_received(self, task: Task) -> None: else: self._avatar_nick_public = (self._avatar_nick_public or access_model) - assert self._avatar_nick_public + assert self._avatar_nick_public is not None self._set_avatar_nick_access_switch(self._avatar_nick_public) def _on_vcard_received(self, task: Task): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9af6484717ecfb2913190880be303f8a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9af6484717ecfb2913190880be303f8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CommonContact: Never support Jingle unless overriden
by Philipp Hörist (＠lovetox) 18 Feb '22

18 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8854d0ac by Emmanuel Gil Peyrot at 2022-02-18T09:33:25+01:00 CommonContact: Never support Jingle unless overriden cd40d79f637166eab82aa5df133532a50f78564c introduced a new is_jingle_available property, but it was only enabled on BareContact. GroupchatParticipant was thus left without this property, raising an issue when opening a private chat. Fixes opening private messages, thanks Darkseid for the report! - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -215,6 +215,10 @@ def is_groupchat(self) -> bool: def is_pm_contact(self) -> bool: return False + @property + def is_jingle_available(self) -> bool: + return False + def get_address(self, _prefer_real: bool = True) -> JID: return self._jid View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8854d0ac1415e077bf0bcf67eb9d2181… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8854d0ac1415e077bf0bcf67eb9d2181… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: AccountSideBar: Add unread counter
by Daniel Brötzmann (＠wurstsalat) 16 Feb '22

16 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 15ab2328 by wurstsalat at 2022-02-16T23:30:13+01:00 AccountSideBar: Add unread counter - - - - - b48b75bf by wurstsalat at 2022-02-16T23:31:49+01:00 Update pyrightconfig - - - - - 4 changed files: - gajim/gtk/account_side_bar.py - gajim/gtk/main.py - gajim/gtk/notification_manager.py - pyrightconfig.json Changes: ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -60,6 +60,11 @@ def activate_account_page(self, account: str) -> None: self.select_row(row) + def update_unread_count(self, account: str, count: int) -> None: + for row in cast(list[Account], self.get_children()): + if row.account == account: + row.set_unread_count(count) + break class Account(Gtk.ListBoxRow): def __init__(self, account: str) -> None: @@ -75,6 +80,13 @@ def __init__(self, account: str) -> None: self._image = AccountAvatar(account) + self._unread_label = Gtk.Label() + self._unread_label.get_style_context().add_class( + 'unread-counter') + self._unread_label.set_no_show_all(True) + self._unread_label.set_halign(Gtk.Align.END) + self._unread_label.set_valign(Gtk.Align.START) + self._account_color_bar = Gtk.Box() self._account_color_bar.set_size_request(6, -1) self._account_color_bar.get_style_context().add_class( @@ -88,7 +100,11 @@ def __init__(self, account: str) -> None: account_box.add(self._account_color_bar) self._update_account_color() - self.add(account_box) + overlay = Gtk.Overlay() + overlay.add(account_box) + overlay.add_overlay(self._unread_label) + + self.add(overlay) self.show_all() def _update_account_color(self) -> None: @@ -99,6 +115,13 @@ def _update_account_color(self) -> None: self._account_class = app.css_config.get_dynamic_class(self.account) context.add_class(self._account_class) + def set_unread_count(self, count: int) -> None: + if count < 1000: + self._unread_label.set_text(str(count)) + else: + self._unread_label.set_text('999+') + self._unread_label.set_visible(bool(count)) + def update(self) -> None: self._update_account_color() ===================================== gajim/gtk/main.py ===================================== @@ -181,6 +181,9 @@ def _on_account_disabled(self, event: events.AccountDisabled) -> None: self._main_stack.remove_account_page(event.account) self._main_stack.remove_chats_for_account(event.account) + def update_account_unread_count(self, account: str, count: int) -> None: + self._account_side_bar.update_unread_count(account, count) + def _on_client_state_changed(self, client: Client, _signal_name: str, ===================================== gajim/gtk/notification_manager.py ===================================== @@ -82,16 +82,25 @@ def update_actions(self) -> None: online = app.account_is_connected(self._account) blocking_support = self._client.get_module('Blocking').supported - app.window.lookup_action( - f'subscription-accept-{self._account}').set_enabled(online) - app.window.lookup_action( - f'subscription-deny-{self._account}').set_enabled(online) - app.window.lookup_action( - f'subscription-block-{self._account}').set_enabled( - online and blocking_support) - app.window.lookup_action( - f'subscription-report-{self._account}').set_enabled( - online and blocking_support) + sub_accept = app.window.lookup_action( + f'subscription-accept-{self._account}') + assert sub_accept is not None + sub_accept.set_enabled(online) + + sub_deny = app.window.lookup_action( + f'subscription-deny-{self._account}') + assert sub_deny is not None + sub_deny.set_enabled(online) + + sub_block = app.window.lookup_action( + f'subscription-block-{self._account}') + assert sub_block is not None + sub_block.set_enabled(online and blocking_support) + + sub_report = app.window.lookup_action( + f'subscription-report-{self._account}') + assert sub_report is not None + sub_report.set_enabled(online and blocking_support) def _remove_actions(self) -> None: actions = [ @@ -103,6 +112,13 @@ def _remove_actions(self) -> None: for action in actions: app.window.remove_action(f'{action}-{self._account}') + def update_unread_count(self): + count = len(self.get_children()) + app.window.update_account_unread_count(self._account, count) + + def _on_row_destroy(self, _widget: Gtk.Widget) -> None: + self.update_unread_count() + def _on_subscription_accept(self, _action: Gio.SimpleAction, param: GLib.Variant @@ -116,7 +132,7 @@ def _on_subscription_accept(self, open_window('AddContact', account=self._account, jid=jid, nick=contact.name) if row is not None: - self.remove(row) + row.destroy() def _on_subscription_block(self, _action: Gio.SimpleAction, @@ -127,7 +143,7 @@ def _on_subscription_block(self, self._client.get_module('Blocking').block([jid]) row = self._get_notification_row(jid) if row is not None: - self.remove(row) + row.destroy() def _on_subscription_report(self, _action: Gio.SimpleAction, @@ -138,7 +154,7 @@ def _on_subscription_report(self, self._client.get_module('Blocking').block([jid], report='spam') row = self._get_notification_row(jid) if row is not None: - self.remove(row) + row.destroy() def _on_subscription_deny(self, _action: Gio.SimpleAction, @@ -148,7 +164,7 @@ def _on_subscription_deny(self, self._deny_request(jid) row = self._get_notification_row(jid) if row is not None: - self.remove(row) + row.destroy() def _deny_request(self, jid: str) -> None: self._client.get_module('Presence').unsubscribed(jid) @@ -165,8 +181,13 @@ def add_subscription_request(self, ) -> None: row = self._get_notification_row(event.jid) if row is None: - self.add(SubscriptionRequestRow( - self._account, event.jid, event.status, event.user_nick)) + new_row = SubscriptionRequestRow( + self._account, + event.jid, + event.status, + event.user_nick) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) contact = self._client.get_module('Contacts').get_contact( event.jid) @@ -178,15 +199,19 @@ def add_subscription_request(self, type='subscription-request', title=_('Subscription Request'), text=text)) + self.update_unread_count() elif row.type == 'unsubscribed': - self.remove(row) + row.destroy() def add_unsubscribed(self, event: UnsubscribedPresenceReceived ) -> None: row = self._get_notification_row(event.jid) if row is None: - self.add(UnsubscribedRow(self._account, event.jid)) + new_row = UnsubscribedRow(self._account, event.jid) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) + self.update_unread_count() contact = self._client.get_module('Contacts').get_contact( event.jid) @@ -199,33 +224,43 @@ def add_unsubscribed(self, title=_('Contact Unsubscribed'), text=text)) elif row.type == 'subscribe': - self.remove(row) + row.destroy() def add_invitation_received(self, event: MucInvitation) -> None: row = self._get_notification_row(str(event.muc)) - if row is None: - self.add(InvitationReceivedRow(self._account, event)) + if row is not None: + return - if get_muc_context(event.muc) == 'public': - jid = event.from_ - else: - jid = event.from_.bare - contact = self._client.get_module('Contacts').get_contact(jid) - text = _('%(contact)s invited you to %(chat)s') % { - 'contact': contact.name, - 'chat': event.info.muc_name} + new_row = InvitationReceivedRow(self._account, event) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) + self.update_unread_count() - app.ged.raise_event( - Notification(account=self._account, - jid=jid, - type='group-chat-invitation', - title=_('Group Chat Invitation'), - text=text)) + if get_muc_context(event.muc) == 'public': + jid = event.from_ + else: + jid = event.from_.bare + contact = self._client.get_module('Contacts').get_contact(jid) + text = _('%(contact)s invited you to %(chat)s') % { + 'contact': contact.name, + 'chat': event.info.muc_name} + + app.ged.raise_event( + Notification(account=self._account, + jid=jid, + type='group-chat-invitation', + title=_('Group Chat Invitation'), + text=text)) def add_invitation_declined(self, event: MucDecline) -> None: row = self._get_notification_row(str(event.muc)) - if row is None: - self.add(InvitationDeclinedRow(self._account, event)) + if row is not None: + return + + new_row = InvitationDeclinedRow(self._account, event) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) + self.update_unread_count() class NotificationRow(Gtk.ListBoxRow): ===================================== pyrightconfig.json ===================================== @@ -58,6 +58,7 @@ "gajim/gtk/manage_sounds.py", "gajim/gtk/message_input.py", "gajim/gtk/notification.py", + "gajim/gtk/notification_manager.py", "gajim/gtk/password_dialog.py", "gajim/gtk/preview_audio.py", "gajim/gtk/proxies.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9cfd624146a7c95fd34ccf4bb202f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9cfd624146a7c95fd34ccf4bb202f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatManage: Add destroy action
by Daniel Brötzmann (＠wurstsalat) 16 Feb '22

16 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e9cfd624 by wurstsalat at 2022-02-16T18:30:27+01:00 GroupchatManage: Add destroy action - - - - - 3 changed files: - gajim/data/gui/groupchat_manage.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/data/gui/groupchat_manage.ui ===================================== @@ -2,9 +2,6 @@  <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkTextBuffer" id="subject_buffer"> - <signal name="changed" handler="_on_subject_text_changed" swapped="no"/> - </object> <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -131,18 +128,51 @@ </packing> </child> <child> - <object class="GtkButton" id="manage_save_button"> - <property name="label" translatable="yes">Save</property> + <object class="GtkBox"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">False</property> - <property name="halign">end</property> - <signal name="clicked" handler="_on_manage_save_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> + <property name="can-focus">False</property> + <child> + <object class="GtkButton" id="manage_save_button"> + <property name="label" translatable="yes">Save</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <signal name="clicked" handler="_on_manage_save_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="destroy_muc_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Destroy Groupchat…</property> + <signal name="clicked" handler="_on_destroy_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">user-trash-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -193,7 +223,6 @@ <property name="right-margin">6</property> <property name="top-margin">6</property> <property name="bottom-margin">6</property> - <property name="buffer">subject_buffer</property> </object> </child> </object> @@ -240,7 +269,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">center</property> - <property name="valign">center</property> + <property name="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border-width">18</property> @@ -312,6 +341,8 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Update Avatar</property> + <property name="justify">center</property> + <property name="wrap">True</property> <style> <class name="bold16"/> </style> @@ -337,6 +368,172 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="width-request">300</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="label" translatable="yes">Destroy This Chat</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">22</property> + <style> + <class name="bold16"/> + </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="halign">start</property> + <property name="label" translatable="yes">Reason for destruction</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="GtkEntry" id="destroy_reason_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="margin-bottom">6</property> + <property name="activates-default">True</property> + <property name="caps-lock-warning">False</property> + <property name="secondary-icon-name">face-smile-symbolic</property> + <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> + <property name="secondary-icon-tooltip-markup" translatable="yes">Insert Emoji</property> + <property name="placeholder-text" translatable="yes">Reason (optional)...</property> + <property name="show-emoji-icon">True</property> + </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="halign">start</property> + <property name="label" translatable="yes">Where participants should go</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="destroy_alternate_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="margin-bottom">6</property> + <property name="activates-default">True</property> + <property name="caps-lock-warning">False</property> + <property name="placeholder-text" translatable="yes">Alternate venue (optional)...</property> + <signal name="changed" handler="_on_destroy_alternate_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">18</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_destroy_cancelled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="destroy_button"> + <property name="label" translatable="yes">_Destroy</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_destroy_confirmed" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">destroy</property> + <property name="position">2</property> + </packing> + </child> <style> <class name="padding-18"/> </style> ===================================== gajim/gtk/builder.pyi ===================================== @@ -510,17 +510,20 @@ class GroupchatInviterBuilder(Builder): class GroupchatManageBuilder(Builder): - subject_buffer: Gtk.TextBuffer stack: Gtk.Stack avatar_button_image: Gtk.Image avatar_select_button: Gtk.Button muc_description_entry: Gtk.Entry muc_name_entry: Gtk.Entry manage_save_button: Gtk.Button + destroy_muc_button: Gtk.Button subject_textview: Gtk.TextView subject_change_button: Gtk.Button avatar_selector_grid: Gtk.Grid avatar_update_button: Gtk.Button + destroy_reason_entry: Gtk.Entry + destroy_alternate_entry: Gtk.Entry + destroy_button: Gtk.Button class GroupchatNickChooserBuilder(Builder): ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -27,6 +27,7 @@ from gajim.common import app from gajim.common.const import AvatarSize +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -64,12 +65,15 @@ def __init__(self, self._prepare_subject() self._prepare_manage() + + self._ui.subject_textview.get_buffer().connect( + 'changed', self._on_subject_text_changed) self.connect('destroy', self._on_destroy) self.show_all() def _on_destroy(self, *args: Any) -> None: - self._avatar_selector = None + del self._avatar_selector app.check_finalize(self) @property @@ -142,6 +146,7 @@ def _prepare_manage(self) -> None: if self_contact.affiliation.is_owner: self._client.get_module('MUC').request_config( self._contact.jid, callback=self._on_manage_form_received) + self._ui.destroy_muc_button.set_sensitive(True) def _on_manage_form_received(self, task: Task) -> None: try: @@ -242,3 +247,37 @@ def update_avatar(self): AvatarSize.GROUP_INFO, self.get_scale_factor()) self._ui.avatar_button_image.set_from_surface(surface) + + def _on_destroy_clicked(self, _button: Gtk.Button) -> None: + self._ui.stack.set_visible_child_name('destroy') + self._ui.destroy_reason_entry.grab_focus() + self._ui.destroy_button.grab_default() + + def _on_destroy_alternate_changed(self, entry: Gtk.Entry) -> None: + jid = entry.get_text() + if jid: + try: + jid = validate_jid(jid) + except Exception: + icon = 'dialog-warning-symbolic' + text = _('Invalid XMPP Address') + self._ui.destroy_alternate_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + self._ui.destroy_alternate_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, text) + self._ui.destroy_button.set_sensitive(False) + return + self._ui.destroy_alternate_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + self._ui.destroy_button.set_sensitive(True) + + def _on_destroy_confirmed(self, _button: Gtk.Button) -> None: + reason = self._ui.destroy_reason_entry.get_text() + alternate_jid = self._ui.destroy_alternate_entry.get_text() + self._client.get_module('MUC').destroy( + self._contact.jid, reason, alternate_jid) + window = self.get_toplevel() + window.destroy() + + def _on_destroy_cancelled(self, _button: Gtk.Button) -> None: + self._ui.stack.set_visible_child_name('manage') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9cfd624146a7c95fd34ccf4bb202f8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9cfd624146a7c95fd34ccf4bb202f8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update DOAP
by Daniel Brötzmann (＠wurstsalat) 14 Feb '22

14 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2b2a3580 by Daniel Brötzmann at 2022-02-14T08:33:13+00:00 Update DOAP - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -678,5 +678,12 @@ <xmpp:version>0.2</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0454.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> </Project> </rdf:RDF> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b2a358055ad3d7cf38ea2dd4a3462a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b2a358055ad3d7cf38ea2dd4a3462a4… 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