Changeset 717
- Timestamp:
- 07/17/08 10:30:19 (5 months ago)
- Files:
-
- oss/jlib/examples/basic/client.py (modified) (2 diffs)
- oss/jlib/jlib/core/chat.py (modified) (2 diffs)
- oss/jlib/jlib/gui/chat.py (modified) (1 diff)
- oss/jlib/jlib/gui/connection.py (modified) (4 diffs)
- oss/jlib/jlib/gui/contact.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
oss/jlib/examples/basic/client.py
r712 r717 27 27 28 28 def start(self): 29 self.connection.emit(QtCore.SIGNAL("activateChat()")) 29 30 self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.contact) 30 31 self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.presence) … … 54 55 def openChat(self, contact): 55 56 widget = QtGui.QWidget() 56 chatUi = jlibChatWidget(str(contact.jid), parent=widget)57 self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), chatUi.qobj)57 chatUi = jlibChatWidget(str(contact.jid), chat=self.connection.chat, 58 parent=widget) 58 59 tab = self.tabWidget.addTab(widget, QtCore.QString(str(contact.jid))) 59 60 self.tabWidget.setCurrentIndex(tab) oss/jlib/jlib/core/chat.py
r709 r717 31 31 linkages = {("xmpp", "%s.message" % XMPP_CLIENT_NS): ("msgdisp", "inbox"), 32 32 ("msgdisp", "log"): ('logger', "inbox"), 33 ("msgdisp", "xmpp.normal"): ('msghandler', 'inbox'), 33 34 ("msgdisp", "xmpp.chat"): ('msghandler', 'inbox'), 34 35 ("msghandler", "outbox"): ('msgdisp', 'forward'), … … 97 98 if self.dataReady("inbox"): 98 99 m = self.recv("inbox") 99 self.qobj.emit(QtCore.SIGNAL("receivedMessage (PyQt_PyObject)"), m)100 self.qobj.emit(QtCore.SIGNAL("receivedMessage.%s(PyQt_PyObject)" % str(m.from_jid.nodeid())), m) 100 101 101 102 if not self.anyReady(): oss/jlib/jlib/gui/chat.py
r710 r717 8 8 9 9 class jlibChatWidget(QtGui.QWidget, Ui_jlibChat): 10 def __init__(self, contact_jid, parent=None):10 def __init__(self, contact_jid, chat, parent=None): 11 11 QtGui.QWidget.__init__(self, parent) 12 self.qobj = chat 13 self.contact_jid = contact_jid 12 14 self.setupUi(parent=parent) 13 self.contact_jid = contact_jid14 15 15 16 def setupUi(self, parent=None): 16 17 Ui_jlibChat.setupUi(self, parent) 17 18 QtCore.QObject.connect(self.message, QtCore.SIGNAL("returnPressed()"), self.sendMessage) 18 19 self.qobj = jlibChat(parent=self) 20 self.qobj.setComponent(jlibChatComponent()) 21 QtCore.QObject.connect(self.qobj, QtCore.SIGNAL("receivedMessage(PyQt_PyObject)"), 19 QtCore.QObject.connect(self.qobj, QtCore.SIGNAL("receivedMessage.%s(PyQt_PyObject)" % self.contact_jid), 22 20 self.receivedMessage) 23 21 oss/jlib/jlib/gui/connection.py
r709 r717 4 4 from jlib.gui.connectionui import Ui_jlibConnection 5 5 from jlib.core.connection import jlibConnection, jlibConnectionComponent 6 from jlib.core.chat import jlibChat, jlibChatComponent 6 7 7 8 __all__ = ['jlibConnectionWidget', 'jlibConnectionDialog'] … … 12 13 self.setupUi(parent=parent) 13 14 15 self.chat = None 16 14 17 def setupUi(self, parent=None): 15 18 Ui_jlibConnection.setupUi(self, parent) … … 18 21 QtCore.QObject.connect(self, QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), 19 22 self.registerLinkages) 23 QtCore.QObject.connect(self, QtCore.SIGNAL("activateChat()"), self.enableChat) 20 24 21 25 def accepted(self): … … 36 40 self.qobj.emit(QtCore.SIGNAL("shutdown()")) 37 41 42 def enableChat(self): 43 self.chat = jlibChat(parent=self) 44 self.chat.setComponent(jlibChatComponent()) 45 self.registerLinkages(self.chat) 46 38 47 def registerLinkages(self, qobj): 39 48 components, linkages = qobj.getLinkages() oss/jlib/jlib/gui/contact.py
r715 r717 37 37 QtCore.QObject.connect(self.presence, QtCore.SIGNAL("requestedSubscription(PyQt_PyObject)"), 38 38 self.requestedSubscription) 39 40 39 41 40 model = jlibContactModel(parent=self.contacts) 42 41 self.contacts.setModel(model)
