Commits March 2021

commits@gajim.org

1 participants
106 discussions

[Git][gajim/python-nbxmpp][master] Roster: Use a set for groups
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 03bbb2fa by lovetox at 2021-03-06T16:04:59+01:00 Roster: Use a set for groups - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -15,7 +15,7 @@ # 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 typing import List +from typing import Set import time import random @@ -143,7 +143,7 @@ class RosterItem: name: str = None ask: str = None subscription: str = None - groups: List[str] = field(default_factory=list) + groups: Set[str] = field(default_factory=set) @classmethod def from_node(cls, node): @@ -156,7 +156,7 @@ class RosterItem: attrs['jid'] = jid groups = {group.getData() for group in node.getTags('group')} - attrs['groups'] = list(groups) + attrs['groups'] = set(groups) return cls(**attrs) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/03bbb2fafe30652c905beb49… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/03bbb2fafe30652c905beb49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: JSONEncoder/Decoder: handle set
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3bbd1a93 by lovetox at 2021-03-06T15:28:18+01:00 JSONEncoder/Decoder: handle set - - - - - 7172b2a4 by lovetox at 2021-03-06T15:28:29+01:00 Roster: add group methods - - - - - 400fe65b by lovetox at 2021-03-06T15:32:41+01:00 Make dnd functional - - - - - 3 changed files: - gajim/common/modules/roster.py - gajim/common/storage/base.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -134,6 +134,19 @@ def _process_roster_push(self, _con, _stanza, properties): def get_item(self, jid): return self._roster.get(jid) + def set_groups(self, jid, groups): + if groups is not None: + groups = set(groups) + item = self.get_item(jid) + self._nbxmpp('Roster').set_item(jid, item.name, groups) + + def change_group(self, jid, old_group, new_group): + item = self.get_item(jid) + groups = set(item.groups) + groups.discard(old_group) + groups.add(new_group) + self._nbxmpp('Roster').set_item(jid, item.name, groups) + def iter(self): for jid, data in self._roster.items(): yield jid, data ===================================== gajim/common/storage/base.py ===================================== @@ -80,6 +80,9 @@ def _adapt_disco_info(disco_info): class Encoder(json.JSONEncoder): def default(self, obj): + if isinstance(obj, set): + return list(obj) + if isinstance(obj, JID): return {'__type': 'JID', 'value': str(obj)} @@ -99,6 +102,7 @@ def json_decoder(dct): return JID.from_string(dct['value']) if type_ == 'RosterItem': dct.pop('__type') + dct['groups'] = set(dct['groups']) return RosterItem(**dct) return dct ===================================== gajim/gtk/roster.py ===================================== @@ -193,12 +193,9 @@ def _on_drag_data_received(self, treeview, _drag_context, x_coord, return source_group = model[iter_source_parent][Column.JID_OR_GROUP] - delimiter = self._client.get_module('Delimiter').delimiter - source_groups = source_group.split(delimiter) - if DEFAULT_GROUP in source_groups: - source_groups = [] + jid = model[iter_source][Column.JID_OR_GROUP] - name = model[iter_source][Column.TEXT] + # name = model[iter_source][Column.TEXT] # Destination: the row receiving the drop iter_dest = model.get_iter(path_dest) @@ -209,25 +206,16 @@ def _on_drag_data_received(self, treeview, _drag_context, x_coord, else: dest_group = model[iter_dest_parent][Column.JID_OR_GROUP] - dest_groups = dest_group.split(delimiter) - if DEFAULT_GROUP in dest_groups: - # Dropped into DEFAULT_GROUP, remove all groups - print('remoing all groups') - # self._client.get_module('Roster').update_contact(jid, name, []) + if source_group == dest_group: return - print('source groups') - print(source_groups) - print('dest groups') - print(dest_groups) - if source_groups == dest_groups: - # Dropped into source group + if DEFAULT_GROUP == dest_group: + self._client.get_module('Roster').set_groups(jid, None) return - groups = list(set(dest_groups) - set(source_groups)) - print('final groups') - print(groups) - print('setting new groups') - # self._client.get_module('Roster').update_contact(jid, name, groups) + + self._client.get_module('Roster').change_group(jid, + source_group, + dest_group) def _on_show_offline(self, action, param): action.set_state(param) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef13942716966b5f0f08fffef1b06fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef13942716966b5f0f08fffef1b06fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add high performance option for big rosters
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ef139427 by lovetox at 2021-03-06T14:26:29+01:00 Add high performance option for big rosters - - - - - 2 changed files: - gajim/common/modules/roster.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -62,6 +62,9 @@ def load_roster(self): def _store_roster(self): app.storage.cache.store_roster(self._account, self._roster) + def get_size(self): + return len(self._roster) + def request_roster(self): version = app.settings.get_account_setting(self._account, 'roster_version') ===================================== gajim/gtk/roster.py ===================================== @@ -92,8 +92,14 @@ def __init__(self, account): ('roster-push', ged.GUI2, self._on_roster_push), ]) + roster_size = self._client.get_module('Roster').get_size() + self._high_performance = roster_size > 1000 + self._modelfilter = self._store.filter_new() - self._modelfilter.set_visible_column(Column.VISIBLE) + if self._high_performance: + self._modelfilter.set_visible_func(self._visible_func) + else: + self._modelfilter.set_visible_column(Column.VISIBLE) self._filter_enabled = False self._filter_string = '' @@ -292,10 +298,19 @@ def _show_contact_menu(self, jid, treeview, event): popover.popup() def set_search_string(self, text): - self._filter_string = text + self._filter_string = text.lower() self._filter_enabled = bool(text) self._refilter() + def _visible_func(self, model, iter_, *_data): + if not self._filter_enabled: + return True + + if not model[iter_][Column.IS_CONTACT]: + return True + + return self._filter_string in model[iter_][Column.TEXT].lower() + def _get_contact_visible(self, contact): if self._filter_enabled: return self._filter_string in contact.name.lower() @@ -452,6 +467,11 @@ def _draw_group(self, group_name): self._store[group_iter][Column.TEXT] = group_name def _refilter(self): + if self._high_performance: + self._modelfilter.refilter() + self._roster.expand_all() + return + for group in self._store: group_is_visible = False for child in group.iterchildren(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef13942716966b5f0f08fffef1b06fa5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef13942716966b5f0f08fffef1b06fa5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Implement drag and drop
by Daniel Brötzmann 06 Mar '21

06 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 72f6f03c by wurstsalat at 2021-03-06T14:16:39+01:00 Roster: Implement drag and drop - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -67,6 +67,19 @@ def __init__(self, account): self._roster = self._ui.roster_treeview + # Drag and Drop + entries = [Gtk.TargetEntry.new( + 'ROSTER_ITEM', + Gtk.TargetFlags.SAME_APP, + 0)] + self._roster.enable_model_drag_source( + Gdk.ModifierType.BUTTON1_MASK, + entries, + Gdk.DragAction.MOVE) + self._roster.enable_model_drag_dest(entries, Gdk.DragAction.DEFAULT) + self._roster.connect('drag-drop', self._on_drag_drop) + self._roster.connect('drag-data-received', self._on_drag_data_received) + self._ui.contact_column.set_cell_data_func(self._ui.text_renderer, self._text_cell_data_func) self.connect('destroy', self._on_destroy) @@ -142,6 +155,74 @@ def _on_account_state(self, _event): def _on_theme_update(self, _event): self.redraw() + @staticmethod + def _on_drag_drop(treeview, drag_context, _x_coord, _y_coord, + timestamp): + treeview.stop_emission_by_name('drag-drop') + target_list = treeview.drag_dest_get_target_list() + target = treeview.drag_dest_find_target(drag_context, target_list) + treeview.drag_get_data(drag_context, target, timestamp) + return True + + def _on_drag_data_received(self, treeview, _drag_context, x_coord, + y_coord, _selection_data, _info, _timestamp): + treeview.stop_emission_by_name('drag-data-received') + if treeview.get_selection().count_selected_rows() == 0: + # No selections, nothing dragged from treeview + return + + drop_info = treeview.get_dest_row_at_pos(x_coord, y_coord) + if not drop_info: + return + + model = treeview.get_model() + path_dest, _position = drop_info + + # Source: the row being dragged + path_source = treeview.get_selection().get_selected_rows()[1][0] + iter_source = model.get_iter(path_source) + iter_source_parent = model.iter_parent(iter_source) + if iter_source_parent is None: + # Dragged a group + return + + source_group = model[iter_source_parent][Column.JID_OR_GROUP] + delimiter = self._client.get_module('Delimiter').delimiter + source_groups = source_group.split(delimiter) + if DEFAULT_GROUP in source_groups: + source_groups = [] + jid = model[iter_source][Column.JID_OR_GROUP] + name = model[iter_source][Column.TEXT] + + # Destination: the row receiving the drop + iter_dest = model.get_iter(path_dest) + iter_dest_parent = model.iter_parent(iter_dest) + if iter_dest_parent is None: + # Dropped on a group + dest_group = model[iter_dest][Column.JID_OR_GROUP] + else: + dest_group = model[iter_dest_parent][Column.JID_OR_GROUP] + + dest_groups = dest_group.split(delimiter) + if DEFAULT_GROUP in dest_groups: + # Dropped into DEFAULT_GROUP, remove all groups + print('remoing all groups') + # self._client.get_module('Roster').update_contact(jid, name, []) + return + + print('source groups') + print(source_groups) + print('dest groups') + print(dest_groups) + if source_groups == dest_groups: + # Dropped into source group + return + groups = list(set(dest_groups) - set(source_groups)) + print('final groups') + print(groups) + print('setting new groups') + # self._client.get_module('Roster').update_contact(jid, name, groups) + def _on_show_offline(self, action, param): action.set_state(param) app.settings.set('showoffline', param.get_boolean()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72f6f03c50d470f7373a58a127d3f84a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72f6f03c50d470f7373a58a127d3f84a… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

← Newer
1
...
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2021