Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Dont show empty groups when filtering
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: cb37eae0 by lovetox at 2021-03-06T13:36:12+01:00 Dont show empty groups when filtering - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -80,7 +80,7 @@ def __init__(self, account): ]) self._modelfilter = self._store.filter_new() - self._modelfilter.set_visible_func(self._visible_func) + self._modelfilter.set_visible_column(Column.VISIBLE) self._filter_enabled = False self._filter_string = '' @@ -145,7 +145,7 @@ def _on_theme_update(self, _event): def _on_show_offline(self, action, param): action.set_state(param) app.settings.set('showoffline', param.get_boolean()) - self._draw_contacts() + self._refilter() def _on_contact_info(self, _action, param): app.window.contact_info(self._account, param.get_string()) @@ -213,7 +213,7 @@ def _show_contact_menu(self, jid, treeview, event): def set_search_string(self, text): self._filter_string = text self._filter_enabled = bool(text) - self._draw_contacts() + self._refilter() def _get_contact_visible(self, contact): if self._filter_enabled: @@ -227,20 +227,6 @@ def _get_contact_visible(self, contact): return True - def _visible_func(self, model, iter_, _data): - visible = model[iter_][Column.VISIBLE] - is_contact = model[iter_][Column.IS_CONTACT] - name = model[iter_][Column.TEXT] - - if not is_contact: - # Always show groups - return True - - if self._filter_enabled: - return self._filter_string in name.lower() - - return visible - def set_model(self): self._roster.set_model(self._modelfilter) @@ -261,10 +247,6 @@ def enable_sort(self, enable): self._store.set_sort_column_id(column, Gtk.SortType.ASCENDING) - def invalidate_sort(self): - self.enable_sort(False) - self.enable_sort(True) - def _initial_draw(self): for contact in self._client.get_module('Roster').iter_contacts(): contact.connect('presence-update', self._on_presence_update) @@ -387,11 +369,18 @@ def _draw_group(self, group_name): group_name += f' ({group_users}/{total_users})' self._store[group_iter][Column.TEXT] = group_name - self._store[group_iter][Column.VISIBLE] = True - def _draw_contacts(self): - for jid in self._contact_refs: - self._draw_contact(self._get_contact(jid)) + def _refilter(self): + for group in self._store: + group_is_visible = False + for child in group.iterchildren(): + contact = self._get_contact(child[Column.JID_OR_GROUP]) + is_visible = self._get_contact_visible(contact) + child[Column.VISIBLE] = is_visible + if is_visible: + group_is_visible = True + + group[Column.VISIBLE] = group_is_visible self._roster.expand_all() def _draw_contact(self, contact): @@ -406,8 +395,6 @@ def _draw_contact_row(self, ref, contact): if jid_is_blocked(self._account, contact.jid): name = f'{name}' self._store[iter_][Column.TEXT] = name - visible = self._get_contact_visible(contact) - self._store[iter_][Column.VISIBLE] = visible surface = contact.get_avatar( AvatarSize.ROSTER, self.get_scale_factor()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cb37eae0dd53c7166a7097b35432f7ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cb37eae0dd53c7166a7097b35432f7ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Open chat when activating row
by Daniel Brötzmann 06 Mar '21

06 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 00e3e9df by wurstsalat at 2021-03-06T11:17:45+01:00 Roster: Open chat when activating row - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -8,7 +8,6 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk -from gi.repository import GObject from gajim.common import app from gajim.common import ged @@ -44,14 +43,6 @@ class Column(IntEnum): class Roster(Gtk.ScrolledWindow, EventHelper): - - __gsignals__ = { - 'row-activated': ( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, # return value - (str, )) # arguments - } - def __init__(self, account): Gtk.ScrolledWindow.__init__(self) EventHelper.__init__(self) @@ -175,7 +166,8 @@ def _on_roster_row_activated(self, _treeview, path, _column): return jid = self._store[iter_][Column.JID_OR_GROUP] - self.emit('row-activated', jid) + 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): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00e3e9df9ec6dc2a04c53d9227c9f82c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00e3e9df9ec6dc2a04c53d9227c9f82c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Implement middle mouse click
by Daniel Brötzmann 06 Mar '21

06 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 554c27db by wurstsalat at 2021-03-06T11:05:31+01:00 Roster: Implement middle mouse click - - - - - 3 changed files: - gajim/gtk/chat_list.py - gajim/gtk/main.py - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -420,7 +420,7 @@ def _on_state_flags_changed(self, _listboxrow, *args): def _on_close_button_clicked(self, _button): app.window.activate_action( 'remove-chat', - GLib.Variant('as', [self.account, self.jid])) + GLib.Variant('as', [self.account, str(self.jid)])) def set_timestamp(self, timestamp): self._timestamp = timestamp ===================================== gajim/gtk/main.py ===================================== @@ -291,6 +291,9 @@ def is_chat_active(self, account, jid): return False return self._chat_list_stack.is_chat_active(account, jid) + def show_chats(self): + self._ui.main_stack.set_visible_child_name('chats') + def _add_workspace(self, _action, param): workspace_id = param.get_string() self.add_workspace(workspace_id) ===================================== gajim/gtk/roster.py ===================================== @@ -197,7 +197,8 @@ def _on_roster_button_press_event(self, treeview, event): self._show_contact_menu(jid, treeview, event) if event.button == 2: # middle click - self.emit('row-activated', jid) + 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/554c27dbed504d70a779b6e2975bf4c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/554c27dbed504d70a779b6e2975bf4c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Rename menu handlers
by Daniel Brötzmann 06 Mar '21

06 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2560d7ee by wurstsalat at 2021-03-06T10:41:08+01:00 Roster: Rename menu handlers - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -98,10 +98,10 @@ def __init__(self, account): def _add_actions(self): actions = [ - ('contact-info', self._contact_info), - ('execute-command', self._execute_command), - ('block-contact', self._block_contact), - ('remove-contact', self._remove_contact), + ('contact-info', self._on_contact_info), + ('execute-command', self._on_execute_command), + ('block-contact', self._on_block_contact), + ('remove-contact', self._on_remove_contact), ] for action in actions: action_name, func = action @@ -114,7 +114,7 @@ def _add_actions(self): f'show-offline-{self._account}', None, GLib.Variant.new_boolean(app.settings.get('showoffline'))) - action.connect('change-state', self._show_offline) + action.connect('change-state', self._on_show_offline) app.window.add_action(action) def update_actions(self): @@ -151,21 +151,21 @@ def _on_account_state(self, _event): def _on_theme_update(self, _event): self.redraw() - def _show_offline(self, action, param): + def _on_show_offline(self, action, param): action.set_state(param) app.settings.set('showoffline', param.get_boolean()) self._draw_contacts() - def _contact_info(self, _action, param): + def _on_contact_info(self, _action, param): app.window.contact_info(self._account, param.get_string()) - def _execute_command(self, _action, param): + def _on_execute_command(self, _action, param): app.window.execute_command(self._account, param.get_string()) - def _block_contact(self, _action, param): + def _on_block_contact(self, _action, param): app.window.block_contact(self._account, param.get_string()) - def _remove_contact(self, _action, param): + 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): @@ -289,7 +289,7 @@ def _on_avatar_update(self, contact, _signal_name): self._draw_contact(contact) @event_filter(['account']) - def _on_roster_received(self, event): + def _on_roster_received(self, _event): self._reset() @event_filter(['account']) @@ -404,6 +404,7 @@ def _draw_contacts(self): def _draw_contact(self, contact): for ref in self._contact_refs[contact.jid]: self._draw_contact_row(ref, contact) + self._roster.expand_all() def _draw_contact_row(self, ref, contact): iter_ = self._get_iter_from_ref(ref) @@ -490,8 +491,7 @@ def clear(self): self._group_refs = {} self._store.clear() - def _on_presence_received(self, event): - # TODO: self.draw_contacts() if contact changes status + def _on_presence_received(self, _event): pass def process_event(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2560d7eefbe4b869ad15c7c43977d651… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2560d7eefbe4b869ad15c7c43977d651… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Implement filtering
by Daniel Brötzmann 05 Mar '21

05 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a2caf6a1 by wurstsalat at 2021-03-06T00:38:46+01:00 Roster: Implement filtering - - - - - 3 changed files: - gajim/data/gui/roster.ui - gajim/gtk/account_page.py - gajim/gtk/roster.py Changes: ===================================== gajim/data/gui/roster.ui ===================================== @@ -12,6 +12,8 @@ <column type="gboolean"/>  <column type="gchararray"/> +  + <column type="gboolean"/> </columns> </object> <object class="GtkTreeView" id="roster_treeview"> ===================================== gajim/gtk/account_page.py ===================================== @@ -62,7 +62,7 @@ def _on_account_settings(self, _button): def _on_search_changed(self, widget): text = widget.get_text().lower() - print(text) + self._roster.set_search_string(text) @staticmethod def _on_button_release(paned, event): ===================================== gajim/gtk/roster.py ===================================== @@ -14,6 +14,7 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from gajim.common.const import PresenceShowExt from gajim.common.helpers import jid_is_blocked from gajim.common.helpers import event_filter from gajim.common.i18n import _ @@ -39,6 +40,7 @@ class Column(IntEnum): TEXT = 1 IS_CONTACT = 2 JID_OR_GROUP = 3 + VISIBLE = 4 class Roster(Gtk.ScrolledWindow, EventHelper): @@ -86,6 +88,11 @@ def __init__(self, account): ('roster-push', ged.GUI2, self._on_roster_push), ]) + self._modelfilter = self._store.filter_new() + self._modelfilter.set_visible_func(self._visible_func) + self._filter_enabled = False + self._filter_string = '' + self._add_actions() self._initial_draw() @@ -147,8 +154,7 @@ def _on_theme_update(self, _event): def _show_offline(self, action, param): action.set_state(param) app.settings.set('showoffline', param.get_boolean()) - print('_show_offline') - print(param.get_boolean()) + self._draw_contacts() def _contact_info(self, _action, param): app.window.contact_info(self._account, param.get_string()) @@ -211,12 +217,43 @@ def _show_contact_menu(self, jid, treeview, event): popover.set_pointing_to(rectangle) popover.popup() + def set_search_string(self, text): + self._filter_string = text + self._filter_enabled = bool(text) + self._draw_contacts() + + def _get_contact_visible(self, contact): + if self._filter_enabled: + return self._filter_string in contact.name.lower() + + if app.settings.get('showoffline'): + return True + + if contact.show is PresenceShowExt.OFFLINE: + return False + + return True + + def _visible_func(self, model, iter_, _data): + visible = model[iter_][Column.VISIBLE] + is_contact = model[iter_][Column.IS_CONTACT] + name = model[iter_][Column.TEXT] + + if not is_contact: + # Always show groups + return True + + if self._filter_enabled: + return self._filter_string in name.lower() + + return visible + def set_model(self): - self._roster.set_model(self._store) + self._roster.set_model(self._modelfilter) def redraw(self): self._roster.set_model(None) - self._roster.set_model(self._store) + self._roster.set_model(self._modelfilter) self._roster.expand_all() def _reset(self): @@ -274,7 +311,7 @@ def _add_group(self, group_name): return group_iter group_iter = self._store.append( - None, (None, group_name, False, group_name)) + None, (None, group_name, False, group_name, True)) group_path = self._store.get_path(group_iter) group_ref = Gtk.TreeRowReference(self._store, group_path) self._group_refs[group_name] = group_ref @@ -284,7 +321,7 @@ def _add_contact_to_group(self, contact, group): group_iter = self._add_group(group) iter_ = self._store.append( group_iter, - (None, contact.name, True, str(contact.jid))) + (None, contact.name, True, str(contact.jid), True)) ref = Gtk.TreeRowReference(self._store, self._store.get_path(iter_)) self._contact_refs[contact.jid].append(ref) @@ -357,6 +394,12 @@ def _draw_group(self, group_name): group_name += f' ({group_users}/{total_users})' self._store[group_iter][Column.TEXT] = group_name + self._store[group_iter][Column.VISIBLE] = True + + def _draw_contacts(self): + for jid in self._contact_refs: + self._draw_contact(self._get_contact(jid)) + self._roster.expand_all() def _draw_contact(self, contact): for ref in self._contact_refs[contact.jid]: @@ -369,6 +412,8 @@ def _draw_contact_row(self, ref, contact): if jid_is_blocked(self._account, contact.jid): name = f'{name}' self._store[iter_][Column.TEXT] = name + visible = self._get_contact_visible(contact) + self._store[iter_][Column.VISIBLE] = visible surface = contact.get_avatar( AvatarSize.ROSTER, self.get_scale_factor()) @@ -446,6 +491,7 @@ def clear(self): self._store.clear() def _on_presence_received(self, event): + # TODO: self.draw_contacts() if contact changes status pass def process_event(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a2caf6a1f49bd7c9a3d4ae3bc805b117… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a2caf6a1f49bd7c9a3d4ae3bc805b117… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Work on Roster
by Philipp Hörist 05 Mar '21

05 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 809931d9 by lovetox at 2021-03-05T23:10:41+01:00 Work on Roster - - - - - c35662a7 by lovetox at 2021-03-05T23:10:41+01:00 Roster: Add events - - - - - bd78ea96 by lovetox at 2021-03-05T23:10:41+01:00 Roster: Refactor - - - - - 2 changed files: - gajim/common/modules/roster.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -26,7 +26,10 @@ class Roster(BaseModule): _nbxmpp_extends = 'Roster' - _nbxmpp_methods = [] + _nbxmpp_methods = [ + 'delete_item', + 'set_item', + ] def __init__(self, con): BaseModule.__init__(self, con) @@ -57,7 +60,7 @@ def load_roster(self): self._roster = roster def _store_roster(self): - app.storage.cache.store_roster(self._account, self._data) + app.storage.cache.store_roster(self._account, self._roster) def request_roster(self): version = app.settings.get_account_setting(self._account, @@ -92,6 +95,9 @@ def _on_request_roster(self, task): 'roster_version', roster.version) + app.nec.push_incoming_event(NetworkEvent('roster-received', + account=self._account)) + self._con.connect_machine() def _set_roster_from_data(self, items): @@ -101,41 +107,24 @@ def _set_roster_from_data(self, items): self._con.get_module('Contacts').add_contact(item.jid) self._roster[item.jid] = item - app.storage.cache.store_roster(self._account, self._roster) + self._store_roster() - def _process_roster_push(self, _con, stanza, _properties): - return - # TODO + def _process_roster_push(self, _con, _stanza, properties): self._log.info('Push received') - sender = stanza.getFrom() - if sender is not None: - if not self._con.get_own_jid().bare_match(sender): - self._log.warning('Wrong JID %s', stanza.getFrom()) - return - - push_items, version = self._parse_push(stanza) + item = properties.roster.item + self._roster[item.jid] = item - self._ack_roster_push(stanza) + self._store_roster() - for item in push_items: - attrs = item.data - app.nec.push_incoming_event(NetworkEvent( - 'roster-info', - conn=self._con, - jid=item.jid, - nickname=attrs['name'], - sub=attrs['subscription'], - ask=attrs['ask'], - groups=attrs['groups'], - avatar_sha=None)) - - self._store_roster() - - self._log.info('New version: %s', version) + self._log.info('New version: %s', properties.roster.version) app.settings.set_account_setting(self._account, 'roster_version', - version) + properties.roster.version) + + app.nec.push_incoming_event(NetworkEvent('roster-push', + account=self._account, + item=item)) raise nbxmpp.NodeProcessed ===================================== gajim/gtk/roster.py ===================================== @@ -2,6 +2,7 @@ import logging from typing import Optional from enum import IntEnum +from collections import defaultdict from gi.repository import Gdk from gi.repository import Gio @@ -14,6 +15,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr from gajim.common.helpers import jid_is_blocked +from gajim.common.helpers import event_filter from gajim.common.i18n import _ from gajim.gui_menu_builder import get_roster_menu @@ -29,6 +31,9 @@ ] +DEFAULT_GROUP = _('Contacts') + + class Column(IntEnum): AVATAR = 0 TEXT = 1 @@ -60,7 +65,7 @@ def __init__(self, account): self.add(self._ui.roster_treeview) # Holds the Gtk.TreeRowReference for each contact - self._contact_refs = {} + self._contact_refs = defaultdict(list) # Holds the Gtk.TreeRowReference for each group self._group_refs = {} @@ -78,6 +83,7 @@ def __init__(self, account): ('account-connected', ged.CORE, self._on_account_state), ('account-disconnected', ged.CORE, self._on_account_state), ('theme-update', ged.GUI2, self._on_theme_update), + ('roster-push', ged.GUI2, self._on_roster_push), ]) self._add_actions() @@ -129,6 +135,9 @@ def _remove_actions(self): for action in actions: app.window.remove_action(f'{action}-{self._account}') + def _get_contact(self, jid): + return self._client.get_module('Contacts').get_contact(jid) + def _on_account_state(self, _event): self.update_actions() @@ -202,20 +211,6 @@ def _show_contact_menu(self, jid, treeview, event): popover.set_pointing_to(rectangle) popover.popup() - def _on_destroy(self, _roster): - self._remove_actions() - self._contact_refs = {} - self._group_refs = {} - self._roster.set_model(None) - self._roster = None - # Store keeps a ref on the object if we don’t unset the sort func - self._store.set_sort_func(Column.TEXT, print) - self._store.clear() - self._store = None - # self._tooltip.destroy() - # self._tooltip = None - app.check_finalize(self) - def set_model(self): self._roster.set_model(self._store) @@ -224,6 +219,11 @@ def redraw(self): self._roster.set_model(self._store) self._roster.expand_all() + def _reset(self): + self._roster.set_model(None) + self.enable_sort(False) + self._initial_draw() + def enable_sort(self, enable): column = Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID if enable: @@ -239,114 +239,137 @@ def _initial_draw(self): for contact in self._client.get_module('Roster').iter_contacts(): contact.connect('presence-update', self._on_presence_update) contact.connect('avatar-update', self._on_avatar_update) - self._add_contact(contact) + self._add_or_update_contact(contact) self.enable_sort(True) self.set_model() self._roster.expand_all() def _on_presence_update(self, contact, _signal_name): - self.draw_avatar(contact) + self._draw_contact(contact) def _on_avatar_update(self, contact, _signal_name): - self.draw_avatar(contact) - - def _add_contact(self, contact): - main_group = _('Contacts') - - if contact.groups: - for group_name in contact.groups: - group_iter = self._get_group_iter(group_name) - if not group_iter: - group_iter = self._store.append( - None, (None, group_name, False, group_name)) - group_path = self._store.get_path(group_iter) - group_ref = Gtk.TreeRowReference(self._store, group_path) - self._group_refs[group_name] = group_ref - else: - group_iter = self._get_group_iter(main_group) - if not group_iter: - group_iter = self._store.append( - None, (None, main_group, False, main_group)) - group_path = self._store.get_path(group_iter) - group_ref = Gtk.TreeRowReference(self._store, group_path) - self._group_refs[main_group] = group_ref - - # Avatar - surface = contact.get_avatar(AvatarSize.CHAT, self.get_scale_factor()) - - jid = str(contact.jid) - # TODO: Multiple groups per contact ? + self._draw_contact(contact) + + @event_filter(['account']) + def _on_roster_received(self, event): + self._reset() + + @event_filter(['account']) + def _on_roster_push(self, event): + contact = self._get_contact(event.item.jid) + self._add_or_update_contact(contact) + + def _get_current_groups(self, jid): + groups = set() + for ref in self._contact_refs[jid]: + iter_ = self._get_iter_from_ref(ref) + group_iter = self._store.iter_parent(iter_) + groups.add(self._store[group_iter][Column.JID_OR_GROUP]) + return groups + + def _add_group(self, group_name): + group_iter = self._get_group_iter(group_name) + if group_iter is not None: + return group_iter + + group_iter = self._store.append( + None, (None, group_name, False, group_name)) + group_path = self._store.get_path(group_iter) + group_ref = Gtk.TreeRowReference(self._store, group_path) + self._group_refs[group_name] = group_ref + return group_iter + + def _add_contact_to_group(self, contact, group): + group_iter = self._add_group(group) iter_ = self._store.append( - group_iter, (surface, contact.name, True, jid)) - self._contact_refs[jid] = Gtk.TreeRowReference( - self._store, self._store.get_path(iter_)) + group_iter, + (None, contact.name, True, str(contact.jid))) - self.draw_groups() - self.draw_contact(jid) + ref = Gtk.TreeRowReference(self._store, self._store.get_path(iter_)) + self._contact_refs[contact.jid].append(ref) - if (group_path is not None and - self._roster.get_model() is not None): - self._roster.expand_row(group_path, False) - - def remove_contact(self, jid): - # TODO: How to delete a roster item? - #self._client.get_module('Roster').delete_item(jid) + def _add_contact_to_groups(self, contact, groups): + for group in groups: + self._add_contact_to_group(contact, group) - iter_ = self._get_contact_iter(jid) - if not iter_: + def _remove_contact_from_groups(self, contact, groups): + if not groups: return - group_iter = self._store.iter_parent(iter_) - if group_iter is None: - raise ValueError('Trying to remove non-chil') - - self._store.remove(iter_) - del self._contact_refs[jid] - if not self._store.iter_has_child(group_iter): + refs = self._contact_refs[contact.jid] + for ref in refs: + iter_ = self._get_iter_from_ref(ref) + group_iter = self._store.iter_parent(iter_) + group = self._store[group_iter][Column.JID_OR_GROUP] + if group in groups: + iter_ = self._store.get_iter(ref.get_path()) + self._store.remove(iter_) + self._contact_refs[contact.jid].remove(ref) + + self._check_for_empty_groups() + + def _remove_contact(self, contact): + refs = self._contact_refs.pop(contact.jid) + for ref in refs: + iter_ = self._get_iter_from_ref(ref) + self._store.remove(iter_) + + self._check_for_empty_groups() + + def _check_for_empty_groups(self): + for ref in list(self._group_refs.values()): + group_iter = self._get_iter_from_ref(ref) + if self._store.iter_has_child(group_iter): + continue group = self._store[group_iter][Column.JID_OR_GROUP] - del self._group_refs[group] self._store.remove(group_iter) + del self._group_refs[group] - self.redraw() + def _add_or_update_contact(self, contact): + new_groups = set(contact.groups or [DEFAULT_GROUP]) + groups = self._get_current_groups(contact.jid) + + add_to_groups = new_groups - groups + remove_from_groups = groups - new_groups - def draw_groups(self): + self._add_contact_to_groups(contact, add_to_groups) + self._remove_contact_from_groups(contact, remove_from_groups) + + self._draw_groups() + self._draw_contact(contact) + + def _draw_groups(self): for group in self._group_refs: - self.draw_group(group) + self._draw_group(group) - def draw_group(self, group_name): + def _draw_group(self, group_name): group_iter = self._get_group_iter(group_name) if not group_iter: return + if self._roster.get_model() is not None: + group_path = self._store.get_path(group_iter) + self._roster.expand_row(group_path, False) + total_users = self._get_total_user_count() group_users = self._store.iter_n_children(group_iter) group_name += f' ({group_users}/{total_users})' self._store[group_iter][Column.TEXT] = group_name - def draw_contacts(self): - for jid in self._contact_refs: - self.draw_contact(jid) + def _draw_contact(self, contact): + for ref in self._contact_refs[contact.jid]: + self._draw_contact_row(ref, contact) - def draw_contact(self, jid): - iter_ = self._get_contact_iter(jid) - if not iter_: - return + def _draw_contact_row(self, ref, contact): + iter_ = self._get_iter_from_ref(ref) - contact = self._client.get_module('Contacts').get_contact(jid) name = GLib.markup_escape_text(contact.name) - if jid_is_blocked(self._account, jid): + if jid_is_blocked(self._account, contact.jid): name = f'{name}' - - self.draw_avatar(contact) self._store[iter_][Column.TEXT] = name - def draw_avatar(self, contact): - iter_ = self._get_contact_iter(str(contact.jid)) - if iter_ is None: - return - surface = contact.get_avatar( AvatarSize.ROSTER, self.get_scale_factor()) self._store[iter_][Column.AVATAR] = surface @@ -357,6 +380,9 @@ def _get_total_user_count(self): count += self._store.iter_n_children(group_row.iter) return count + def _get_iter_from_ref(self, ref): + return self._store.get_iter(ref.get_path()) + def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: try: ref = self._group_refs[group_name] @@ -368,18 +394,6 @@ def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: return None return self._store.get_iter(path) - def _get_contact_iter(self, jid: str) -> Optional[Gtk.TreeIter]: - try: - ref = self._contact_refs[jid] - except KeyError: - return None - - path = ref.get_path() - if path is None: - return None - - return self._store.get_iter(path) - @staticmethod def _text_cell_data_func(_column, renderer, model, iter_, _user_data): has_parent = bool(model.iter_parent(iter_)) @@ -413,10 +427,8 @@ def _tree_compare_iters(self, model, iter1, iter2, _user_data): if not app.settings.get('sort_by_show_in_roster'): return locale.strcoll(name1.lower(), name2.lower()) - contact1 = self._client.get_module('Contacts').get_contact( - model[iter1][Column.JID_OR_GROUP]) - contact2 = self._client.get_module('Contacts').get_contact( - model[iter2][Column.JID_OR_GROUP]) + contact1 = self._get_contact(model[iter1][Column.JID_OR_GROUP]) + contact2 = self._get_contact(model[iter2][Column.JID_OR_GROUP]) if contact1.show != contact2.show: return -1 if contact1.show > contact2.show else 1 @@ -444,3 +456,16 @@ def process_event(self, event): self._on_presence_received(event) else: log.warning('Unhandled Event: %s', event.name) + + def _on_destroy(self, _roster): + self._remove_actions() + self._contact_refs = {} + self._group_refs = {} + self._roster.set_model(None) + self._roster = None + self._store.clear() + self._store.reset_default_sort_func() + self._store = None + # self._tooltip.destroy() + # self._tooltip = None + app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ed4c82e2701a759ca3224be0d8e5c8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ed4c82e2701a759ca3224be0d8e5c8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Roster: Handle roster pushes
by Philipp Hörist 05 Mar '21

05 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 225267ed by lovetox at 2021-03-05T23:08:10+01:00 Roster: Handle roster pushes - - - - - 2 changed files: - nbxmpp/modules/roster.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/roster.py ===================================== @@ -22,7 +22,8 @@ from nbxmpp.protocol import Iq from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import RosterData from nbxmpp.structs import RosterItem -# from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import RosterPush +from nbxmpp.structs import StanzaHandler from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError from nbxmpp.task import iq_request_task @@ -36,11 +37,11 @@ class Roster(BaseModule): self._client = client self.handlers = [ - # StanzaHandler(name='iq', - # callback=self._process_roster_push, - # typ='set', - # priority=15, - # ns=Namespace.ROSTER), + StanzaHandler(name='iq', + callback=self._process_roster_push, + typ='set', + priority=15, + ns=Namespace.ROSTER), ] @iq_request_task @@ -67,21 +68,28 @@ class Roster(BaseModule): raise MalformedStanzaError('query node missing', response) yield RosterData(None, version) - yield self._parse_push(response, ver_support) + pushed_items, version = self._parse_push(response, ver_support) + yield RosterData(pushed_items, version) def _process_roster_push(self, _client, stanza, properties): from_ = stanza.getFrom() if from_ is not None: - if not self._con.get_bound_jid().bare == from_: + if not self._client.get_bound_jid().bare == from_: self._log.warning('Malicious Roster Push from %s', from_) raise NodeProcessed ver_support = self._client.features.has_roster_version() - properties.roster = self._parse_push(stanza, ver_support) + pushed_items, version = self._parse_push(stanza, ver_support) + if len(pushed_items) != 1: + self._log.warning('Roster push contains more than one item') + self._log.warning(stanza) + raise NodeProcessed + + item = pushed_items[0] + properties.roster = RosterPush(item, version) self._log.info('Roster Push, version: %s', properties.roster.version) - for item in properties.roster.items: - self._log.info(item) + self._log.info(item) self._ack_roster_push(stanza) @@ -90,7 +98,7 @@ class Roster(BaseModule): to=stanza.getFrom(), frm=stanza.getTo(), attrs={'id': stanza.getID()}) - self._con.send_stanza(iq) + self._client.send_stanza(iq) @iq_request_task def delete_item(self, jid): @@ -126,8 +134,7 @@ class Roster(BaseModule): pushed_items.append(roster_item) - return RosterData(pushed_items, version) - + return pushed_items, version def _make_delete(jid): ===================================== nbxmpp/structs.py ===================================== @@ -134,6 +134,7 @@ MAMPreferencesData = namedtuple('MAMPreferencesData', 'default always never') LastActivityData = namedtuple('LastActivityData', 'seconds status') RosterData = namedtuple('RosterData', 'items version') +RosterPush = namedtuple('RosterPush', 'item version') @dataclass View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/225267edef7026d3217dd196… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/225267edef7026d3217dd196… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Add filter menu, connect search
by Daniel Brötzmann 04 Mar '21

04 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9ed4c82e by wurstsalat at 2021-03-04T22:50:32+01:00 Roster: Add filter menu, connect search - - - - - 3 changed files: - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py - gajim/gtk/roster.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -75,6 +75,7 @@ <property name="primary-icon-activatable">False</property> <property name="primary-icon-sensitive">False</property> <property name="placeholder-text" translatable="yes">Search…</property> + <signal name="changed" handler="_on_search_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/account_page.py ===================================== @@ -12,15 +12,21 @@ # 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 Gtk from gajim.common import app +from gajim.common.i18n import _ from .roster import Roster from .status_selector import StatusSelector from .util import get_builder from .util import open_window +ROSTER_MENU_DICT = { + 'show-offline': _('Show Offline Contacts'), +} + class AccountPage(Gtk.Box): def __init__(self, account): @@ -40,6 +46,11 @@ def __init__(self, account): self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) + roster_menu = Gio.Menu() + for action, label in ROSTER_MENU_DICT.items(): + roster_menu.append(label, f'win.{action}-{account}') + self._ui.roster_menu_button.set_menu_model(roster_menu) + self._ui.connect_signals(self) self.show_all() @@ -49,6 +60,10 @@ def _on_account_settings(self, _button): window = open_window('AccountsWindow') window.select_account(self._account) + def _on_search_changed(self, widget): + text = widget.get_text().lower() + print(text) + @staticmethod def _on_button_release(paned, event): if event.window != paned.get_handle_window(): ===================================== gajim/gtk/roster.py ===================================== @@ -97,6 +97,13 @@ def _add_actions(self): act.connect('activate', func) app.window.add_action(act) + action = Gio.SimpleAction.new_stateful( + f'show-offline-{self._account}', + None, + GLib.Variant.new_boolean(app.settings.get('showoffline'))) + action.connect('change-state', self._show_offline) + app.window.add_action(action) + def update_actions(self): online = app.account_is_connected(self._account) blocking_support = self._client.get_module('Blocking').supported @@ -117,6 +124,7 @@ def _remove_actions(self): 'execute-command', 'block-contact', 'remove-contact', + 'show-offline', ] for action in actions: app.window.remove_action(f'{action}-{self._account}') @@ -127,6 +135,12 @@ def _on_account_state(self, _event): def _on_theme_update(self, _event): self.redraw() + def _show_offline(self, action, param): + action.set_state(param) + app.settings.set('showoffline', param.get_boolean()) + print('_show_offline') + print(param.get_boolean()) + def _contact_info(self, _action, param): app.window.contact_info(self._account, param.get_string()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ed4c82e2701a759ca3224be0d8e5c87… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ed4c82e2701a759ca3224be0d8e5c87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AddContact: Refactor
by Philipp Hörist 04 Mar '21

04 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: e9cbce5d by lovetox at 2021-03-04T22:05:55+01:00 AddContact: Refactor - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -21,6 +21,7 @@ from gajim.common import helpers from gajim.common.i18n import _ +from .service_registration import ServiceRegistration from .dialogs import ErrorDialog from .util import get_builder from .util import EventHelper @@ -58,27 +59,18 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): if not account: self.account = accounts[0][0] - self.xml = get_builder('add_new_contact_window.ui') - self.add(self.xml.get_object('add_contact_box')) - self.xml.connect_signals(self) + self._ui = get_builder('add_new_contact_window.ui') + self.add(self._ui.add_contact_box) + self._ui.connect_signals(self) - for w in ('account_combobox', 'account_label', 'prompt_label', - 'uid_label', 'uid_entry', 'show_contact_info_button', - 'protocol_combobox', 'protocol_jid_combobox', - 'protocol_label', 'nickname_entry', - 'message_scrolledwindow', 'save_message_checkbutton', - 'register_hbox', 'add_button', 'message_textview', - 'connected_label', 'group_comboboxentry', - 'auto_authorize_checkbutton', 'save_message_revealer', - 'nickname_label', 'group_label'): - self.__dict__[w] = self.xml.get_object(w) + self.subscription_table = [ + self._ui.uid_label, self._ui.uid_entry, + self._ui.show_contact_info_button, + self._ui.nickname_label, self._ui.nickname_entry, + self._ui.group_label, self._ui.group_comboboxentry + ] - self.subscription_table = [self.uid_label, self.uid_entry, - self.show_contact_info_button, - self.nickname_label, self.nickname_entry, - self.group_label, self.group_comboboxentry] - - self.add_button.grab_default() + self._ui.add_button.grab_default() self.agents = {'jabber': []} self.gateway_prompt = {} @@ -110,7 +102,7 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ'} # Jabber as first - liststore = self.protocol_combobox.get_model() + liststore = self._ui.protocol_combobox.get_model() liststore.append(['XMPP', 'xmpp', 'jabber']) for type_ in self.agents: if type_ == 'jabber': @@ -124,8 +116,8 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): for service in self.agents[type_]: con = app.connections[account] con.get_module('Gateway').request_gateway_prompt(service) - self.protocol_combobox.set_active(0) - self.auto_authorize_checkbutton.show() + self._ui.protocol_combobox.set_active(0) + self._ui.auto_authorize_checkbutton.show() if contact_jid: self.jid_escaped = True @@ -133,42 +125,42 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): if not type_: type_ = 'jabber' if type_ == 'jabber': - self.uid_entry.set_text(contact_jid) + self._ui.uid_entry.set_text(contact_jid) transport = None else: uid, transport = app.get_name_and_server_from_jid(contact_jid) - self.uid_entry.set_text(uid.replace('%', '@', 1)) + self._ui.uid_entry.set_text(uid.replace('%', '@', 1)) - self.show_contact_info_button.set_sensitive(True) + self._ui.show_contact_info_button.set_sensitive(True) # set protocol_combobox - model = self.protocol_combobox.get_model() + model = self._ui.protocol_combobox.get_model() iter_ = model.get_iter_first() i = 0 while iter_: if model[iter_][2] == type_: - self.protocol_combobox.set_active(i) + self._ui.protocol_combobox.set_active(i) break iter_ = model.iter_next(iter_) i += 1 # set protocol_jid_combobox - self.protocol_jid_combobox.set_active(0) - model = self.protocol_jid_combobox.get_model() + self._ui.protocol_jid_combobox.set_active(0) + model = self._ui.protocol_jid_combobox.get_model() iter_ = model.get_iter_first() i = 0 while iter_: if model[iter_][0] == transport: - self.protocol_jid_combobox.set_active(i) + self._ui.protocol_jid_combobox.set_active(i) break iter_ = model.iter_next(iter_) i += 1 if user_nick: - self.nickname_entry.set_text(user_nick) - self.nickname_entry.grab_focus() + self._ui.nickname_entry.set_text(user_nick) + self._ui.nickname_entry.grab_focus() else: self.jid_escaped = False - self.uid_entry.grab_focus() + self._ui.uid_entry.grab_focus() group_names = [] for acct in accounts: for g in app.groups[acct[0]].keys(): @@ -177,31 +169,31 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): group_names.sort() i = 0 for g in group_names: - self.group_comboboxentry.append_text(g) + self._ui.group_comboboxentry.append_text(g) if group == g: - self.group_comboboxentry.set_active(i) + self._ui.group_comboboxentry.set_active(i) i += 1 if len(accounts) > 1: - liststore = self.account_combobox.get_model() + liststore = self._ui.account_combobox.get_model() for acc in accounts: liststore.append(acc) - self.account_combobox.set_active_id(self.account) - self.account_label.show() - self.account_combobox.show() + self._ui.account_combobox.set_active_id(self.account) + self._ui.account_label.show() + self._ui.account_combobox.show() if len(self.agents) > 1: - self.protocol_label.show() - self.protocol_combobox.show() + self._ui.protocol_label.show() + self._ui.protocol_combobox.show() if self.account: - message_buffer = self.message_textview.get_buffer() + message_buffer = self._ui.message_textview.get_buffer() msg = helpers.from_one_line(helpers.get_subscription_request_msg( self.account)) message_buffer.set_text(msg) - self.uid_entry.connect('changed', self.on_uid_entry_changed) + self._ui.uid_entry.connect('changed', self.on_uid_entry_changed) self.show_all() self.register_events([ @@ -210,14 +202,14 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): ]) def on_uid_entry_changed(self, widget): - is_empty = bool(not self.uid_entry.get_text() == '') - self.show_contact_info_button.set_sensitive(is_empty) + is_empty = bool(not self._ui.uid_entry.get_text() == '') + self._ui.show_contact_info_button.set_sensitive(is_empty) def on_show_contact_info_button_clicked(self, widget): """ Ask for vCard """ - jid = self.uid_entry.get_text().strip() + jid = self._ui.uid_entry.get_text().strip() if jid in app.interface.instances[self.account]['infos']: app.interface.instances[self.account]['infos'][jid].window.present() @@ -230,10 +222,9 @@ def on_show_contact_info_button_clicked(self, widget): get_object('information_notebook').remove_page(0) def on_register_button_clicked(self, widget): - model = self.protocol_jid_combobox.get_model() - row = self.protocol_jid_combobox.get_active() + model = self._ui.protocol_jid_combobox.get_model() + row = self._ui.protocol_jid_combobox.get_active() jid = model[row][0] - from .service_registration import ServiceRegistration ServiceRegistration(self.account, jid) def _on_key_press(self, widget, event): @@ -247,28 +238,28 @@ def on_cancel_button_clicked(self, widget): self.destroy() def on_message_textbuffer_changed(self, widget): - self.save_message_revealer.show() - self.save_message_revealer.set_reveal_child(True) + self._ui.save_message_revealer.show() + self._ui.save_message_revealer.set_reveal_child(True) def on_add_button_clicked(self, widget): """ When Subscribe button is clicked """ - jid = self.uid_entry.get_text().strip() + jid = self._ui.uid_entry.get_text().strip() if not jid: ErrorDialog( - _('%s Missing') % self.uid_label.get_text(), + _('%s Missing') % self._ui.uid_label.get_text(), (_('You must supply the %s of the new contact.') % - self.uid_label.get_text()) + self._ui.uid_label.get_text()) ) return - model = self.protocol_combobox.get_model() - row = self.protocol_combobox.get_active_iter() + model = self._ui.protocol_combobox.get_model() + row = self._ui.protocol_combobox.get_active_iter() type_ = model[row][2] if type_ != 'jabber': - model = self.protocol_jid_combobox.get_model() - row = self.protocol_jid_combobox.get_active() + model = self._ui.protocol_jid_combobox.get_model() + row = self._ui.protocol_jid_combobox.get_active() transport = model[row][0] if self.account and not self.jid_escaped: self.adding_jid = (jid, transport, type_) @@ -307,11 +298,11 @@ def _add_jid(self, jid, type_): ) return - nickname = self.nickname_entry.get_text() or '' + nickname = self._ui.nickname_entry.get_text() or '' # get value of account combobox, if account was not specified if not self.account: - model = self.account_combobox.get_model() - index = self.account_combobox.get_active() + model = self._ui.account_combobox.get_model() + index = self._ui.account_combobox.get_active() self.account = model[index][1] # Check if jid is already in roster @@ -324,30 +315,35 @@ def _add_jid(self, jid, type_): return if type_ == 'jabber': - message_buffer = self.message_textview.get_buffer() + message_buffer = self._ui.message_textview.get_buffer() start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() message = message_buffer.get_text(start_iter, end_iter, True) - if self.save_message_checkbutton.get_active(): + if self._ui.save_message_checkbutton.get_active(): msg = helpers.to_one_line(message) app.settings.set_account_setting(self.account, 'subscription_request_msg', msg) else: message = '' - group = self.group_comboboxentry.get_child().get_text() + group = self._ui.group_comboboxentry.get_child().get_text() groups = [] if group: groups = [group] - auto_auth = self.auto_authorize_checkbutton.get_active() - app.interface.roster.req_sub( - self, jid, message, self.account, - groups=groups, nickname=nickname, auto_auth=auto_auth) + auto_auth = self._ui.auto_authorize_checkbutton.get_active() + + client = app.get_client(self.account) + client.get_module('Presence').subscribe(jid, + message, + nickname, + groups=groups, + auto_auth=auto_auth) + self.destroy() def on_account_combobox_changed(self, widget): account = widget.get_active_id() - message_buffer = self.message_textview.get_buffer() + message_buffer = self._ui.message_textview.get_buffer() message_buffer.set_text(helpers.get_subscription_request_msg(account)) self.account = account @@ -357,8 +353,8 @@ def on_protocol_jid_combobox_changed(self, widget): if not iter_: return jid_ = model[iter_][0] - model = self.protocol_combobox.get_model() - iter_ = self.protocol_combobox.get_active_iter() + model = self._ui.protocol_combobox.get_model() + iter_ = self._ui.protocol_combobox.get_active_iter() type_ = model[iter_][2] desc = None @@ -366,10 +362,10 @@ def on_protocol_jid_combobox_changed(self, widget): desc = self.gateway_prompt[jid_]['desc'] if desc: - self.prompt_label.set_markup(desc) - self.prompt_label.show() + self._ui.prompt_label.set_markup(desc) + self._ui.prompt_label.show() else: - self.prompt_label.hide() + self._ui.prompt_label.hide() prompt = None if self.agents[type_] and jid_ in self.gateway_prompt: @@ -379,18 +375,18 @@ def on_protocol_jid_combobox_changed(self, widget): prompt = self.uid_labels[type_] else: prompt = _('User ID:') - self.uid_label.set_text(prompt) + self._ui.uid_label.set_text(prompt) def on_protocol_combobox_changed(self, widget): model = widget.get_model() iter_ = widget.get_active_iter() type_ = model[iter_][2] - model = self.protocol_jid_combobox.get_model() + model = self._ui.protocol_jid_combobox.get_model() model.clear() if self.agents[type_]: for jid_ in self.agents[type_]: model.append([jid_]) - self.protocol_jid_combobox.set_active(0) + self._ui.protocol_jid_combobox.set_active(0) desc = None if self.agents[type_]: jid_ = self.agents[type_][0] @@ -398,15 +394,15 @@ def on_protocol_combobox_changed(self, widget): desc = self.gateway_prompt[jid_]['desc'] if desc: - self.prompt_label.set_markup(desc) - self.prompt_label.show() + self._ui.prompt_label.set_markup(desc) + self._ui.prompt_label.show() else: - self.prompt_label.hide() + self._ui.prompt_label.hide() if len(self.agents[type_]) > 1: - self.protocol_jid_combobox.show() + self._ui.protocol_jid_combobox.show() else: - self.protocol_jid_combobox.hide() + self._ui.protocol_jid_combobox.hide() prompt = None if self.agents[type_]: jid_ = self.agents[type_][0] @@ -417,59 +413,59 @@ def on_protocol_combobox_changed(self, widget): prompt = self.uid_labels[type_] else: prompt = _('User ID:') - self.uid_label.set_text(prompt) + self._ui.uid_label.set_text(prompt) if type_ == 'jabber': - self.message_scrolledwindow.show() - self.save_message_checkbutton.show() + self._ui.message_scrolledwindow.show() + self._ui.save_message_checkbutton.show() else: - self.message_scrolledwindow.hide() - self.save_message_checkbutton.hide() + self._ui.message_scrolledwindow.hide() + self._ui.save_message_checkbutton.hide() if type_ in self.available_types: - self.register_hbox.show() - self.auto_authorize_checkbutton.hide() - self.connected_label.hide() + self._ui.register_hbox.show() + self._ui.auto_authorize_checkbutton.hide() + self._ui.connected_label.hide() self._subscription_table_hide() - self.add_button.set_sensitive(False) + self._ui.add_button.set_sensitive(False) else: - self.register_hbox.hide() + self._ui.register_hbox.hide() if type_ != 'jabber': - model = self.protocol_jid_combobox.get_model() - row = self.protocol_jid_combobox.get_active() + model = self._ui.protocol_jid_combobox.get_model() + row = self._ui.protocol_jid_combobox.get_active() jid = model[row][0] contact = app.contacts.get_first_contact_from_jid( self.account, jid) if contact is None or contact.show in ('offline', 'error'): self._subscription_table_hide() - self.connected_label.show() - self.add_button.set_sensitive(False) - self.auto_authorize_checkbutton.hide() + self._ui.connected_label.show() + self._ui.add_button.set_sensitive(False) + self._ui.auto_authorize_checkbutton.hide() return self._subscription_table_show() - self.auto_authorize_checkbutton.show() - self.connected_label.hide() - self.add_button.set_sensitive(True) + self._ui.auto_authorize_checkbutton.show() + self._ui.connected_label.hide() + self._ui.add_button.set_sensitive(True) def transport_signed_in(self, jid): - model = self.protocol_jid_combobox.get_model() - row = self.protocol_jid_combobox.get_active() + model = self._ui.protocol_jid_combobox.get_model() + row = self._ui.protocol_jid_combobox.get_active() _jid = model[row][0] if _jid == jid: - self.register_hbox.hide() - self.connected_label.hide() + self._ui.register_hbox.hide() + self._ui.connected_label.hide() self._subscription_table_show() - self.auto_authorize_checkbutton.show() - self.add_button.set_sensitive(True) + self._ui.auto_authorize_checkbutton.show() + self._ui.add_button.set_sensitive(True) def transport_signed_out(self, jid): - model = self.protocol_jid_combobox.get_model() - row = self.protocol_jid_combobox.get_active() + model = self._ui.protocol_jid_combobox.get_model() + row = self._ui.protocol_jid_combobox.get_active() _jid = model[row][0] if _jid == jid: self._subscription_table_hide() - self.auto_authorize_checkbutton.hide() - self.connected_label.show() - self.add_button.set_sensitive(False) + self._ui.auto_authorize_checkbutton.hide() + self._ui.connected_label.show() + self._ui.add_button.set_sensitive(False) def _nec_presence_received(self, obj): if app.jid_is_transport(obj.jid): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9cbce5d8ef4934566f8e231d6865010… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9cbce5d8ef4934566f8e231d6865010… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Add actions
by Daniel Brötzmann 04 Mar '21

04 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ca496e71 by wurstsalat at 2021-03-04T20:46:36+01:00 Roster: Add actions - - - - - 6 changed files: - gajim/chat_control.py - gajim/gtk/account_page.py - gajim/gtk/chat_list.py - gajim/gtk/main.py - gajim/gtk/roster.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -397,34 +397,10 @@ def _on_add_to_roster(self, _action, _param): AddNewContactWindow(self.account, self.contact.jid) def _on_block_contact(self, _action, _param): - def _block_contact(report=None): - con = app.connections[self.account] - con.get_module('Blocking').block([self.contact.jid], report=report) - - self.parent_win.remove_tab(self, None, force=True) - if _('Not in contact list') in self.contact.get_shown_groups(): - app.interface.roster.remove_contact( - self.contact.jid, self.account, force=True, backend=True) - return - app.interface.roster.draw_contact(self.contact.jid, self.account) - - ConfirmationDialog( - _('Block Contact'), - _('Really block this contact?'), - _('You will appear offline for this contact and you will ' - 'not receive further messages.'), - [DialogButton.make('Cancel'), - DialogButton.make('OK', - text=_('_Report Spam'), - callback=_block_contact, - kwargs={'report': 'spam'}), - DialogButton.make('Remove', - text=_('_Block'), - callback=_block_contact)], - modal=False).show() + app.window.block_contact(self.account, self.contact.jid) def _on_information(self, _action, _param): - app.interface.roster.on_info(None, self.contact, self.account) + app.window.contact_info(self.account, self.contact.jid) def _on_invite_contacts(self, _action, _param): """ ===================================== gajim/gtk/account_page.py ===================================== @@ -37,6 +37,9 @@ def __init__(self, account): self._roster = Roster(account) self._ui.roster_box.add(self._roster) + self._ui.paned.set_position(app.settings.get('chat_handle_position')) + self._ui.paned.connect('button-release-event', self._on_button_release) + self._ui.connect_signals(self) self.show_all() @@ -46,6 +49,16 @@ def _on_account_settings(self, _button): window = open_window('AccountsWindow') window.select_account(self._account) + @staticmethod + def _on_button_release(paned, event): + if event.window != paned.get_handle_window(): + return + position = paned.get_position() + app.settings.set('chat_handle_position', position) + + def get_roster(self): + return self._roster + def update(self): account_label = app.settings.get_account_setting( self._account, 'account_label') ===================================== gajim/gtk/chat_list.py ===================================== @@ -418,7 +418,9 @@ def _on_state_flags_changed(self, _listboxrow, *args): self._ui.revealer.set_reveal_child(False) def _on_close_button_clicked(self, _button): - app.window.remove_chat(self.workspace_id, self.account, self.jid) + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', [self.account, self.jid])) def set_timestamp(self, timestamp): self._timestamp = timestamp ===================================== gajim/gtk/main.py ===================================== @@ -7,20 +7,23 @@ from gajim.common import app from gajim.common import ged +from gajim.common.helpers import ask_for_status_message +from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ -from gajim.gui.util import get_builder -from gajim.gui.util import load_icon +from gajim.common.nec import EventHelper + from gajim.gui.account_page import AccountPage +from gajim.gui.adhoc import AdHocCommand from gajim.gui.chat_list_stack import ChatListStack from gajim.gui.chat_stack import ChatStack from gajim.gui.account_side_bar import AccountSideBar from gajim.gui.workspace_side_bar import WorkspaceSideBar - -from gajim.common.helpers import ask_for_status_message from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog +from gajim.gui.util import get_builder +from gajim.gui.util import load_icon -from gajim.common.nec import EventHelper +from gajim.vcard import VcardWindow from .util import open_window @@ -425,11 +428,14 @@ def move_chat_to_workspace(self, new_workspace_id, account, jid): self._chat_list_stack.store_open_chats(new_workspace_id) def _remove_chat(self, _action, param): - workspace_id, account, jid = param.unpack() - self.remove_chat(workspace_id, account, jid) + account, jid = param.unpack() + self.remove_chat(account, jid) - def remove_chat(self, workspace_id, account, jid): - self._chat_list_stack.remove_chat(workspace_id, account, jid) + def remove_chat(self, account, jid): + for workspace_id in app.settings.get_workspaces(): + if self.chat_exists_for_workspace(workspace_id, account, jid): + self._chat_list_stack.remove_chat(workspace_id, account, jid) + return def chat_exists(self, account, jid): return self._chat_list_stack.contains_chat(account, jid) @@ -447,14 +453,91 @@ def get_active_control(self): return None return self.get_control(chat.account, chat.jid) + def get_controls(self, account=None): + return self._chat_stack.get_controls(account) + def _add_accounts(self): for account in list(app.connections.keys()): account_page = AccountPage(account) self._account_pages[account] = account_page self._ui.main_stack.add_named(account_page, account) - def get_controls(self, account=None): - return self._chat_stack.get_controls(account) + @staticmethod + def contact_info(account, jid): + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + + # TODO: VcardWindow does not work with new type Contacts + info = app.interface.instances[account]['infos'] + if contact.jid in info: + info[contact.jid].window.present() + else: + info[contact.jid] = VcardWindow(contact, account) + + @staticmethod + def execute_command(account, jid): + # TODO: Resource? + AdHocCommand(account, jid) + + def block_contact(self, account, jid): + client = app.get_client(account) + + if jid_is_blocked(account, jid): + client.get_module('Blocking').unblock([jid]) + roster = self._account_pages[account].get_roster() + roster.draw_contact(jid) + return + + # TODO: Keep "confirm_block" setting? + def _block_contact(report=None): + app.events.remove_events(account, jid) + + contact = client.get_module('Contacts').get_contact(jid) + client.get_module('Blocking').block([jid], report) + if not contact.is_in_roster: + self.remove_chat(account, jid) + return + + roster = self._account_pages[account].get_roster() + roster.draw_contact(jid) + # TODO: draw_contact draws too early (not blocked yet) + # TODO: Draw ChatList row differently? + + ConfirmationDialog( + _('Block Contact'), + _('Really block this contact?'), + _('You will appear offline for this contact and you ' + 'will not receive further messages.'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Report Spam'), + callback=_block_contact, + kwargs={'report': 'spam'}), + DialogButton.make('Remove', + text=_('_Block'), + callback=_block_contact)], + modal=False).show() + + def remove_contact(self, account, jid): + def _remove_contact(): + self.remove_chat(account, jid) + roster = self._account_pages[account].get_roster() + roster.remove_contact(jid) + + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + sec_text = _('You are about to remove %(name)s (%(jid)s) from ' + 'your contact list.\n') % { + 'name': contact.name, + 'jid': jid} + # TODO: ConfirmationCheckDialog for subscription decision? + ConfirmationDialog( + _('Remove Contact'), + _('Remove contact from contact list'), + sec_text, + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=_remove_contact)]).show() def _load_chats(self): for workspace_id in app.settings.get_workspaces(): ===================================== gajim/gtk/roster.py ===================================== @@ -4,6 +4,7 @@ from enum import IntEnum from gi.repository import Gdk +from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk from gi.repository import GObject @@ -12,6 +13,7 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ from gajim.gui_menu_builder import get_roster_menu @@ -73,11 +75,70 @@ def __init__(self, account): self._ui.connect_signals(self) self.register_events([ + ('account-connected', ged.CORE, self._on_account_state), + ('account-disconnected', ged.CORE, self._on_account_state), ('theme-update', ged.GUI2, self._on_theme_update), ]) + self._add_actions() self._initial_draw() + def _add_actions(self): + actions = [ + ('contact-info', self._contact_info), + ('execute-command', self._execute_command), + ('block-contact', self._block_contact), + ('remove-contact', self._remove_contact), + ] + 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'contact-info-{self._account}').set_enabled(online) + app.window.lookup_action( + f'execute-command-{self._account}').set_enabled(online) + app.window.lookup_action( + f'block-contact-{self._account}').set_enabled( + online and blocking_support) + app.window.lookup_action( + f'remove-contact-{self._account}').set_enabled(online) + + def _remove_actions(self): + actions = [ + 'contact-info', + 'execute-command', + 'block-contact', + 'remove-contact', + ] + for action in actions: + app.window.remove_action(f'{action}-{self._account}') + + def _on_account_state(self, _event): + self.update_actions() + + def _on_theme_update(self, _event): + self.redraw() + + def _contact_info(self, _action, param): + app.window.contact_info(self._account, param.get_string()) + + def _execute_command(self, _action, param): + app.window.execute_command(self._account, param.get_string()) + + def _block_contact(self, _action, param): + app.window.block_contact(self._account, param.get_string()) + + def _remove_contact(self, _action, param): + app.window.remove_contact(self._account, param.get_string()) + def _on_roster_row_activated(self, _treeview, path, _column): iter_ = self._store.get_iter(path) if self._store.iter_parent(iter_) is None: @@ -113,9 +174,6 @@ def _on_roster_button_press_event(self, treeview, event): def _on_focus_out(treeview, _param): treeview.get_selection().unselect_all() - def _on_theme_update(self, _event): - self.redraw() - def _show_contact_menu(self, jid, treeview, event): menu = get_roster_menu(self._account, jid) @@ -131,6 +189,7 @@ def _show_contact_menu(self, jid, treeview, event): popover.popup() def _on_destroy(self, _roster): + self._remove_actions() self._contact_refs = {} self._group_refs = {} self._roster.set_model(None) @@ -163,8 +222,7 @@ def invalidate_sort(self): self.enable_sort(True) def _initial_draw(self): - client = app.get_client(self._account) - for contact in client.get_module('Roster').iter_contacts(): + for contact in self._client.get_module('Roster').iter_contacts(): contact.connect('presence-update', self._on_presence_update) contact.connect('avatar-update', self._on_avatar_update) self._add_contact(contact) @@ -217,6 +275,27 @@ def _add_contact(self, contact): self._roster.get_model() is not None): self._roster.expand_row(group_path, False) + def remove_contact(self, jid): + # TODO: How to delete a roster item? + #self._client.get_module('Roster').delete_item(jid) + + iter_ = self._get_contact_iter(jid) + if not iter_: + return + + group_iter = self._store.iter_parent(iter_) + if group_iter is None: + raise ValueError('Trying to remove non-chil') + + self._store.remove(iter_) + del self._contact_refs[jid] + if not self._store.iter_has_child(group_iter): + group = self._store[group_iter][Column.JID_OR_GROUP] + del self._group_refs[group] + self._store.remove(group_iter) + + self.redraw() + def draw_groups(self): for group in self._group_refs: self.draw_group(group) @@ -242,9 +321,12 @@ def draw_contact(self, jid): return contact = self._client.get_module('Contacts').get_contact(jid) + name = GLib.markup_escape_text(contact.name) + if jid_is_blocked(self._account, jid): + name = f'{name}' self.draw_avatar(contact) - self._store[iter_][Column.TEXT] = GLib.markup_escape_text(contact.name) + self._store[iter_][Column.TEXT] = name def draw_avatar(self, contact): iter_ = self._get_contact_iter(str(contact.jid)) ===================================== gajim/gui_menu_builder.py ===================================== @@ -797,17 +797,24 @@ def get_conv_context_menu(account, uri): def get_roster_menu(account, jid): + if helpers.jid_is_blocked(account, jid): + block_label = _('Unblock') + else: + block_label = _('Block…') menu_items = [ - ('show-contact-info', _('Contact Info')), + ('contact-info', _('Information')), + ('execute-command', _('Execute Command…')), + ('block-contact', block_label), + ('remove-contact', _('Remove…')), ] + menu = Gio.Menu() for item in menu_items: action, label = item - action = f'win.{action}' + action = f'win.{action}-{account}' menuitem = Gio.MenuItem.new(label, action) - variant_list = GLib.Variant( - 'as', [account, str(jid)]) - menuitem.set_action_and_target_value(action, variant_list) + variant = GLib.Variant('s', str(jid)) + menuitem.set_action_and_target_value(action, variant) menu.append_item(menuitem) return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca496e710d1539bc4eca26b9b2dcab28… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca496e710d1539bc4eca26b9b2dcab28… 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