Changeset 712

Timestamp:

07/09/08 10:27:39 (5 months ago)

Author:

sylvain

Message:

Solified roster/presence management between contacts

Files:

• oss/jlib/designer/ui/subscriptiondialog.ui (added)
• oss/jlib/examples/basic/client.py (modified) (1 diff)
• oss/jlib/jlib/core/contact.py (modified) (10 diffs)
• oss/jlib/jlib/gui/contact.py (modified) (4 diffs)
• oss/jlib/jlib/gui/subscriptiondialog.py (added)
• oss/jlib/jlib/gui/subscriptiondialogui.py (added)

oss/jlib/examples/basic/client.py

@@ -56 +56 @@
-        chatUi = jlibChatWidget(str(contact.jid), parent=widget)
-        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), chatUi.qobj)
-
+
+
-
-       

oss/jlib/jlib/core/contact.py

@@ -26 +26 @@
-        QtCore.QObject.connect(self, QtCore.SIGNAL("removeContact(PyQt_PyObject)"),
-                               self.removeContact) 
+        QtCore.QObject.connect(self, QtCore.SIGNAL("addContact(PyQt_PyObject)"),
+                               self.addContact)  
+        QtCore.QObject.connect(self, QtCore.SIGNAL("addContact(PyQt_PyObject, PyQt_PyObject)"),
+                               self.addContactWithGroups) 
-
-    def setComponent(self, component):
@@ -32 +36 @@
-        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'pushed')
-        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'remove')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'add')
-
-    def getLinkages(self):
@@ -45 +50 @@
-        self._deliver(contact_jid, 'remove')
-
+    def addContact(self, contact_jid):
+        self._deliver((contact_jid, []), 'add')
+        
+    def addContactWithGroups(self, contact_jid, groups):
+        self._deliver((contact_jid, groups), 'add')
+
-class jlibContactComponent(component):    
-    Inboxes = {"inbox"        : "headstock.api.contact.Roster instance",
@@ -50 +61 @@
-               "pushed"       : "roster stanzas pushed by the server",
-               "remove"       : "",
+               "add"          : "",
-               "jid"          : "headstock.api.jid.JID instance received from the server",
-               "ask-activity" : "request activity status to the server for each roster contact"}
@@ -93 +105 @@
-                for nodeid in roster.items:
-                    contact = roster.items[nodeid]
-== 'remove'
+in ['remove', 'none']
-                        self.qobj.emit(QtCore.SIGNAL("removedContact(PyQt_PyObject)"), contact)
-== 'from'
+in ['both', 'from']
-                        self.qobj.emit(QtCore.SIGNAL("addedContact(PyQt_PyObject)"), contact)
-                    self.send(Roster(from_jid=self.from_jid, to_jid=nodeid,
-                                     type=u'result', stanza_id=generate_unique()), 'result')
+
+                    if contact.subscription == 'none':
+                        r = Roster(from_jid=self.from_jid, to_jid=nodeid,
+                           type=u'set', stanza_id=generate_unique())
+                        i = Item(nodeid)
+                        i.subscription = u'remove'
+                        r.items[nodeid] = i
+                        self.send(r, 'result')
-                    
-            if self.dataReady('remove'):
@@ -110 +130 @@
-                self.send(r, 'result')
-
+            if self.dataReady('add'):
+                contact_jid, groups = self.recv('add')
+                contact_jid = str(contact_jid)
+                r = Roster(from_jid=self.from_jid, to_jid=contact_jid,
+                           type=u'set', stanza_id=generate_unique())
+                i = Item(contact_jid)
+                i.groups = groups[:]
+                r.items[contact_jid] = i
+                self.send(r, 'result')
+
-            if self.dataReady("inbox"):
-                roster = self.recv("inbox")
@@ -138 +168 @@
-        QtGui.QStandardItemModel.__init__(self, parent)
-        self.roster = None
+        self.groups = {}
-
-    def setRoster(self, roster):
@@ -143 +174 @@
-        for nodeid in roster.items:
-            contact = roster.items[nodeid]
-
-
+
-
-    def getContact(self, index):
-        return self.roster.items.values()[index.row()]
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return QtCore.QModelIndex()
+
+    def getGroupIndex(self, group):
+        if group in self.groups:
+            return self.groups[group]
-
-    def deleteContact(self, contact):
@@ -167 +212 @@
-            self.removeRow(index.row(), index.parent())
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
-        nodejid = str(contact.jid)
-        self.setData(self.index(item.row(), 0), 
-                     QtCore.QVariant(QtCore.QString(nodejid)))
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-class jlibPresence(QAxonObject):
@@ -184 +245 @@
-                               self.rejectSubscription)   
-        QtCore.QObject.connect(self, QtCore.SIGNAL("requestSubscription(PyQt_PyObject)"),
-
+ 
-        QtCore.QObject.connect(self, QtCore.SIGNAL("requestUnsubscription(PyQt_PyObject)"),
-                               self.requestUnsubscription)

oss/jlib/jlib/gui/contact.py

@@ -5 +5 @@
-from jlib.core.contact import jlibContact, jlibContactComponent, \
-    jlibContactModel, jlibPresence, jlibPresenceComponent
+from jlib.gui.subscriptiondialog import jlibSubscriptionDialog
-
-__all__ = ['jlibContactWidget']
@@ -55 +56 @@
-    def addedContact(self, contact):
-        model = self.contacts.model()
-add
+set
-
-    def clicked(self, index):
@@ -83 +84 @@
-                self.contact.emit(QtCore.SIGNAL("removeContact(PyQt_PyObject)"), contact.jid)
-
+    def subscribeToContact(self):
+        ui = jlibSubscriptionDialog()
+        ui.show()
+        if ui.exec_() == QtGui.QDialog.Accepted:
+            contact_jid = unicode(ui.contactJid.text())
+            group = []
+            if not ui.group.text().isEmpty():
+                group.append(unicode(ui.group.text()))
+            self.contact.emit(QtCore.SIGNAL("addContact(PyQt_PyObject, PyQt_PyObject)"),
+                              contact_jid, group)
+            self.presence.emit(QtCore.SIGNAL("requestSubscription(PyQt_PyObject)"), contact_jid)
+
-    def contextMenuEvent(self, event):
-        menu = QtGui.QMenu(self.parent())
@@ -88 +101 @@
-        QtCore.QObject.connect(actionUnsub, QtCore.SIGNAL("triggered()"), self.unsubscribeFromContact)
-        menu.addAction(actionUnsub)
+        actionSub = QtGui.QAction(QtCore.QString("Subscribe to contact..."), self.parent())
+        QtCore.QObject.connect(actionSub, QtCore.SIGNAL("triggered()"), self.subscribeToContact)
+        menu.addAction(actionSub)
-        menu.exec_(event.globalPos())
-