Changeset 751

Timestamp:

07/29/08 15:34:38 (4 months ago)

Author:

sylvain

Message:

added distinction between creation of collection and leaf node

Files:

• oss/jlib/examples/basic/client.py (modified) (2 diffs)
• oss/jlib/jlib/core/connection.py (modified) (1 diff)
• oss/jlib/jlib/core/pubsub.py (modified) (2 diffs)
• oss/jlib/jlib/gui/pubsub/node.py (modified) (3 diffs)

oss/jlib/examples/basic/client.py

@@ -123 +123 @@
-        QtCore.QObject.connect(disco, QtCore.SIGNAL("receivedSubscriptions(PyQt_PyObject)"),
-                               self.setSubscriptionsModel)
-
+#
-        if self.options.rootnode:
-            disco.emit(QtCore.SIGNAL("discoverNodeInformation(PyQt_PyObject)"), 
@@ -173 +173 @@
-
-    def messageReceived(self, message):
+        # let's bypass empty messages
+        if not message.bodies and not message.event:
+            return
+
-        contact_jid = str(message.from_jid.nodeid())
-        if contact_jid not in self.openedChats:

oss/jlib/jlib/core/connection.py

@@ -220 +220 @@
-            if self.dataReady("unhandled"):
-                msg = self.recv('unhandled')
-
+#
-                
-            if self.dataReady("inbox"):

oss/jlib/jlib/core/pubsub.py

@@ -369 +369 @@
-    def __init__(self, parent=None):
-        QAxonObject.__init__(self, parent)
-Node(PyQt_PyObject)"), self.create
-
-  
+LeafNode(PyQt_PyObject)"), self.createLeaf
+ 
+
-        QtCore.QObject.connect(self, QtCore.SIGNAL("deleteNode(PyQt_PyObject)"), self.deleteNode)  
-        QtCore.QObject.connect(self, QtCore.SIGNAL("subscribeNode(PyQt_PyObject)"), self.subscribeNode)  
@@ -428 +428 @@
-        return dict(itemshandler=self.component, pubsubdisp=PubSubDispatcher()), linkages
-        
-
+Leaf
-        self._deliver(node_id, 'request-create-node')
-

oss/jlib/jlib/gui/pubsub/node.py

@@ -35 +35 @@
-        QtGui.QMessageBox.warning(self, "Error", repr(node.error), QtGui.QMessageBox.Ok)
-    
-
+Leaf
-        ui = jlibCreateNodeDialog()
-        ui.show()
+        model = self.nodes.model()
+        if model:
+            index = self.nodes.currentIndex()
+            if index.isValid():
+                item = model.itemFromIndex(index)
+                ui.nodeName.setText(item.node)
-        if ui.exec_() == QtGui.QDialog.Accepted:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def deleteNode(self):
@@ -84 +102 @@
-        if not item:
-            menu = QtGui.QMenu(self.parent())
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            menu.exec_(event.globalPos())
-        elif item.type() == jlibNodeItem.TYPE:
@@ -98 +123 @@
-                                   self.publishAtomEntry)
-            publishMenu.addAction(actionPublishAtomEntry)
+
+            actionNewLeafNode = QtGui.QAction(QtCore.QString("Create leaf node"), self.parent())
+            QtCore.QObject.connect(actionNewLeafNode, QtCore.SIGNAL("triggered()"),
+                                   self.createLeafNode)
+            menu.addAction(actionNewLeafNode)
+
+            actionNewCollectionNode = QtGui.QAction(QtCore.QString("Create collection node"), self.parent())
+            QtCore.QObject.connect(actionNewCollectionNode, QtCore.SIGNAL("triggered()"),
+                                   self.createCollectionNode)
+            menu.addAction(actionNewCollectionNode)
-
-            actionDeleteNode = QtGui.QAction(QtCore.QString("Delete node"), self.parent())