libervia-desktop: cagou/plugins/plugin_wid_contact

comparison cagou/plugins/plugin_wid_contact_list.py @ 219:9faccd140119

plugin contact list: refactoring: - contacts are now displayed in a grid - they can be filtered thanks to FilterBehaviour - use the new update system of QuickContactList - a new "add a contact" button is visible, but not implemented yet.

author	Goffi <goffi@goffi.org>
date	Sun, 24 Jun 2018 22:26:15 +0200
parents	0ddd2b20cc6b
children	e1a385a791cc

comparison

equal deleted inserted replaced

-:30be583dbabc
+:9faccd140119
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from sat.core import log as logging
 log = logging.getLogger(__name__)
+from cagou.core.constants import Const as C
 from sat.core.i18n import _
 from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
 from sat_frontends.tools import jid
 from kivy.uix.boxlayout import BoxLayout
-from kivy.uix.listview import ListView
+from kivy.uix.behaviors import ButtonBehavior
-from kivy.adapters.listadapter import ListAdapter
+from cagou.core.utils import FilterBehavior
 from kivy.metrics import dp
 from kivy import properties
 from cagou.core import cagou_widget
 from cagou.core import image
 from cagou import G
+import bisect
 PLUGIN_INFO = {
 "name": _(u"contacts"),
 "main": "ContactList",
 class Avatar(image.Image):
 pass
-class ContactItem(BoxLayout):
+class ContactItem(ButtonBehavior, BoxLayout):
+base_width = dp(150)
 data = properties.DictProperty()
 jid = properties.StringProperty('')
 def __init__(self, **kwargs):
 super(ContactItem, self).__init__(**kwargs)
-def on_touch_down(self, touch):
+def on_release(self):
-if self.collide_point(*touch.pos):
+# XXX: for now clicking on an item launch the corresponding Chat widget
-# XXX: for now clicking on an item launch the corresponding Chat widget
+#      behaviour should change in the future
-#      behaviour should change in the future
+try:
-try:
+# FIXME: Q&D way to get chat plugin, should be replaced by a clean method
-# FIXME: Q&D way to get chat plugin, should be replaced by a clean method
+#        in host
-#        in host
+plg_infos = [p for p in G.host.getPluggedWidgets()
-plg_infos = [p for p in G.host.getPluggedWidgets() if 'chat' in p['import_name']][0]
+if 'chat' in p['import_name']][0]
 except IndexError:
 log.warning(u"No plugin widget found to display chat")
 else:
 factory = plg_infos['factory']
-G.host.switchWidget(self, factory(plg_infos, jid.JID(self.jid), profiles=iter(G.host.profiles)))
+G.host.switchWidget(self, factory(plg_infos,
+jid.JID(self.jid),
+profiles=iter(G.host.profiles)))
-class ContactListView(ListView):
+class ContactList(QuickContactList, cagou_widget.CagouWidget, FilterBehavior):
-pass
+float_layout = properties.ObjectProperty()
+layout = properties.ObjectProperty()
-class ContactList(QuickContactList, cagou_widget.CagouWidget):
 def __init__(self, host, target, profiles):
 QuickContactList.__init__(self, G.host, profiles)
 cagou_widget.CagouWidget.__init__(self)
-self.adapter = ListAdapter(data={},
+FilterBehavior.__init__(self)
-cls=ContactItem,
+self._wid_map = {}  # (profile, bare_jid) to widget map
-args_converter=self.contactDataConverter,
-selection_mode='multiple',
-allow_empty_selection=True,
-)
-self.add_widget(ContactListView(adapter=self.adapter))
 self.postInit()
-self.update()
+if len(self.profiles) != 1:
+raise NotImplementedError('multi profiles is not implemented yet')
+self.update(profile=next(iter(self.profiles)))
 def onHeaderInputComplete(self, wid, text):
-# FIXME: this is implementation dependent, need to be done properly
+self.do_filter(self.layout.children,
-items = self.children[0].children[0].children[0].children
+text,
+lambda c: c.jid,
+width_cb=lambda c: c.base_width,
+height_cb=lambda c: c.minimum_height,
+)
-for item in items:
+def _addContactItem(self, bare_jid, profile):
-if text not in item.ids.jid_label.text:
+"""Create a new ContactItem instance, and add it
-item.height = 0
-item.opacity = 0
-else:
-item.height = dp(50)
-item.opacity = 1
-def contactDataConverter(self, idx, bare_jid):
+item will be added in a sorted position
-return {"jid": bare_jid, "data": self._items_cache[bare_jid]}
+@param bare_jid(jid.JID): entity bare JID
+@param profile(unicode): profile where the contact is
+"""
+data = G.host.contact_lists[profile].getItem(bare_jid)
+wid = ContactItem(data=data, jid=bare_jid)
+child_jids = [c.jid for c in reversed(self.layout.children)]
+idx = bisect.bisect_right(child_jids, bare_jid)
+self.layout.add_widget(wid, -idx)
+self._wid_map[(profile, bare_jid)] = wid
 def update(self, entities=None, type_=None, profile=None):
 log.debug("update: %s %s %s" % (entities, type_, profile))
-# FIXME: for now we update on each event
+if type_ == None or type_ == C.UPDATE_STRUCTURE:
-# if entities is None and type_ is None:
+log.debug("full contact list update")
-self._items_cache = self.items_sorted
+self.layout.clear_widgets()
-self.adapter.data = self.items_sorted.keys()
+for bare_jid, data in self.items_sorted.iteritems():
+wid = ContactItem(data=data, jid=bare_jid)
+self.layout.add_widget(wid)
+self._wid_map[(profile, bare_jid)] = wid
+elif type_ == C.UPDATE_MODIFY:
+for entity in entities:
+entity_bare = entity.bare
+wid = self._wid_map[(profile, entity_bare)]
+wid.data = G.host.contact_lists[profile].getItem(entity_bare)
+elif type_ == C.UPDATE_ADD:
+for entity in entities:
+self._addContactItem(entity.bare, profile)
+elif type_ == C.UPDATE_DELETE:
+for entity in entities:
+try:
+self.layout.remove_widget(self._wid_map.pop((profile, entity.bare)))
+except KeyError:
+log.debug("entity not found: {entity}".format(entity=entity.bare))
+else:
+log.debug("update type not handled: {update_type}".format(update_type=type_))

Mercurial > libervia-desktop

comparison cagou/plugins/plugin_wid_contact_list.py @ 219:9faccd140119