Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Remove unused import
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7e2351d2 by lovetox at 2021-03-06T21:31:28+01:00 Remove unused import - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -14,7 +14,6 @@ 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 _ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e2351d29fa2cb8809f0713973efac03… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e2351d29fa2cb8809f0713973efac03… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Roster: Refactor
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f23b0d57 by lovetox at 2021-03-06T21:06:35+01:00 Roster: Refactor - - - - - ccaa24f9 by lovetox at 2021-03-06T21:30:45+01:00 Roster: Fix reset - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -85,6 +85,7 @@ def __init__(self, account): self.register_events([ ('account-connected', ged.CORE, self._on_account_state), ('account-disconnected', ged.CORE, self._on_account_state), + ('roster-received', ged.CORE, self._on_roster_received), ('theme-update', ged.GUI2, self._on_theme_update), ('roster-push', ged.GUI2, self._on_roster_push), ]) @@ -308,20 +309,24 @@ def _get_contact_visible(self, contact): return True - def set_model(self): + def _set_model(self): self._roster.set_model(self._modelfilter) - def redraw(self): + def _unset_model(self): self._roster.set_model(None) - self._roster.set_model(self._modelfilter) + + def redraw(self): + self._unset_model() + self._set_model() self._roster.expand_all() - def _reset(self): - self._roster.set_model(None) - self.enable_sort(False) + def _reset_roster(self): + self._unset_model() + self._enable_sort(False) + self._clear() self._initial_draw() - def enable_sort(self, enable): + def _enable_sort(self, enable): column = Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID if enable: column = Column.TEXT @@ -333,8 +338,8 @@ def _initial_draw(self): self._connect_contact_signals(contact) self._add_or_update_contact(contact) - self.enable_sort(True) - self.set_model() + self._enable_sort(True) + self._set_model() self._roster.expand_all() def _connect_contact_signals(self, contact): @@ -347,7 +352,7 @@ def _on_contact_update(self, contact, _signal_name): @event_filter(['account']) def _on_roster_received(self, _event): - self._reset() + self._reset_roster() @event_filter(['account']) def _on_roster_push(self, event): @@ -560,9 +565,9 @@ def _tree_compare_iters(self, model, iter1, iter2, _user_data): group2 = model[iter2][Column.JID_OR_GROUP] return -1 if group1 < group2 else 1 - def clear(self): - self._contact_refs = {} - self._group_refs = {} + def _clear(self): + self._contact_refs.clear() + self._group_refs.clear() self._store.clear() def process_event(self, event): @@ -571,9 +576,9 @@ def process_event(self, event): def _on_destroy(self, _roster): self._remove_actions() - self._contact_refs = {} - self._group_refs = {} - self._roster.set_model(None) + self._contact_refs.clear() + self._group_refs.clear() + self._unset_model() self._roster = None self._store.clear() self._store.reset_default_sort_func() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4dc7e3e729e69228427f1f1630d545… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4dc7e3e729e69228427f1f1630d545… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Blocking: Adapt to nbxmpp changes
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 48619565 by lovetox at 2021-03-06T20:57:12+01:00 Blocking: Adapt to nbxmpp changes - - - - - 1 changed file: - gajim/common/modules/blocking.py Changes: ===================================== gajim/common/modules/blocking.py ===================================== @@ -69,7 +69,7 @@ def get_blocking_list(self): raise_if_error(blocking_list) - self.blocked = blocking_list + self.blocked = list(blocking_list) app.nec.push_incoming_event(NetworkEvent('blocking', conn=self._con, changed=self.blocked)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/486195654b47fe0b555d433a84389603… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/486195654b47fe0b555d433a84389603… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Blocking: Use JID and sets everywhere
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e3839b91 by lovetox at 2021-03-06T20:54:23+01:00 Blocking: Use JID and sets everywhere - - - - - 2 changed files: - nbxmpp/modules/blocking.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/blocking.py ===================================== @@ -52,9 +52,15 @@ class Blocking(BaseModule): if blocklist is None: raise MalformedStanzaError('blocklist node missing', result) - blocked = [] + blocked = set() for item in blocklist.getTags('item'): - blocked.append(item.getAttr('jid')) + try: + jid = JID.from_string(item.getAttr('jid')) + except Exception: + self._log.info('Invalid JID: %s', item.getAttr('jid')) + continue + + blocked.add(jid) self._log.info('Received blocking list: %s', blocked) yield blocked @@ -121,9 +127,9 @@ def _make_unblock_request(jids): def _parse_push(node): items = node.getTags('item') if not items: - return BlockingPush(block=[], unblock=[], unblock_all=True) + return BlockingPush(block=set(), unblock=set(), unblock_all=True) - jids = [] + jids = set() for item in items: jid = item.getAttr('jid') if not jid: @@ -134,10 +140,10 @@ def _parse_push(node): except Exception: continue - jids.append(jid) + jids.add(jid) - block, unblock = [], [] + block, unblock = set(), set() if node.getName() == 'block': block = jids else: ===================================== nbxmpp/structs.py ===================================== @@ -156,7 +156,7 @@ class RosterItem: attrs['jid'] = jid groups = {group.getData() for group in node.getTags('group')} - attrs['groups'] = set(groups) + attrs['groups'] = groups return cls(**attrs) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e3839b9174c97480e7808fb0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e3839b9174c97480e7808fb0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor Blocking
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: e4dc7e3e by lovetox at 2021-03-06T20:50:48+01:00 Refactor Blocking - - - - - 5 changed files: - gajim/common/modules/blocking.py - gajim/common/modules/contacts.py - gajim/gtk/blocking.py - gajim/gtk/main.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/modules/blocking.py ===================================== @@ -38,7 +38,7 @@ class Blocking(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) - self.blocked = [] + self.blocked = set() self.handlers = [ StanzaHandler(name='iq', @@ -61,6 +61,9 @@ def pass_disco(self, info): self._log.info('Discovered blocking: %s', info.jid) + def is_blocked(self, jid): + return jid in self.blocked + @as_task def get_blocking_list(self): _task = yield @@ -70,9 +73,9 @@ def get_blocking_list(self): raise_if_error(blocking_list) self.blocked = blocking_list - app.nec.push_incoming_event(NetworkEvent('blocking', - conn=self._con, - changed=self.blocked)) + for contact in self._get_contacts_from_jids(blocking_list): + contact.set_blocked() + yield blocking_list @as_task @@ -93,42 +96,50 @@ def _blocking_push_received(self, _con, _stanza, properties): if not properties.is_blocking: return - changed_list = [] - if properties.blocking.unblock_all: - self.blocked = [] - for jid in self.blocked: - self._presence_probe(jid) - self._log.info('Unblock all Push') - - for jid in properties.blocking.unblock: - changed_list.append(jid) - if jid not in self.blocked: - continue - self.blocked.remove(jid) - self._presence_probe(jid) - self._log.info('Unblock Push: %s', jid) + unblock = set(self.blocked) + self.blocked = set() + self._unblock_jids(unblock) + raise nbxmpp.NodeProcessed + + if properties.blocking.unblock: + self.blocked -= properties.blocking.unblock + self._unblock_jids(properties.blocking.unblock) + + if properties.blocking.block: + block = properties.blocking.block + self.blocked.update(block) + for contact in self._get_contacts_from_jids(block): + self._log.info('Block Push: %s', contact.jid) + contact.set_blocked() + + raise nbxmpp.NodeProcessed + + def _unblock_jids(self, jids): + for contact in self._get_contacts_from_jids(jids): + contact.set_unblocked() + self._presence_probe(contact.jid) + self._log.info('Unblock Push: %s', contact.jid) - for jid in properties.blocking.block: - if jid in self.blocked: + def _get_contacts_from_jids(self, jids): + for jid in jids: + if jid.resource is not None: + # Currently not supported by GUI continue - changed_list.append(jid) - self.blocked.append(jid) - self._set_contact_offline(str(jid)) - self._log.info('Block Push: %s', jid) - app.nec.push_incoming_event(NetworkEvent('blocking', - conn=self._con, - changed=changed_list)) + if jid.is_domain: + module = self._con.get_module('Contacts') + contacts = module.get_contacts_with_domain(jid.domain) + for contact in contacts: + if contact.is_groupchat: + # Currently not supported by GUI + continue - raise nbxmpp.NodeProcessed + yield contact + + continue - def _set_contact_offline(self, jid: str) -> None: - # TODO - return - # contact_list = app.contacts.get_contacts(self._account, jid) - # for contact in contact_list: - # contact.show = 'offline' + yield self._get_contact(jid) def _presence_probe(self, jid: JID) -> None: self._log.info('Presence probe: %s', jid) ===================================== gajim/common/modules/contacts.py ===================================== @@ -83,6 +83,13 @@ def get_contact(self, jid, groupchat=False): def get_group_chat_contact(self, jid): return self.get_contact(jid, groupchat=True) + def get_contacts_with_domain(self, domain): + contacts = [] + for contact in self._contacts.values(): + if contact.jid.domain == domain: + contacts.append(contact) + return contacts + class CommonContact(Observable): def __init__(self, logger, jid, account): @@ -234,6 +241,16 @@ def subscription(self): def groups(self): return self._get_roster_attr('groups') + @property + def is_blocked(self): + return self._module('Blocking').is_blocked(self._jid) + + def set_blocked(self): + self.update_presence(UNKNOWN_PRESENCE) + self.notify('blocking-update') + + def set_unblocked(self): + self.notify('blocking-update') class ResourceContact(CommonContact): ===================================== gajim/gtk/blocking.py ===================================== @@ -75,8 +75,8 @@ def _on_blocking_list_received(self, task): self._prev_blocked_jids = set(blocking_list) self._ui.blocking_store.clear() - for item in blocking_list: - self._ui.blocking_store.append((item,)) + for jid in blocking_list: + self._ui.blocking_store.append((str(jid),)) self._set_grid_state(True) self._disable_spinner() ===================================== gajim/gtk/main.py ===================================== @@ -485,26 +485,15 @@ def execute_command(account, jid): def block_contact(self, account, jid): client = app.get_client(account) - if jid_is_blocked(account, jid): + contact = client.get_module('Contacts').get_contact(jid) + if contact.is_blocked: 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? + client.get_module('Blocking').block([contact.jid], report) + self.remove_chat(account, contact.jid) ConfirmationDialog( _('Block Contact'), ===================================== gajim/gtk/roster.py ===================================== @@ -330,18 +330,19 @@ def enable_sort(self, enable): 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._connect_contact_signals(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_contact(contact) + def _connect_contact_signals(self, contact): + contact.connect('presence-update', self._on_contact_update) + contact.connect('avatar-update', self._on_contact_update) + contact.connect('blocking-update', self._on_contact_update) - def _on_avatar_update(self, contact, _signal_name): + def _on_contact_update(self, contact, _signal_name): self._draw_contact(contact) @event_filter(['account']) @@ -353,8 +354,11 @@ def _on_roster_push(self, event): contact = self._get_contact(event.item.jid) if event.item.subscription == 'remove': + contact.disconnect(self) self._remove_contact(contact) else: + if contact.jid not in self._contact_refs: + self._connect_contact_signals(contact) self._add_or_update_contact(contact) def _get_current_groups(self, jid): @@ -482,7 +486,7 @@ def _draw_contact_row(self, ref, contact): iter_ = self._get_iter_from_ref(ref) name = GLib.markup_escape_text(contact.name) - if jid_is_blocked(self._account, contact.jid): + if contact.is_blocked: name = f'<span strikethrough="true">{name}</span>' self._store[iter_][Column.TEXT] = name View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4dc7e3e729e69228427f1f1630d545a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4dc7e3e729e69228427f1f1630d545a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Fix removing contact
by Philipp Hörist 06 Mar '21

06 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3213b5c8 by lovetox at 2021-03-06T16:30:30+01:00 Roster: Fix removing contact - - - - - 3 changed files: - gajim/common/modules/roster.py - gajim/gtk/main.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -116,7 +116,10 @@ def _process_roster_push(self, _con, _stanza, properties): self._log.info('Push received') item = properties.roster.item - self._roster[item.jid] = item + if item.subscription == 'remove': + self._roster.pop(item.jid) + else: + self._roster[item.jid] = item self._store_roster() ===================================== gajim/gtk/main.py ===================================== @@ -522,18 +522,18 @@ def _block_contact(report=None): modal=False).show() def remove_contact(self, account, jid): + client = app.get_client(account) + def _remove_contact(): self.remove_chat(account, jid) - roster = self._account_pages[account].get_roster() - roster.remove_contact(jid) + client.get_module('Roster').delete_item(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'), ===================================== gajim/gtk/roster.py ===================================== @@ -26,10 +26,7 @@ log = logging.getLogger('gajim.gui.roster') -HANDLED_EVENTS = [ - 'presence-received', -] - +HANDLED_EVENTS = [] DEFAULT_GROUP = _('Contacts') @@ -354,7 +351,11 @@ def _on_roster_received(self, _event): @event_filter(['account']) def _on_roster_push(self, event): contact = self._get_contact(event.item.jid) - self._add_or_update_contact(contact) + + if event.item.subscription == 'remove': + self._remove_contact(contact) + else: + self._add_or_update_contact(contact) def _get_current_groups(self, jid): groups = set() @@ -560,18 +561,10 @@ def clear(self): self._group_refs = {} self._store.clear() - def _on_presence_received(self, _event): - pass - def process_event(self, event): if event.name not in HANDLED_EVENTS: return - if event.name == 'presence-received': - self._on_presence_received(event) - else: - log.warning('Unhandled Event: %s', event.name) - def _on_destroy(self, _roster): self._remove_actions() self._contact_refs = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3213b5c8ae2e5d1368e4af5d77c7b3b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3213b5c8ae2e5d1368e4af5d77c7b3b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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