[Git][gajim/gajim][mainwindow] Roster: Improvements

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim

Commits: 06f2b628 by wurstsalat at 2021-03-02T22:27:28+01:00 Roster: Improvements

- - - - -

3 changed files:

- gajim/data/gui/roster.ui - gajim/data/style/gajim.css - gajim/gtk/roster.py

Changes:

===================================== gajim/data/gui/roster.ui ===================================== @@ -8,11 +8,9 @@ <column type="CairoGObjectSurface"/> <!-- column-name Text --> <column type="gchararray"/> - <!-- column-name Event --> - <column type="gboolean"/> <!-- column-name IsContact --> <column type="gboolean"/> - <!-- column-name GroupOrNickname --> + <!-- column-name JidOrGroup --> <column type="gchararray"/> </columns> </object> @@ -42,7 +40,7 @@ <property name="xalign">0</property> </object> <attributes> - <attribute name="visible">3</attribute> + <attribute name="visible">2</attribute> <attribute name="surface">0</attribute> </attributes> </child> @@ -56,22 +54,6 @@ </child> </object> </child> - <child> - <object class="GtkTreeViewColumn" id="event_column"> - <property name="sizing">fixed</property> - <property name="fixed-width">35</property> - <property name="title">event</property> - <child> - <object class="GtkCellRendererPixbuf" id="icon"> - <property name="xalign">0</property> - <property name="icon-name">gajim-event</property> - </object> - <attributes> - <attribute name="visible">2</attribute> - </attributes> - </child> - </object> - </child> <child> <object class="GtkTreeViewColumn" id="expander"> <property name="visible">False</property>

===================================== gajim/data/style/gajim.css ===================================== @@ -416,6 +416,9 @@ infobar.error > revealer > box { .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; }

+/* Roster */ +.roster treeview { padding-left: 4px; } + /* GroupChatRoster */ .groupchat-roster { border-left: 1px solid; border-color: @borders; }

===================================== gajim/gtk/roster.py ===================================== @@ -1,3 +1,4 @@ +import locale import logging from typing import Optional from enum import IntEnum @@ -7,9 +8,12 @@ from gi.repository import GObject

from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.const import StyleAttr from gajim.common.i18n import _

+from .util import EventHelper from .util import get_builder

log = logging.getLogger('gajim.gui.roster') @@ -23,12 +27,11 @@ class Column(IntEnum): AVATAR = 0 TEXT = 1 - EVENT = 2 - IS_CONTACT = 3 - NICK_OR_GROUP = 4 + IS_CONTACT = 2 + JID_OR_GROUP = 3

-class Roster(Gtk.ScrolledWindow): +class Roster(Gtk.ScrolledWindow, EventHelper):

__gsignals__ = { 'row-activated': ( @@ -39,11 +42,12 @@ class Roster(Gtk.ScrolledWindow):

def __init__(self, account): Gtk.ScrolledWindow.__init__(self) + EventHelper.__init__(self) self.set_size_request(300, -1) + self.get_style_context().add_class('roster')

self._account = account - - self._handler_ids = {} + self._client = app.get_client(account)

self._ui = get_builder('roster.ui') self._ui.roster_treeview.set_model(None) @@ -55,12 +59,19 @@ def __init__(self, account): self._group_refs = {}

self._store = self._ui.contact_store + self._store.set_sort_func(Column.TEXT, self._tree_compare_iters)

self._roster = self._ui.roster_treeview

+ self._ui.contact_column.set_cell_data_func(self._ui.text_renderer, + self._text_cell_data_func) self.connect('destroy', self._on_destroy) self._ui.connect_signals(self)

+ self.register_events([ + ('theme-update', ged.GUI2, self._on_theme_update), + ]) + self._initial_draw()

def _on_roster_row_activated(self, _treeview, path, _column): @@ -69,7 +80,7 @@ def _on_roster_row_activated(self, _treeview, path, _column): # This is a group row return

- nick = self._store[iter_][Column.NICK_OR_GROUP] + nick = self._store[iter_][Column.JID_OR_GROUP] self.emit('row-activated', nick)

def _on_roster_button_press_event(self, treeview, event): @@ -86,7 +97,7 @@ def _on_roster_button_press_event(self, treeview, event): # Group row return

- nick = self._store[iter_][Column.NICK_OR_GROUP] + nick = self._store[iter_][Column.JID_OR_GROUP]

if event.button == 3: # right click self._show_contact_menu(nick) @@ -98,27 +109,44 @@ 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, nick): pass

def _on_destroy(self, _roster): - for id_ in list(self._handler_ids.keys()): - if self._handler_ids[id_].handler_is_connected(id_): - self._handler_ids[id_].disconnect(id_) - del self._handler_ids[id_] - self._contact_refs = {} self._group_refs = {} self._roster.set_model(None) self._roster = None + # Store keeps a ref on the object if we dont 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)

+ def redraw(self): + self._roster.set_model(None) + self._roster.set_model(self._store) + self._roster.expand_all() + + def enable_sort(self, enable): + column = Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID + if enable: + column = Column.TEXT + + 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): client = app.get_client(self._account) for contact in client.get_module('Roster').iter_contacts(): @@ -126,6 +154,7 @@ def _initial_draw(self): contact.connect('avatar-update', self._on_avatar_update) self._add_contact(contact)

+ self.enable_sort(True) self.set_model() self._roster.expand_all()

@@ -143,7 +172,7 @@ def _add_contact(self, contact): group_iter = self._get_group_iter(group_name) if not group_iter: group_iter = self._store.append( - None, (None, group_name, None, False, group_name)) + 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 @@ -151,7 +180,7 @@ def _add_contact(self, contact): group_iter = self._get_group_iter(main_group) if not group_iter: group_iter = self._store.append( - None, (None, main_group, None, False, main_group)) + 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 @@ -160,7 +189,7 @@ def _add_contact(self, contact): surface = contact.get_avatar(AvatarSize.CHAT, self.get_scale_factor())

iter_ = self._store.append( - group_iter, (surface, contact.name, None, True, contact.name)) + group_iter, (surface, contact.name, True, str(contact.jid))) self._contact_refs[contact.jid] = Gtk.TreeRowReference( self._store, self._store.get_path(iter_))

@@ -175,12 +204,16 @@ def draw_groups(self): for group in self._group_refs: self.draw_group(group)

- def draw_group(self, group): - group_iter = self._get_group_iter(group) + def draw_group(self, group_name): + group_iter = self._get_group_iter(group_name) if not group_iter: return

- self._store[group_iter][Column.TEXT] = group + 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: @@ -206,6 +239,12 @@ def draw_avatar(self, contact): AvatarSize.ROSTER, self.get_scale_factor()) self._store[iter_][Column.AVATAR] = surface

+ def _get_total_user_count(self): + count = 0 + for group_row in self._store: + count += self._store.iter_n_children(group_row.iter) + return count + def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: try: ref = self._group_refs[group_name] @@ -229,6 +268,54 @@ def _get_contact_iter(self, jid: str) -> Optional[Gtk.TreeIter]:

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_)) + style = 'contact' if has_parent else 'group' + + bgcolor = app.css_config.get_value('.gajim-%s-row' % style, + StyleAttr.BACKGROUND) + renderer.set_property('cell-background', bgcolor) + + color = app.css_config.get_value('.gajim-%s-row' % style, + StyleAttr.COLOR) + renderer.set_property('foreground', color) + + desc = app.css_config.get_font('.gajim-%s-row' % style) + renderer.set_property('font-desc', desc) + + if not has_parent: + renderer.set_property('weight', 600) + renderer.set_property('ypad', 6) + + def _tree_compare_iters(self, model, iter1, iter2, _user_data): + """ + Compare two iterators to sort them + """ + + is_contact = model.iter_parent(iter1) + if is_contact: + name1 = model[iter1][Column.TEXT] + name2 = model[iter2][Column.TEXT] + + 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]) + + if contact1.show != contact2.show: + return -1 if contact1.show > contact2.show else 1 + + return locale.strcoll(name1.lower(), name2.lower()) + + # Group + group1 = model[iter1][Column.JID_OR_GROUP] + group2 = model[iter2][Column.JID_OR_GROUP] + return -1 if group1 < group2 else 1 + def clear(self): self._contact_refs = {} self._group_refs = {}

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/06f2b6288c9ce8bf9dc4d521ed4fcc0cd...