Changeset 718

Timestamp:

07/18/08 06:03:22 (5 months ago)

Author:

sylvain

Message:

more work on managing contacts and their chats

Files:

• oss/jlib/examples/basic/client.py (modified) (5 diffs)
• oss/jlib/jlib/core/chat.py (modified) (1 diff)
• oss/jlib/jlib/core/connection.py (modified) (4 diffs)
• oss/jlib/jlib/gui/chat.py (modified) (1 diff)
• oss/jlib/jlib/gui/connection.py (modified) (3 diffs)
• oss/jlib/jlib/gui/contact.py (modified) (1 diff)

oss/jlib/examples/basic/client.py

@@ -6 +6 @@
-from jlib.gui.chat import jlibChatWidget
-from jlib.gui.contact import jlibContactWidget
+from jlib.core.chat import jlibChat, jlibChatComponent
-
-from clientui import Ui_MainWindow
@@ -12 +13 @@
-    def setupUi(self, parent):
-        Ui_MainWindow.setupUi(self, parent)
-
+
+
-        QtCore.QObject.connect(self.actionStart, QtCore.SIGNAL("triggered()"), self.start)
-        QtCore.QObject.connect(self.actionStop, QtCore.SIGNAL("triggered()"), self.stop)
@@ -19 +21 @@
-        self.actionStart.setEnabled(False)
-        self.actionStop.setEnabled(False)
+
+        self.openedChats = []
-
-        self.connection = None
@@ -27 +31 @@
-
-    def start(self):
+        QtCore.QObject.connect(self.connection.qobj, QtCore.SIGNAL("sessionReady(PyQt_PyObject)"), 
+                               self.clientReady)
-        self.connection.emit(QtCore.SIGNAL("activateChat()"))
-        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.contact)
@@ -52 +58 @@
-            self.actionStart.setEnabled(True)
-            self.actionStop.setEnabled(True)
+
+    def clientReady(self, jid):
+        QtCore.QObject.connect(self.connection.qobj.chat, QtCore.SIGNAL("receivedMessage(PyQt_PyObject)"), 
+                               self.messageReceived)
+
+    def messageReceived(self, message):
+        contact_jid = str(message.from_jid.nodeid())
+        if contact_jid not in self.openedChats:
+            self._openChat(contact_jid)
+            self.openedChats.append(contact_jid)
+
+        chat = self.connection.qobj.chat
+        chat.emit(QtCore.SIGNAL("receivedMessage.%s(PyQt_PyObject)" % contact_jid), message)
-        
-    def openChat(self, contact):
+        self._openChat(str(contact.jid))
+
+    def _openChat(self, contact_jid):
-        widget = QtGui.QWidget()
-str(contact.jid), chat=self.connection
+contact_jid, chat=self.connection.qobj
-                                parent=widget)
-str(contact.jid)
+contact_jid
-        self.tabWidget.setCurrentIndex(tab)
-

oss/jlib/jlib/core/chat.py

@@ -98 +98 @@
-            if self.dataReady("inbox"):
-                m = self.recv("inbox")
-.%s(PyQt_PyObject)" % str(m.from_jid.nodeid())
+(PyQt_PyObject)"
-
-            if not self.anyReady():

oss/jlib/jlib/core/connection.py

@@ -22 +22 @@
-
-from jlib.core.qaxon import QAxonObject
+from jlib.core.chat import jlibChat, jlibChatComponent
-
-__all__ = ['jlibConnection', 'jlibConnectionComponent']
@@ -32 +33 @@
-        QtCore.QObject.connect(self, QtCore.SIGNAL("registerComponents(PyQt_PyObject, PyQt_PyObject)"), 
-                               self.registerComponents)
+        QtCore.QObject.connect(self, QtCore.SIGNAL("activateChat()"), self.enableChat)
-
-    def start(self):
@@ -41 +43 @@
-    def registerComponents(self, components, linkages):
-        self.component.registerComponents(components, linkages)
+
+    def enableChat(self):
+        self.chat = jlibChat()
+        self.chat.setComponent(jlibChatComponent())
+        components, linkages = self.chat.getLinkages()
+        self.registerComponents(components, linkages)
+        
+    def messageReceived(self, message):
+        print message
-
-class jlibConnectionComponent(component):
@@ -199 +210 @@
-            if self.dataReady("jid"):
-                self.jid = self.recv('jid')
+                self.qobj.emit(QtCore.SIGNAL("sessionReady(PyQt_PyObject)"), self.jid)
-                
-            if not self.anyReady():

oss/jlib/jlib/gui/chat.py

@@ -17 +17 @@
-        Ui_jlibChat.setupUi(self, parent)
-        QtCore.QObject.connect(self.message, QtCore.SIGNAL("returnPressed()"), self.sendMessage)
-elf.contact_jid
+tr(self.contact_jid)
-                               self.receivedMessage)
-

oss/jlib/jlib/gui/connection.py

@@ -4 +4 @@
-from jlib.gui.connectionui import Ui_jlibConnection
-from jlib.core.connection import jlibConnection, jlibConnectionComponent
-from jlib.core.chat import jlibChat, jlibChatComponent
-
-__all__ = ['jlibConnectionWidget', 'jlibConnectionDialog']
@@ -12 +11 @@
-        QtGui.QWidget.__init__(self, parent)
-        self.setupUi(parent=parent)
-
-        self.chat = None
-
-    def setupUi(self, parent=None):
@@ -41 +38 @@
-
-    def enableChat(self):
-
-
-
+
-        
-    def registerLinkages(self, qobj):

oss/jlib/jlib/gui/contact.py

@@ -121 +121 @@
-        menu.addAction(actionNewGroup)
-
+        actionChangeGroup = QtGui.QAction(QtCore.QString("Change group"), self.parent())
+        QtCore.QObject.connect(actionChangeGroup, QtCore.SIGNAL("triggered()"), self.changeGroup)
+        menu.addAction(actionChangeGroup)
+
-        menu.exec_(event.globalPos())
-
-    def dragEnterEvent(self, event):
+        event.ignore()
+
+
+
-        data = event.mimeData()
-        model = self.contacts.model()