Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 2 commits: ContactInfo: Adapt to contacts who are not in roster
by Daniel Brötzmann 20 Mar '21

20 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b66d71f8 by wurstsalat at 2021-03-20T13:18:15+01:00 ContactInfo: Adapt to contacts who are not in roster - - - - - bb01346f by wurstsalat at 2021-03-20T13:27:47+01:00 NotificationManager: Show unsubscribed event - - - - - 8 changed files: - gajim/common/modules/contacts.py - gajim/data/gui/account_page.ui - gajim/groupchat_control.py - gajim/gtk/account_page.py - gajim/gtk/contact_info.py - gajim/gtk/subscription_manager.py → gajim/gtk/notification_manager.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -390,6 +390,10 @@ def __init__(self, logger, jid, account): def is_pm_contact(self): return True + @property + def is_in_roster(self): + return False + @property def presence(self): return self._presence ===================================== gajim/data/gui/account_page.ui ===================================== @@ -235,7 +235,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Contact Requests</property> + <property name="label" translatable="yes">Notifications</property> <style> <class name="bold16"/> </style> ===================================== gajim/groupchat_control.py ===================================== @@ -606,8 +606,7 @@ def _on_upload_avatar_result(self, task): def _on_contact_information(self, _action, param): nick = param.get_string() contact = self.contact.get_resource(nick) - open_window('ContactInfo', account=self.account, contact=contact, - anonymous=self.is_anonymous) + open_window('ContactInfo', account=self.account, contact=contact) def _on_kick(self, _action, param): nick = param.get_string() ===================================== gajim/gtk/account_page.py ===================================== @@ -23,7 +23,7 @@ from .roster import Roster from .status_selector import StatusSelector -from .subscription_manager import SubscriptionManager +from .notification_manager import NotificationManager from .util import get_builder from .util import open_window @@ -49,8 +49,8 @@ def __init__(self, account): self._status_selector.set_halign(Gtk.Align.CENTER) self._ui.account_action_box.add(self._status_selector) - self._subscription_manager = SubscriptionManager(account) - self._ui.account_box.add(self._subscription_manager) + self._notification_manager = NotificationManager(account) + self._ui.account_box.add(self._notification_manager) self._roster = Roster(account) self._ui.roster_box.add(self._roster) @@ -66,9 +66,12 @@ def __init__(self, account): self._ui.connect_signals(self) self.show_all() + # pylint: disable=line-too-long self.register_events([ - ('subscribe-presence-received', ged.GUI1, self._on_subscribe_received), + ('subscribe-presence-received', ged.GUI1, self._subscribe_received), + ('unsubscribed-presence-received', ged.GUI1, self._unsubscribed_received), ]) + # pylint: enable=line-too-long self.update() @@ -105,9 +108,12 @@ def update(self): self._status_selector.update() - def _on_subscribe_received(self, event): - self._subscription_manager.add_request( + def _subscribe_received(self, event): + self._notification_manager.add_subscription_request( event.jid, event.status, user_nick=event.user_nick) + def _unsubscribed_received(self, event): + self._notification_manager.add_unsubscribed(event.jid) + def process_event(self, event): self._roster.process_event(event) ===================================== gajim/gtk/contact_info.py ===================================== @@ -50,7 +50,7 @@ class Column(IntEnum): class ContactInfo(Gtk.ApplicationWindow, EventHelper): - def __init__(self, account, contact, page=None, anonymous=False): + def __init__(self, account, contact, page=None): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_application(app.app) @@ -65,7 +65,6 @@ def __init__(self, account, contact, page=None, anonymous=False): # Set account and jid for window management self.account = account self.contact = contact - self._anonymous = anonymous self._client = app.get_client(account) self._ui = get_builder('contact_info.ui') @@ -75,24 +74,23 @@ def __init__(self, account, contact, page=None, anonymous=False): self._ui.main_grid.attach(side_bar_switcher, 0, 0, 1, 1) self._ui.main_stack.connect('notify', self._on_stack_child_changed) - if contact.is_pm_contact: - side_bar_switcher.hide_row('settings') - side_bar_switcher.hide_row('groups') + self._ui.name_entry.set_text(contact.name) - if anonymous: - side_bar_switcher.hide_row('notes') - else: + if contact.is_in_roster: self._ui.edit_name_button.show() - self._ui.name_entry.set_text(contact.name) + self._fill_settings_page() + self._fill_groups_page() + else: + side_bar_switcher.hide_row('settings') + side_bar_switcher.hide_row('groups') + side_bar_switcher.hide_row('notes') + if not contact.is_pm_contact: + side_bar_switcher.hide_row('devices') if page is not None: # Jump to specific page if parameter is supplied side_bar_switcher.set_row(page) - if not contact.is_pm_contact: - self._fill_settings_page() - self._fill_groups_page() - self._tasks = [] # pylint: disable=line-too-long @@ -117,20 +115,22 @@ def __init__(self, account, contact, page=None, anonymous=False): jid=contact.jid, callback=self._on_vcard_received) - self._devices = {} - self._received_devices = set() - self._received_times = set() - self._devices_grid = DevicesGrid(self._ui.devices_grid) - self._query_devices() + self._update_timeout_id = None + if contact.is_in_roster: + self._devices = {} + self._received_devices = set() + self._received_times = set() + self._devices_grid = DevicesGrid(self._ui.devices_grid) + self._query_devices() - if not anonymous: + self._time = 0 + self._update_timeout_id = GLib.timeout_add(100, self._update_timer) + + if contact.is_in_roster: note = self._client.get_module('Annotations').get_note(contact.jid) if note is not None: self._ui.textview_annotation.get_buffer().set_text(note.data) - self._time = 0 - self._update_timeout_id = GLib.timeout_add(100, self._update_timer) - self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) @@ -163,7 +163,7 @@ def _on_destroy(self, _widget): task.cancel() self._tasks.clear() - if not self.contact.is_pm_contact: + if self.contact.is_in_roster: self._save_annotation() if self._update_timeout_id is not None: ===================================== gajim/gtk/subscription_manager.py → gajim/gtk/notification_manager.py ===================================== @@ -20,23 +20,21 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.gui_menu_builder import get_subscription_manager_menu +from gajim.gui_menu_builder import get_subscription_menu from .add_contact import AddNewContactWindow -class SubscriptionManager(Gtk.ScrolledWindow): +class NotificationManager(Gtk.ScrolledWindow): def __init__(self, account): Gtk.ScrolledWindow.__init__(self) self._account = account self._client = app.get_client(account) - self.set_hexpand(True) self.set_size_request(400, 200) self._listbox = Gtk.ListBox() self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self._listbox.get_style_context().add_class('subscription-listbox') self._set_placeholder() self.add(self._listbox) @@ -88,7 +86,7 @@ def _remove_actions(self): app.window.remove_action(f'{action}-{self._account}') def _set_placeholder(self): - label = Gtk.Label(label=_('No pending requests.')) + label = Gtk.Label(label=_('No Notifications')) label.set_valign(Gtk.Align.START) label.get_style_context().add_class('dim-label') label.show() @@ -96,7 +94,7 @@ def _set_placeholder(self): def _on_subscription_accept(self, _action, param): jid = param.get_string() - row = self._get_request_row(jid) + row = self._get_notification_row(jid) self._client.get_module('Presence').subscribed(jid) contact = self._client.get_module('Contacts').get_contact(jid) if not contact.is_in_roster: @@ -108,7 +106,7 @@ def _on_subscription_block(self, _action, param): app.events.remove_events(self._account, jid) self._deny_request(jid) self._client.get_module('Blocking').block([jid]) - row = self._get_request_row(jid) + row = self._get_notification_row(jid) self._listbox.remove(row) def _on_subscription_report(self, _action, param): @@ -116,81 +114,148 @@ def _on_subscription_report(self, _action, param): app.events.remove_events(self._account, jid) self._deny_request(jid) self._client.get_module('Blocking').block([jid], report='spam') - row = self._get_request_row(jid) + row = self._get_notification_row(jid) self._listbox.remove(row) def _on_subscription_deny(self, _action, param): jid = param.get_string() self._deny_request(jid) - row = self._get_request_row(jid) + row = self._get_notification_row(jid) self._listbox.remove(row) def _deny_request(self, jid): self._client.get_module('Presence').unsubscribed(jid) - def _get_request_row(self, jid): + def _get_notification_row(self, jid): for child in self._listbox.get_children(): if child.jid == jid: return child return None - def add_request(self, jid, text, user_nick=None): - if self._get_request_row(jid) is None: - self._listbox.add(RequestRow(self._account, jid, text, user_nick)) + def add_subscription_request(self, jid, text, user_nick=None): + row = self._get_notification_row(jid) + if row is None: + self._listbox.add(SubscriptionRequestRow( + self._account, jid, text, user_nick)) + elif row.type == 'unsubscribed': + self._listbox.remove(row) + def add_unsubscribed(self, jid): + row = self._get_notification_row(jid) + if row is None: + self._listbox.add(UnsubscribedRow(self._account, jid)) + elif row.type == 'subscribe': + self._listbox.remove(row) -class RequestRow(Gtk.ListBoxRow): - def __init__(self, account, jid, text, user_nick): + +class NotificationRow(Gtk.ListBoxRow): + def __init__(self, account, jid): Gtk.ListBoxRow.__init__(self) self._account = account + self._client = app.get_client(account) self.jid = jid - self.user_nick = user_nick self.get_style_context().add_class('padding-6') - grid = Gtk.Grid(column_spacing=12) + self.grid = Gtk.Grid(column_spacing=12) + self.add(self.grid) + + @staticmethod + def _generate_label(): + label = Gtk.Label() + label.set_halign(Gtk.Align.START) + label.set_xalign(0) + label.set_ellipsize(Pango.EllipsizeMode.END) + label.set_max_width_chars(30) + return label + + +class SubscriptionRequestRow(NotificationRow): + def __init__(self, account, jid, text, user_nick): + NotificationRow.__init__(self, account, jid) + self.type = 'subscribe' + image = Gtk.Image.new_from_icon_name( 'avatar-default-symbolic', Gtk.IconSize.DND) image.set_valign(Gtk.Align.CENTER) - grid.attach(image, 1, 1, 1, 2) + self.grid.attach(image, 1, 1, 1, 2) if user_nick is not None: escaped_nick = GLib.markup_escape_text(user_nick) nick_markup = f'<b>{escaped_nick}</b> ({jid})' else: nick_markup = f'<b>{jid}</b>' - nick_label = Gtk.Label() - nick_label.set_halign(Gtk.Align.START) - nick_label.set_ellipsize(Pango.EllipsizeMode.END) - nick_label.set_max_width_chars(30) + + nick_label = self._generate_label() nick_label.set_tooltip_markup(nick_markup) nick_label.set_markup(nick_markup) - grid.attach(nick_label, 2, 1, 1, 1) + self.grid.attach(nick_label, 2, 1, 1, 1) message_text = GLib.markup_escape_text(text) - text_label = Gtk.Label(label=message_text) - text_label.set_halign(Gtk.Align.START) - text_label.set_ellipsize(Pango.EllipsizeMode.END) - text_label.set_max_width_chars(30) + text_label = self._generate_label() + text_label.set_text(message_text) text_label.set_tooltip_text(message_text) text_label.get_style_context().add_class('dim-label') - grid.attach(text_label, 2, 2, 1, 1) + self.grid.attach(text_label, 2, 2, 1, 1) accept_button = Gtk.Button.new_with_label(label=_('Accept')) accept_button.set_valign(Gtk.Align.CENTER) accept_button.set_action_name( f'win.subscription-accept-{self._account}') accept_button.set_action_target_value(GLib.Variant('s', str(self.jid))) - grid.attach(accept_button, 3, 1, 1, 2) + self.grid.attach(accept_button, 3, 1, 1, 2) more_image = Gtk.Image.new_from_icon_name( 'view-more-symbolic', Gtk.IconSize.MENU) more_button = Gtk.MenuButton() more_button.set_valign(Gtk.Align.CENTER) more_button.add(more_image) - subscription_menu = get_subscription_manager_menu( - self._account, self.jid) + subscription_menu = get_subscription_menu(self._account, self.jid) more_button.set_menu_model(subscription_menu) - grid.attach(more_button, 4, 1, 1, 2) + self.grid.attach(more_button, 4, 1, 1, 2) - self.add(grid) self.show_all() + + +class UnsubscribedRow(NotificationRow): + def __init__(self, account, jid): + NotificationRow.__init__(self, account, jid) + self.type = 'unsubscribed' + + image = Gtk.Image.new_from_icon_name( + 'avatar-default-symbolic', Gtk.IconSize.DND) + image.set_valign(Gtk.Align.CENTER) + self.grid.attach(image, 1, 1, 1, 2) + + contact = self._client.get_module('Contacts').get_contact(jid) + nick_markup = f'<b>{contact.name}</b>' + nick_label = self._generate_label() + nick_label.set_tooltip_markup(nick_markup) + nick_label.set_markup(nick_markup) + self.grid.attach(nick_label, 2, 1, 1, 1) + + message_text = _('Stopped sharing their status') + text_label = self._generate_label() + text_label.set_text(message_text) + text_label.set_tooltip_text(message_text) + text_label.get_style_context().add_class('dim-label') + self.grid.attach(text_label, 2, 2, 1, 1) + + remove_button = Gtk.Button.new_with_label(label=_('Remove')) + remove_button.set_valign(Gtk.Align.CENTER) + remove_button.set_tooltip_text('Remove from contact list') + remove_button.set_action_name( + f'win.remove-contact-{self._account}') + remove_button.set_action_target_value(GLib.Variant('s', str(self.jid))) + self.grid.attach(remove_button, 3, 1, 1, 2) + + dismiss_button = Gtk.Button.new_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.BUTTON) + dismiss_button.set_valign(Gtk.Align.CENTER) + dismiss_button.set_tooltip_text(_('Remove Notification')) + dismiss_button.connect('clicked', self._on_dismiss) + self.grid.attach(dismiss_button, 4, 1, 1, 2) + + self.show_all() + + def _on_dismiss(self, _button): + self.get_parent().remove(self) ===================================== gajim/gui_interface.py ===================================== @@ -301,26 +301,6 @@ def handle_event_msgnotsent(obj): obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, msg_type='error') - def show_unsubscribed_dialog(self, account, contact): - def _remove(): - self.roster.on_req_usub(None, [(contact, account)]) - - name = contact.get_shown_name() - jid = contact.jid - ConfirmationDialog( - _('Subscription Removed'), - _('%(name)s (%(jid)s) has removed subscription from you') % { - 'name': name, 'jid': jid}, - _('You will always see this contact as offline.\n' - 'Do you want to remove them from your contact list?'), - [DialogButton.make('Cancel', - text=_('_No')), - DialogButton.make('Remove', - callback=_remove)]).show() - - # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does - # not show deny - def handle_event_gc_decline(self, event): gc_control = self.msg_win_mgr.get_gc_control(str(event.muc), event.account) @@ -1191,14 +1171,14 @@ def handle_event(self, account, fjid, type_): return # TODO: Show account page app.events.remove_events(account, jid, event) - self.roster.draw_contact(jid, account) + # self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': event = app.events.get_first_event(account, jid, type_) if event is None: return - self.show_unsubscribed_dialog(account, event.contact) + # TODO: Show account page app.events.remove_events(account, jid, event) - self.roster.draw_contact(jid, account) + # self.roster.draw_contact(jid, account) if w: w.set_active_tab(ctrl) w.window.present() ===================================== gajim/gui_menu_builder.py ===================================== @@ -819,7 +819,7 @@ def get_roster_menu(account, jid): return menu -def get_subscription_manager_menu(account, jid): +def get_subscription_menu(account, jid): menu = Gio.Menu() action_name = 'win.add-chat' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/029c0d2d863538cae8ec9c4bc14ea7f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/029c0d2d863538cae8ec9c4bc14ea7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Remove obsolete methods
by Philipp Hörist 20 Mar '21

20 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 359b5f22 by lovetox at 2021-03-20T08:07:22+01:00 Remove obsolete methods - - - - - 029c0d2d by lovetox at 2021-03-20T09:24:33+01:00 Fix PresenceShow comparison - - - - - 2 changed files: - gajim/common/const.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -1132,6 +1132,8 @@ def is_offline(self): return self == PresenceShowExt.OFFLINE def __lt__(self, other): + if isinstance(other, PresenceShowExt): + return False if not isinstance(other, PresenceShow): return NotImplemented return True ===================================== gajim/gui_interface.py ===================================== @@ -301,53 +301,6 @@ def handle_event_msgnotsent(obj): obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, msg_type='error') - def handle_event_subscribe_presence(self, event): - # ('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is XEP-0172 - account = event.conn.name - event = events.SubscriptionRequestEvent(event.status, event.user_nick) - - self.add_event(account, str(event.jid), event) - - if helpers.allow_showing_notification(account): - event_type = _('Subscription request') - app.notification.popup( - event_type, str(event.jid), account, 'subscription_request', - 'gajim-subscription_request', event_type, str(event.jid)) - - def handle_event_subscribed_presence(self, event): - bare_jid = event.jid.bare - resource = event.jid.resource - if bare_jid in app.contacts.get_jid_list(event.account): - contact = app.contacts.get_first_contact_from_jid(event.account, - bare_jid) - contact.resource = resource - self.roster.remove_contact_from_groups(contact.jid, - event.account, - [_('Not in contact list'), - _('Observers')], - update=False) - else: - name = event.jid.localpart - name = name.split('%', 1)[0] - contact = app.contacts.create_contact(jid=bare_jid, - account=event.account, - name=name, - groups=[], - show='online', - status='online', - ask='to', - resource=resource) - app.contacts.add_contact(event.account, contact) - self.roster.add_contact(bare_jid, event.account) - - app.notification.popup( - None, - bare_jid, - event.account, - title=_('Authorization accepted'), - text=_('The contact "%(jid)s" has authorized you' - ' to see their status.') % {'jid': event.jid}) - def show_unsubscribed_dialog(self, account, contact): def _remove(): self.roster.on_req_usub(None, [(contact, account)]) @@ -368,27 +321,6 @@ def _remove(): # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does # not show deny - def handle_event_unsubscribed_presence(self, obj): - #('UNSUBSCRIBED', account, jid) - account = obj.conn.name - contact = app.contacts.get_first_contact_from_jid(account, obj.jid) - if not contact: - return - - if helpers.allow_popup_window(account) or not self.systray_enabled: - self.show_unsubscribed_dialog(account, contact) - return - - event = events.UnsubscribedEvent(contact) - self.add_event(account, obj.jid, event) - - if helpers.allow_showing_notification(account): - event_type = _('Unsubscribed') - app.notification.popup( - event_type, obj.jid, account, - 'unsubscribed', 'gajim-unsubscribed', - event_type, obj.jid) - def handle_event_gc_decline(self, event): gc_control = self.msg_win_mgr.get_gc_control(str(event.muc), event.account) @@ -1106,12 +1038,6 @@ def create_core_handlers_list(self): 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], - 'subscribe-presence-received': [ - self.handle_event_subscribe_presence], - 'subscribed-presence-received': [ - self.handle_event_subscribed_presence], - 'unsubscribed-presence-received': [ - self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], 'read-state-sync': [self.handle_event_read_state_sync], } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f495405db3c0ce066153d12c2752722… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f495405db3c0ce066153d12c2752722… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add SubscriptionManager
by Daniel Brötzmann 19 Mar '21

19 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f495405d by wurstsalat at 2021-03-20T00:25:51+01:00 Add SubscriptionManager - - - - - 10 changed files: - gajim/data/gui/account_page.ui - − gajim/data/gui/subscription_request_window.ui - gajim/gtk/account_page.py - gajim/gtk/const.py - gajim/gtk/main.py - + gajim/gtk/subscription_manager.py - − gajim/gtk/subscription_request.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -123,7 +123,7 @@ <property name="halign">center</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">18</property> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -231,6 +231,24 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Contact Requests</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> <style> <class name="account-page-box"/> </style> ===================================== gajim/data/gui/subscription_request_window.ui deleted ===================================== @@ -1,251 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkPopoverMenu" id="deny_popover"> - <property name="can_focus">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkModelButton" id="deny_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="text" translatable="yes">_Deny</property> - <signal name="clicked" handler="_on_deny_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkModelButton" id="block_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="text" translatable="yes">_Block User</property> - <signal name="clicked" handler="_on_block_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkModelButton" id="report_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="text" translatable="yes">_Report as Spam</property> - <signal name="clicked" handler="_on_report_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="submenu">main</property> - <property name="position">1</property> - </packing> - </child> - </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-available-symbolic</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-info-symbolic</property> - </object> - <object class="GtkBox" id="subscription_box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">Subscription Request</property> - <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="request_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label"><subscription request></property> - <property name="wrap">True</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subscription_text"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin_top">6</property> - <property name="label"><subscription text> -</property> - <property name="wrap">True</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="start_chat_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Start Chat</property> - <property name="valign">center</property> - <property name="image">image1</property> - <signal name="clicked" handler="_on_start_chat_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="contact_info_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Contact Information</property> - <property name="valign">center</property> - <property name="image">image2</property> - <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">baseline</property> - <property name="margin_top">12</property> - <property name="spacing">12</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkMenuButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="popover">deny_popover</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Deny…</property> - <property name="use_underline">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="authorize_button"> - <property name="label" translatable="yes">Ac_cept</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="tooltip_text" translatable="yes">Allows the contact to see your online status</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_authorize_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/gtk/account_page.py ===================================== @@ -16,11 +16,14 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.i18n import _ +from gajim.common.nec import EventHelper from .roster import Roster from .status_selector import StatusSelector +from .subscription_manager import SubscriptionManager from .util import get_builder from .util import open_window @@ -29,9 +32,11 @@ } -class AccountPage(Gtk.Box): +class AccountPage(Gtk.Box, EventHelper): def __init__(self, account): Gtk.Box.__init__(self) + EventHelper.__init__(self) + self._account = account self._jid = app.get_jid_from_account(account) client = app.get_client(account) @@ -44,6 +49,9 @@ def __init__(self, account): self._status_selector.set_halign(Gtk.Align.CENTER) self._ui.account_action_box.add(self._status_selector) + self._subscription_manager = SubscriptionManager(account) + self._ui.account_box.add(self._subscription_manager) + self._roster = Roster(account) self._ui.roster_box.add(self._roster) @@ -58,6 +66,10 @@ def __init__(self, account): self._ui.connect_signals(self) self.show_all() + self.register_events([ + ('subscribe-presence-received', ged.GUI1, self._on_subscribe_received), + ]) + self.update() def _on_edit_profile(self, _button): @@ -93,5 +105,9 @@ def update(self): self._status_selector.update() + def _on_subscribe_received(self, event): + self._subscription_manager.add_request( + event.jid, event.status, user_nick=event.user_nick) + def process_event(self, event): self._roster.process_event(event) ===================================== gajim/gtk/const.py ===================================== @@ -128,7 +128,6 @@ def __str__(self): 'Themes': 'gajim.gui.themes', 'AdvancedConfig': 'gajim.gui.advanced_config', 'CertificateDialog': 'gajim.gui.dialogs', - 'SubscriptionRequest': 'gajim.gui.subscription_request', 'RemoveAccount': 'gajim.gui.remove_account', 'ChangePassword': 'gajim.gui.change_password', 'PluginsWindow': 'gajim.plugins.gui', ===================================== gajim/gtk/main.py ===================================== @@ -273,6 +273,9 @@ def show_title(self, *args): def get_active_jid(self, *args): pass + def get_account_page(self, account): + return self._account_pages[account] + def show_account_page(self, account): self._account_side_bar.activate_account_page(account) self._ui.main_stack.set_visible_child_name(account) ===================================== gajim/gtk/subscription_manager.py ===================================== @@ -0,0 +1,196 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gio +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim.gui_menu_builder import get_subscription_manager_menu + +from .add_contact import AddNewContactWindow + + +class SubscriptionManager(Gtk.ScrolledWindow): + def __init__(self, account): + Gtk.ScrolledWindow.__init__(self) + self._account = account + self._client = app.get_client(account) + + self.set_hexpand(True) + self.set_size_request(400, 200) + + self._listbox = Gtk.ListBox() + self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self._listbox.get_style_context().add_class('subscription-listbox') + self._set_placeholder() + + self.add(self._listbox) + self.show_all() + + self._add_actions() + self.connect('destroy', self._on_destroy) + + def _on_destroy(self, *args): + self._remove_actions() + + def _add_actions(self): + actions = [ + ('subscription-accept', self._on_subscription_accept), + ('subscription-deny', self._on_subscription_deny), + ('subscription-block', self._on_subscription_block), + ('subscription-report', self._on_subscription_report), + ] + for action in actions: + action_name, func = action + act = Gio.SimpleAction.new( + f'{action_name}-{self._account}', GLib.VariantType.new('s')) + act.connect('activate', func) + app.window.add_action(act) + + def update_actions(self): + 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) + + def _remove_actions(self): + actions = [ + 'subscription-accept', + 'subscription-deny', + 'subscription-block', + 'subscription-report', + ] + for action in actions: + app.window.remove_action(f'{action}-{self._account}') + + def _set_placeholder(self): + label = Gtk.Label(label=_('No pending requests.')) + label.set_valign(Gtk.Align.START) + label.get_style_context().add_class('dim-label') + label.show() + self._listbox.set_placeholder(label) + + def _on_subscription_accept(self, _action, param): + jid = param.get_string() + row = self._get_request_row(jid) + self._client.get_module('Presence').subscribed(jid) + contact = self._client.get_module('Contacts').get_contact(jid) + if not contact.is_in_roster: + AddNewContactWindow(self._account, jid, row.user_nick) + self._listbox.remove(row) + + def _on_subscription_block(self, _action, param): + jid = param.get_string() + app.events.remove_events(self._account, jid) + self._deny_request(jid) + self._client.get_module('Blocking').block([jid]) + row = self._get_request_row(jid) + self._listbox.remove(row) + + def _on_subscription_report(self, _action, param): + jid = param.get_string() + app.events.remove_events(self._account, jid) + self._deny_request(jid) + self._client.get_module('Blocking').block([jid], report='spam') + row = self._get_request_row(jid) + self._listbox.remove(row) + + def _on_subscription_deny(self, _action, param): + jid = param.get_string() + self._deny_request(jid) + row = self._get_request_row(jid) + self._listbox.remove(row) + + def _deny_request(self, jid): + self._client.get_module('Presence').unsubscribed(jid) + + def _get_request_row(self, jid): + for child in self._listbox.get_children(): + if child.jid == jid: + return child + return None + + def add_request(self, jid, text, user_nick=None): + if self._get_request_row(jid) is None: + self._listbox.add(RequestRow(self._account, jid, text, user_nick)) + + +class RequestRow(Gtk.ListBoxRow): + def __init__(self, account, jid, text, user_nick): + Gtk.ListBoxRow.__init__(self) + self._account = account + self.jid = jid + self.user_nick = user_nick + self.get_style_context().add_class('padding-6') + + grid = Gtk.Grid(column_spacing=12) + image = Gtk.Image.new_from_icon_name( + 'avatar-default-symbolic', Gtk.IconSize.DND) + image.set_valign(Gtk.Align.CENTER) + grid.attach(image, 1, 1, 1, 2) + + if user_nick is not None: + escaped_nick = GLib.markup_escape_text(user_nick) + nick_markup = f'<b>{escaped_nick}</b> ({jid})' + else: + nick_markup = f'<b>{jid}</b>' + nick_label = Gtk.Label() + nick_label.set_halign(Gtk.Align.START) + nick_label.set_ellipsize(Pango.EllipsizeMode.END) + nick_label.set_max_width_chars(30) + nick_label.set_tooltip_markup(nick_markup) + nick_label.set_markup(nick_markup) + grid.attach(nick_label, 2, 1, 1, 1) + + message_text = GLib.markup_escape_text(text) + text_label = Gtk.Label(label=message_text) + text_label.set_halign(Gtk.Align.START) + text_label.set_ellipsize(Pango.EllipsizeMode.END) + text_label.set_max_width_chars(30) + text_label.set_tooltip_text(message_text) + text_label.get_style_context().add_class('dim-label') + grid.attach(text_label, 2, 2, 1, 1) + + accept_button = Gtk.Button.new_with_label(label=_('Accept')) + accept_button.set_valign(Gtk.Align.CENTER) + accept_button.set_action_name( + f'win.subscription-accept-{self._account}') + accept_button.set_action_target_value(GLib.Variant('s', str(self.jid))) + grid.attach(accept_button, 3, 1, 1, 2) + + more_image = Gtk.Image.new_from_icon_name( + 'view-more-symbolic', Gtk.IconSize.MENU) + more_button = Gtk.MenuButton() + more_button.set_valign(Gtk.Align.CENTER) + more_button.add(more_image) + subscription_menu = get_subscription_manager_menu( + self._account, self.jid) + more_button.set_menu_model(subscription_menu) + grid.attach(more_button, 4, 1, 1, 2) + + self.add(grid) + self.show_all() ===================================== gajim/gtk/subscription_request.py deleted ===================================== @@ -1,120 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from gi.repository import Gtk -from gi.repository import Gdk - -from gajim.common import app -from gajim.common.i18n import _ - -from .add_contact import AddNewContactWindow -from .util import get_builder -from .util import open_window - - -class SubscriptionRequest(Gtk.ApplicationWindow): - def __init__(self, account, jid, text, user_nick=None): - Gtk.ApplicationWindow.__init__(self) - self.set_name('SubscriptionRequest') - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Subscription Request')) - - self.jid = jid - self.account = account - self.user_nick = user_nick - - self._ui = get_builder('subscription_request_window.ui') - self.add(self._ui.subscription_box) - self._ui.authorize_button.grab_default() - - if len(app.connections) >= 2: - prompt_text = _( - 'Subscription request for account %(account)s from ' - '%(jid)s') % {'account': self.account, 'jid': self.jid} - else: - prompt_text = _('Subscription request from %s') % self.jid - - self._ui.request_label.set_text(prompt_text) - self._ui.subscription_text.set_text(text) - - con = app.connections[self.account] - if con.get_module('Blocking').supported: - self._ui.block_button.set_sensitive(True) - self._ui.report_button.set_sensitive(True) - - self.connect('key-press-event', self._on_key_press) - - self._ui.connect_signals(self) - self.show_all() - - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - def _on_authorize_clicked(self, _widget): - """ - Accept the request - """ - con = app.connections[self.account] - con.get_module('Presence').subscribed(self.jid) - self.destroy() - contact = app.contacts.get_contact(self.account, self.jid) - if not contact or _('Not in contact list') in contact.groups: - AddNewContactWindow(self.account, self.jid, self.user_nick) - - def _on_contact_info_clicked(self, _widget): - """ - Ask for vCard - """ - client = app.get_client(self.account) - contact = client.get_module('Contacts').get_contact(self.jid) - open_window('ContactInfo', account=self.account, contact=contact) - - def _on_start_chat_clicked(self, _widget): - """ - Open chat - """ - app.interface.new_chat_from_jid(self.account, self.jid) - - def _on_deny_clicked(self, _widget): - self._deny_request() - self._remove_contact() - - def _on_block_clicked(self, _widget): - app.events.remove_events(self.account, self.jid) - self._deny_request() - con = app.connections[self.account] - con.get_module('Blocking').block([self.jid]) - self._remove_contact() - - def _on_report_clicked(self, _widget): - app.events.remove_events(self.account, self.jid) - self._deny_request() - con = app.connections[self.account] - con.get_module('Blocking').block([self.jid], report='spam') - self._remove_contact() - - def _deny_request(self): - con = app.connections[self.account] - con.get_module('Presence').unsubscribed(self.jid) - - def _remove_contact(self): - contact = app.contacts.get_contact(self.account, self.jid) - if contact and _('Not in contact list') in contact.get_shown_groups(): - app.interface.roster.remove_contact( - self.jid, self.account, force=True, backend=True) - self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -301,25 +301,18 @@ def handle_event_msgnotsent(obj): obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, msg_type='error') - def handle_event_subscribe_presence(self, obj): - #('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is JEP-0172 - account = obj.conn.name - if helpers.allow_popup_window(account) or not self.systray_enabled: - open_window('SubscriptionRequest', - account=account, - jid=obj.jid, - text=obj.status, - user_nick=obj.user_nick) - return + def handle_event_subscribe_presence(self, event): + # ('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is XEP-0172 + account = event.conn.name + event = events.SubscriptionRequestEvent(event.status, event.user_nick) - event = events.SubscriptionRequestEvent(obj.status, obj.user_nick) - self.add_event(account, obj.jid, event) + self.add_event(account, str(event.jid), event) if helpers.allow_showing_notification(account): event_type = _('Subscription request') app.notification.popup( - event_type, obj.jid, account, 'subscription_request', - 'gajim-subscription_request', event_type, obj.jid) + event_type, str(event.jid), account, 'subscription_request', + 'gajim-subscription_request', event_type, str(event.jid)) def handle_event_subscribed_presence(self, event): bare_jid = event.jid.bare @@ -1270,11 +1263,7 @@ def handle_event(self, account, fjid, type_): event = app.events.get_first_event(account, jid, type_) if event is None: return - open_window('SubscriptionRequest', - account=account, - jid=jid, - text=event.text, - user_nick=event.nick) + # TODO: Show account page app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': ===================================== gajim/gui_menu_builder.py ===================================== @@ -819,6 +819,38 @@ def get_roster_menu(account, jid): return menu +def get_subscription_manager_menu(account, jid): + menu = Gio.Menu() + + action_name = 'win.add-chat' + add_chat = Gio.MenuItem.new(_('Start Chat'), action_name) + dict_ = { + 'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', str(jid)), + 'type_': GLib.Variant('s', 'contact'), + 'select': GLib.Variant.new_boolean(True), + } + variant_dict = GLib.Variant('a{sv}', dict_) + add_chat.set_action_and_target_value(action_name, variant_dict) + menu.append_item(add_chat) + + menu_items = [ + ('contact-info', _('Information')), + ('subscription-block', _('Block')), + ('subscription-report', _('Report')), + ('subscription-deny', _('Deny')), + ] + for item in menu_items: + action, label = item + action = f'win.{action}-{account}' + menuitem = Gio.MenuItem.new(label, action) + variant = GLib.Variant('s', str(jid)) + menuitem.set_action_and_target_value(action, variant) + menu.append_item(menuitem) + + return menu + + def get_chat_list_row_menu(workspace_id, account, jid, pinned): client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) ===================================== gajim/roster_window.py ===================================== @@ -1923,11 +1923,11 @@ def open_event(self, account, jid, event): return True if event.type_ == 'subscription_request': - open_window('SubscriptionRequest', - account=account, - jid=jid, - text=event.text, - user_nick=event.nick) + # open_window('SubscriptionRequest', + # account=account, + # jid=jid, + # text=event.text, + # user_nick=event.nick) app.events.remove_events(account, jid, event) return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f495405db3c0ce066153d12c27527220… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f495405db3c0ce066153d12c27527220… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] show chat stack page on select=True
by Philipp Hörist 19 Mar '21

19 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ee41031f by lovetox at 2021-03-19T23:40:51+01:00 show chat stack page on select=True - - - - - 2 changed files: - gajim/gtk/main.py - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -132,7 +132,7 @@ def _add_actions(self): ('edit-workspace', None, self._edit_workspace), ('remove-workspace', None, self._remove_workspace), ('activate-workspace', 's', self._activate_workspace), - ('add-chat', 'as', self._add_chat), + ('add-chat', 'a{sv}', self._add_chat), ('add-group-chat', 'as', self._add_group_chat), ('remove-chat', 'as', self._remove_chat), ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), @@ -360,8 +360,7 @@ def add_group_chat(self, account, jid, select=False): select=select) def _add_chat(self, _action, param): - account, jid, type_ = param.unpack() - self.add_chat(account, jid, type_) + self.add_chat(**param.unpack()) def add_chat(self, account, jid, type_, select=False): workspace_id = self._workspace_side_bar.get_active_workspace() @@ -389,6 +388,7 @@ def add_chat_for_workspace(self, if self.chat_exists(account, jid): if select: self._chat_list_stack.select_chat(account, jid) + self.show_chats() return if type_ == 'groupchat': @@ -407,6 +407,7 @@ def add_chat_for_workspace(self, if self._startup_finished: if select: self._chat_list_stack.select_chat(account, jid) + self.show_chats() self._chat_list_stack.store_open_chats(workspace_id) def _toggle_chat_pinned(self, _action, param): ===================================== gajim/gtk/roster.py ===================================== @@ -276,7 +276,6 @@ def _on_roster_row_activated(self, _treeview, path, _column): jid = self._store[iter_][Column.JID_OR_GROUP] app.window.add_chat(self._account, jid, 'contact', select=True) - app.window.show_chats() def _on_roster_button_press_event(self, treeview, event): if event.button not in (2, 3): @@ -300,7 +299,6 @@ def _on_roster_button_press_event(self, treeview, event): if event.button == 2: # middle click app.window.add_chat(self._account, jid, 'contact', select=True) - app.window.show_chats() @staticmethod def _on_focus_out(treeview, _param): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ee41031f2c1c708995de8b187e48e909… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ee41031f2c1c708995de8b187e48e909… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: App: Force GC before checking if object is finalized
by Philipp Hörist 19 Mar '21

19 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c6f52469 by lovetox at 2021-03-19T21:29:56+01:00 App: Force GC before checking if object is finalized - - - - - ad6f1ebc by lovetox at 2021-03-19T21:33:50+01:00 Refactor EntityTime - - - - - 31076ffa by lovetox at 2021-03-19T21:37:19+01:00 Refactor ContactInfo - - - - - 5 changed files: - gajim/common/app.py - gajim/common/client.py - gajim/common/modules/entity_time.py - gajim/data/gui/contact_info.ui - gajim/gtk/contact_info.py Changes: ===================================== gajim/common/app.py ===================================== @@ -702,11 +702,11 @@ def is_finalizer_ref(ref): return False def check_finalized(): + gc.collect() tup = finalizer.peek() if tup is None: return - gc.collect() logger.warning('%s not finalized', name) logger.warning('References:') for ref in gc.get_referrers(tup[0]): ===================================== gajim/common/client.py ===================================== @@ -439,6 +439,7 @@ def _finish_connect(self): self.get_module('Bookmarks').request_bookmarks() self.get_module('SoftwareVersion').set_enabled(True) + self.get_module('EntityTime').set_enabled(True) self.get_module('LastActivity').set_enabled(True) self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() ===================================== gajim/common/modules/entity_time.py ===================================== @@ -14,102 +14,31 @@ # XEP-0202: Entity Time -import time - -import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler -from nbxmpp.modules.date_and_time import parse_datetime -from nbxmpp.modules.date_and_time import create_tzinfo - from gajim.common import app -from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule class EntityTime(BaseModule): + + _nbxmpp_extends = 'EntityTime' + _nbxmpp_methods = [ + 'request_entity_time', + 'enable', + 'disable', + ] + def __init__(self, con): BaseModule.__init__(self, con) - self.handlers = [ - StanzaHandler(name='iq', - callback=self._answer_request, - typ='get', - ns=Namespace.TIME_REVISED), - ] + self.handlers = [] - def request_entity_time(self, jid, resource): - if not app.account_is_available(self._account): + def set_enabled(self, enabled): + if not enabled: + self._nbxmpp('EntityTime').disable() return - if resource: - jid += '/' + resource - iq = nbxmpp.Iq(to=jid, typ='get') - iq.addChild('time', namespace=Namespace.TIME_REVISED) - - self._log.info('Requested: %s', jid) - - self._con.connection.SendAndCallForResponse(iq, self._result_received) - - def _result_received(self, _nbxmpp_client, stanza): - time_info = None - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - else: - time_info = self._extract_info(stanza) - - self._log.info('Received: %s %s', stanza.getFrom(), time_info) - - app.nec.push_incoming_event(NetworkEvent('time-result-received', - conn=self._con, - jid=stanza.getFrom(), - time_info=time_info)) - - def _extract_info(self, stanza): - time_ = stanza.getTag('time') - if not time_: - self._log.warning('No time node: %s', stanza) - return None - - tzo = time_.getTag('tzo').getData() - if not tzo: - self._log.warning('Wrong tzo node: %s', stanza) - return None - - remote_tz = create_tzinfo(tz_string=tzo) - if remote_tz is None: - self._log.warning('Wrong tzo node: %s', stanza) - return None - - utc_time = time_.getTag('utc').getData() - date_time = parse_datetime(utc_time, check_utc=True) - if date_time is None: - self._log.warning('Wrong timezone definition: %s %s', - utc_time, stanza.getFrom()) - return None - - date_time = date_time.astimezone(remote_tz) - return date_time.strftime('%c %Z') - - def _answer_request(self, _con, stanza, _properties): - self._log.info('%s asked for the time', stanza.getFrom()) if app.settings.get_account_setting(self._account, 'send_time_info'): - iq = stanza.buildReply('result') - time_ = iq.setTag('time', namespace=Namespace.TIME_REVISED) - formated_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) - time_.setTagData('utc', formated_time) - isdst = time.localtime().tm_isdst - zone = -(time.timezone, time.altzone)[isdst] / 60.0 - tzo = (zone / 60, abs(zone % 60)) - time_.setTagData('tzo', '%+03d:%02d' % (tzo)) - self._log.info('Answer: %s %s', formated_time, '%+03d:%02d' % (tzo)) - else: - iq = stanza.buildReply('error') - err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) - iq.addChild(node=err) - self._log.info('Send service-unavailable') - self._con.connection.send(iq) - raise nbxmpp.NodeProcessed + self._nbxmpp('EntityTime').enable() def get_instance(*args, **kwargs): ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -490,16 +490,13 @@ <property name="model">groups_model</property> <property name="headers-visible">False</property> <child internal-child="selection"> - <object class="GtkTreeSelection"> - <signal name="changed" handler="_on_group_selection_changed" swapped="no"/> - </object> + <object class="GtkTreeSelection" id="tree_selection"/> </child> <child> <object class="GtkTreeViewColumn"> <child> - <object class="GtkCellRendererToggle"> + <object class="GtkCellRendererToggle" id="toggle_renderer"> <property name="xpad">12</property> - <signal name="toggled" handler="_on_group_toggled" swapped="no"/> </object> <attributes> <attribute name="active">0</attribute> @@ -512,10 +509,9 @@ <property name="title" translatable="yes">column</property> <property name="sort-column-id">1</property> <child> - <object class="GtkCellRendererText"> + <object class="GtkCellRendererText" id="text_renderer"> <property name="height">42</property> <property name="editable">True</property> - <signal name="edited" handler="_on_group_name_edited" swapped="no"/> </object> <attributes> <attribute name="text">1</attribute> ===================================== gajim/gtk/contact_info.py ===================================== @@ -38,6 +38,7 @@ from .dialogs import DialogButton from .sidebar_switcher import SideBarSwitcher from .util import get_builder +from .util import connect_destroy from .vcard_grid import VCardGrid log = logging.getLogger('gajim.gui.contact_info') @@ -92,14 +93,17 @@ def __init__(self, account, contact, page=None, anonymous=False): self._fill_settings_page() self._fill_groups_page() + self._tasks = [] + # pylint: disable=line-too-long self.register_events([ - ('time-result-received', ged.GUI1, self._set_entity_time), ('subscribed-presence-received', ged.GUI1, self._on_subscribed_presence_received), ('unsubscribed-presence-received', ged.GUI1, self._on_unsubscribed_presence_received), ]) # pylint: enable=line-too-long + self._load_avatar() + self._ui.contact_name_label.set_text(contact.name) if contact.is_pm_contact: self._ui.role_label.set_text(get_uf_role(contact.role)) @@ -131,6 +135,16 @@ def __init__(self, account, contact, page=None, anonymous=False): self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) + connect_destroy(self._ui.tree_selection, + 'changed', + self._on_group_selection_changed) + connect_destroy(self._ui.toggle_renderer, + 'toggled', + self._on_group_toggled) + connect_destroy(self._ui.text_renderer, + 'edited', + self._on_group_name_edited) + self.add(self._ui.main_grid) self.show_all() @@ -145,6 +159,10 @@ def _on_stack_child_changed(self, *args): self._ui.header_revealer.set_reveal_child(True) def _on_destroy(self, _widget): + for task in self._tasks: + task.cancel() + self._tasks.clear() + if not self.contact.is_pm_contact: self._save_annotation() @@ -152,7 +170,7 @@ def _on_destroy(self, _widget): GLib.source_remove(self._update_timeout_id) self.unregister_events() - app.cancel_tasks(self) + app.check_finalize(self) def _save_annotation(self): buffer_ = self._ui.textview_annotation.get_buffer() @@ -183,7 +201,6 @@ def _on_vcard_received(self, task): vcard = VCard() self._vcard_grid.set_vcard(vcard) - self._load_avatar() def _load_avatar(self): scale = self.get_scale_factor() @@ -210,16 +227,21 @@ def _query_device(self, contact): } self._rebuild_devices_grid() - self._client.get_module('SoftwareVersion').request_software_version( + task = self._client.get_module('SoftwareVersion').request_software_version( contact.jid, callback=self._set_os_info, user_data=contact) - self._client.get_module('EntityTime').request_entity_time( - str(contact.jid.bare), contact.jid.resource) + self._tasks.append(task) + + task = self._client.get_module('EntityTime').request_entity_time( + contact.jid, callback=self._set_entity_time, user_data=contact) + self._tasks.append(task) def _set_os_info(self, task): + self._tasks.remove(task) + try: result = task.finish() - except StanzaError as err: - log.info('Could not retrieve software version: %s', err) + except Exception as err: + log.warning('Could not retrieve software version: %s', err) return contact = task.get_user_data() @@ -230,19 +252,19 @@ def _set_os_info(self, task): self._received_devices.add(contact.jid.resource) self._rebuild_devices_grid() - def _set_entity_time(self, event): - if event.conn.name != self.account: + def _set_entity_time(self, task): + self._tasks.remove(task) + + try: + entity_time = task.finish() + except Exception as err: + log.warning('Could not retrieve entity time: %s', err) return - if self.contact.is_pm_contact: - if event.jid != self.contact.jid: - return - else: - if event.jid.bare != self.contact.jid: - return + contact = task.get_user_data() - self._devices[event.jid.resource]['time'] = event.time_info - self._received_times.add(event.jid.resource) + self._devices[contact.jid.resource]['time'] = entity_time + self._received_times.add(contact.jid.resource) self._rebuild_devices_grid() def _rebuild_devices_grid(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c10f473ff146c5027476795376a51a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c10f473ff146c5027476795376a51a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add EntityTime(XEP-0202) module
by Philipp Hörist 19 Mar '21

19 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b655a690 by lovetox at 2021-03-19T17:57:11+01:00 Add EntityTime(XEP-0202) module - - - - - 4 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/date_and_time.py - + nbxmpp/modules/entity_time.py - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -83,6 +83,7 @@ from nbxmpp.modules.ping import Ping from nbxmpp.modules.delimiter import Delimiter from nbxmpp.modules.roster import Roster from nbxmpp.modules.last_activity import LastActivity +from nbxmpp.modules.entity_time import EntityTime from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -195,6 +196,7 @@ class StanzaDispatcher(Observable): self._modules['Delimiter'] = Delimiter(self._client) self._modules['Roster'] = Roster(self._client) self._modules['LastActivity'] = LastActivity(self._client) + self._modules['EntityTime'] = EntityTime(self._client) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/date_and_time.py ===================================== @@ -195,3 +195,12 @@ def parse_datetime(timestring, check_utc=False, # convert=None return date_time return None + + +def get_local_time(): + formated_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + isdst = time.localtime().tm_isdst + zone = -(time.timezone, time.altzone)[isdst] / 60.0 + zone = (zone / 60, abs(zone % 60)) + tzo = '%+03d:%02d' % zone + return formated_time, tzo ===================================== nbxmpp/modules/entity_time.py ===================================== @@ -0,0 +1,106 @@ +# Copyright (C) 2021 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +from nbxmpp.protocol import Iq +from nbxmpp.protocol import NodeProcessed +from nbxmpp.namespaces import Namespace +from nbxmpp.task import iq_request_task +from nbxmpp.structs import StanzaHandler +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import StanzaError +from nbxmpp.modules.base import BaseModule + +from nbxmpp.modules.date_and_time import parse_datetime +from nbxmpp.modules.date_and_time import create_tzinfo +from nbxmpp.modules.date_and_time import get_local_time + + +class EntityTime(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [ + StanzaHandler(name='iq', + callback=self._answer_request, + priority=30, + typ='get', + ns=Namespace.TIME), + ] + + self._enabled = False + + def disable(self): + self._enabled = False + + def enable(self): + self._enabled = True + + @iq_request_task + def request_entity_time(self, jid): + _task = yield + + response = yield _make_request(jid) + if response.isError(): + raise StanzaError(response) + + yield _parse_response(response) + + def _answer_request(self, _con, stanza, _properties): + self._log.info('Request received from %s', stanza.getFrom()) + if not self._enabled: + return + + time, tzo = get_local_time() + iq = stanza.buildSimpleReply('result') + time_node = iq.addChild('time', namespace=Namespace.TIME) + time_node.setTagData('utc', time) + time_node.setTagData('tzo', tzo) + self._log.info('Send time: %s %s', time, tzo) + self._client.send_stanza(iq) + raise NodeProcessed + + +def _make_request(jid): + iq = Iq('get', to=jid) + iq.addChild('time', namespace=Namespace.TIME) + return iq + + +def _parse_response(response): + time_ = response.getTag('time') + if not time_: + raise MalformedStanzaError('time node missing', response) + + tzo = time_.getTagData('tzo') + if not tzo: + raise MalformedStanzaError('tzo node or data missing', response) + + remote_tz = create_tzinfo(tz_string=tzo) + if remote_tz is None: + raise MalformedStanzaError('invalid tzo data', response) + + utc_time = time_.getTagData('utc') + if not utc_time: + raise MalformedStanzaError('utc node or data missing', response) + + date_time = parse_datetime(utc_time, check_utc=True) + if date_time is None: + raise MalformedStanzaError('invalid timezone definition', response) + + date_time = date_time.astimezone(remote_tz) + return date_time.strftime('%c %Z') ===================================== nbxmpp/namespaces.py ===================================== @@ -155,6 +155,7 @@ class _Namespaces: STREAM_MGMT: str = 'urn:xmpp:sm:3' STYLING: str = 'urn:xmpp:styling:0' TIME_REVISED: str = 'urn:xmpp:time' + TIME: str = 'urn:xmpp:time' TLS: str = 'urn:ietf:params:xml:ns:xmpp-tls' TUNE: str = 'http://jabber.org/protocol/tune' URL_DATA: str = 'http://jabber.org/protocol/url-data' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/b655a69053ab962d014bf524… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/b655a69053ab962d014bf524… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Get correct path
by Philipp Hörist 19 Mar '21

19 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c10f473f by lovetox at 2021-03-19T14:10:29+01:00 Get correct path - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -268,6 +268,7 @@ def _on_remove_contact(self, _action, param): app.window.remove_contact(self._account, param.get_string()) def _on_roster_row_activated(self, _treeview, path, _column): + path = self._modelfilter.convert_path_to_child_path(path) iter_ = self._store.get_iter(path) if self._store.iter_parent(iter_) is None: # This is a group row @@ -286,6 +287,7 @@ def _on_roster_button_press_event(self, treeview, event): return path, _, _, _ = pos + path = self._modelfilter.convert_path_to_child_path(path) iter_ = self._store.get_iter(path) if self._store.iter_parent(iter_) is None: # Group row View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c10f473ff146c5027476795376a51a7f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c10f473ff146c5027476795376a51a7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Blocking: Convert JID to string
by Philipp Hörist 18 Mar '21

18 Mar '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: acc254fe by lovetox at 2021-03-18T21:31:10+01:00 Blocking: Convert JID to string - - - - - 1 changed file: - gajim/gtk/blocking.py Changes: ===================================== gajim/gtk/blocking.py ===================================== @@ -76,7 +76,7 @@ def _on_blocking_list_received(self, task): self._prev_blocked_jids = set(blocking_list) self._ui.blocking_store.clear() for item in blocking_list: - self._ui.blocking_store.append((item,)) + self._ui.blocking_store.append((str(item),)) self._set_grid_state(True) self._disable_spinner() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/acc254fe367cee2f15f1bcea55e9fce9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/acc254fe367cee2f15f1bcea55e9fce9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Simplify code
by Philipp Hörist 17 Mar '21

17 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: bc3e394a by lovetox at 2021-03-17T22:16:24+01:00 Simplify code - - - - - 1 changed file: - gajim/gtk/groupchat_invite.py Changes: ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -80,17 +80,16 @@ def _add_contacts(self): for account, _label in self._accounts: self.new_contact_rows[account] = None client = app.get_client(account) - for jid, _data in client.get_module('Roster').iter(): - contact = client.get_module('Contacts').get_contact(jid) + for contact in client.get_module('Roster').iter_contacts(): # Exclude group chats if contact.is_groupchat: continue # Exclude our own jids - if jid in our_jids: + if contact.jid in our_jids: continue - row = ContactRow(account, contact, jid, + row = ContactRow(account, contact, contact.jid, contact.name, show_account) self._ui.contacts_listbox.add(row) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc3e394a0921ab05faf7f909724945f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc3e394a0921ab05faf7f909724945f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupChatInvite: Adapt to new contacts API
by Daniel Brötzmann 16 Mar '21

16 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3bb5f165 by wurstsalat at 2021-03-16T23:21:05+01:00 GroupChatInvite: Adapt to new contacts API - - - - - 1 changed file: - gajim/gtk/groupchat_invite.py Changes: ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -79,26 +79,19 @@ def _add_contacts(self): our_jids = app.get_our_jids() for account, _label in self._accounts: self.new_contact_rows[account] = None - participant_jids = [] - for contact in app.contacts.get_gc_contact_list( - account, self._room_jid): - if contact.jid is not None: - participant_jids.append(app.get_jid_without_resource( - contact.jid)) - for jid in app.contacts.get_jid_list(account): - contact = app.contacts.get_contact_with_highest_priority( - account, jid) + client = app.get_client(account) + for jid, _data in client.get_module('Roster').iter(): + contact = client.get_module('Contacts').get_contact(jid) + # Exclude group chats if contact.is_groupchat: continue - # Exclude our own jid + # Exclude our own jids if jid in our_jids: continue - # Exclude group chat participants - if jid in participant_jids: - continue + row = ContactRow(account, contact, jid, - contact.get_shown_name(), show_account) + contact.name, show_account) self._ui.contacts_listbox.add(row) def _on_contacts_row_activated(self, listbox, row): @@ -287,13 +280,11 @@ def __init__(self, account, contact, jid, name, show_account): self.name = name self.new = jid == '' - show = contact.show if contact else 'offline' - grid = Gtk.Grid() grid.set_column_spacing(12) grid.set_size_request(260, -1) - image = self._get_avatar_image(account, jid, show) + image = self._get_avatar_image(contact) image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) grid.add(image) @@ -322,8 +313,8 @@ def __init__(self, account, contact, jid, name, show_account): name_box.add(account_badge) box.add(name_box) - self.jid_label = Gtk.Label(label=jid) - self.jid_label.set_tooltip_text(jid) + self.jid_label = Gtk.Label(label=str(jid)) + self.jid_label.set_tooltip_text(str(jid)) self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) self.jid_label.set_xalign(0) self.jid_label.set_width_chars(22) @@ -336,15 +327,14 @@ def __init__(self, account, contact, jid, name, show_account): self.add(grid) self.show_all() - def _get_avatar_image(self, account, jid, show): + def _get_avatar_image(self, contact): if self.new: icon_name = 'avatar-default' return Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DND) scale = self.get_scale_factor() - avatar = app.contacts.get_avatar( - account, jid, AvatarSize.ROSTER, scale, show) - return Gtk.Image.new_from_surface(avatar) + surface = contact.get_avatar(AvatarSize.ROSTER, scale) + return Gtk.Image.new_from_surface(surface) def update_jid(self, jid): self.jid = jid @@ -352,7 +342,7 @@ def update_jid(self, jid): def get_search_text(self): if self.contact is None: - return self.jid + return str(self.jid) if self.show_account: return '%s %s %s' % (self.name, self.jid, self.account_label) return '%s %s' % (self.name, self.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bb5f1651a39990bd936d2e557bcfdc2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bb5f1651a39990bd936d2e557bcfdc2… 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