Changeset 714

Timestamp:

07/10/08 10:33:29 (4 months ago)

Author:

sylvain

Message:

Started to add group model support as well as drag/drop between groups and contacts

Files:

• oss/jlib/designer/ui/contacts.ui (modified) (1 diff)
• oss/jlib/designer/ui/groupdialog.ui (added)
• oss/jlib/jlib/core/contact.py (modified) (7 diffs)
• oss/jlib/jlib/gui/contact.py (modified) (4 diffs)
• oss/jlib/jlib/gui/contactui.py (modified) (2 diffs)
• oss/jlib/jlib/gui/groupdialog.py (added)
• oss/jlib/jlib/gui/groupdialogui.py (added)
• oss/jlib/jlib/gui/subscriptiondialog.py (modified) (1 diff)

oss/jlib/designer/ui/contacts.ui

@@ -22 +22 @@
-    </rect>
-   </property>
+   <property name="dragEnabled" >
+    <bool>true</bool>
+   </property>
+   <property name="dragDropMode" >
+    <enum>QAbstractItemView::InternalMove</enum>
+   </property>
+   <property name="alternatingRowColors" >
+    <bool>true</bool>
+   </property>
-  </widget>
- </widget>

oss/jlib/jlib/core/contact.py

@@ -29 +29 @@
-                               self.addContact)  
-        QtCore.QObject.connect(self, QtCore.SIGNAL("addContact(PyQt_PyObject, PyQt_PyObject)"),
-
+
+
+
-
-    def setComponent(self, component):
@@ -172 +174 @@
-    def type(self):
-        return QtGui.QStandardItem.UserType + 102
+    
+    def flags(self):
+        return  QtCore.Qt.ItemIsDropEnabled | QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled
-
-class jlibContactModel(QtGui.QStandardItemModel):
@@ -178 +183 @@
-        self.contact_items = {}
-        self.group_items = {}
+
+    def flags(self, index):
+        if index.isValid():
+            item = self.itemFromIndex(index)
+            if item and item.type() == QtGui.QStandardItem.UserType + 102:
+                return item.flags()
+
+        return QtGui.QStandardItemModel.flags(self, index)
+
+    def mimeData(self, indexes):
+        mimeData = QtCore.QMimeData()
+        urls = []
+        for index in indexes:
+             if index.isValid():
+                 contact = self.getContact(index)
+                 urls.append(QtCore.QUrl('xmpp:%s' % str(contact.jid)))
+             
+        mimeData.setUrls(urls)
+        return mimeData
-
-    def setRoster(self, roster):
@@ -189 +213 @@
-        return self.itemFromIndex(index).type() == QtGui.QStandardItem.UserType + 101
-
+    def isAGroupItem(self, index):
+        return self.itemFromIndex(index).type() == QtGui.QStandardItem.UserType + 102
+    
-    def getContact(self, index):
-        return self.itemFromIndex(index).contact
+
+    def getContactByJID(self, contact_jid):
+        contact_jid = str(contact_jid)
+        if contact_jid in self.contact_items:
+            return self.contact_items[contact_jid].contact
+
+    def getContactItem(self, index):
+        return self.itemFromIndex(index)
-
-    def hasContact(self, contact_jid):
@@ -201 +236 @@
-        return QtCore.QModelIndex()
-
+    def getGroup(self, index):
+        return self.itemFromIndex(index).group
+
-    def getGroupIndex(self, group):
-        if group in self.group_items:
@@ -207 +245 @@
-        return QtCore.QModelIndex()
-
-
+Item
-        if group in self.group_items:
-            return self.group_items[group]
@@ -229 +267 @@
-        if contact.groups:
-            for group in contact.groups:
-
+Item
-                groupItem.appendRow(item)
-        else:

oss/jlib/jlib/gui/contact.py

@@ -6 +6 @@
-    jlibContactModel, jlibPresence, jlibPresenceComponent
-from jlib.gui.subscriptiondialog import jlibSubscriptionDialog
+from jlib.gui.groupdialog import jlibNewGroupDialog
-
-__all__ = ['jlibContactWidget']
@@ -18 +19 @@
-
-        self.contacts.contextMenuEvent = self.contextMenuEvent
+        self.contacts.dragEnterEvent = self.dragEnterEvent
-
-        self.contact = jlibContact(parent=self)
@@ -97 +99 @@
-            self.presence.emit(QtCore.SIGNAL("requestSubscription(PyQt_PyObject)"), contact_jid)
-
+    def createNewGroup(self):
+        ui = jlibNewGroupDialog()
+        ui.show()
+        if ui.exec_() == QtGui.QDialog.Accepted:
+            model = self.contacts.model()
+            model.setGroup(str(ui.group.text()))
+
-    def contextMenuEvent(self, event):
-        menu = QtGui.QMenu(self.parent())
@@ -104 +113 @@
-        menu.addAction(actionUnsub)
-
-...
+
-        QtCore.QObject.connect(actionSub, QtCore.SIGNAL("triggered()"), self.subscribeToContact)
-        menu.addAction(actionSub)
-
+        actionNewGroup = QtGui.QAction(QtCore.QString("Add a new group"), self.parent())
+        QtCore.QObject.connect(actionNewGroup, QtCore.SIGNAL("triggered()"), self.createNewGroup)
+        menu.addAction(actionNewGroup)
+
-        menu.exec_(event.globalPos())
-
+    def dragEnterEvent(self, event):
+        data = event.mimeData()
+        if not data.hasFormat('text/uri-list'):
+            event.ignore()
+            return
+        
+        model = self.contacts.model()
+        index = self.contacts.indexAt(event.pos())
+        parentIndex = index.parent()
+        if parentIndex.isValid() and model.isAGroupItem(parentIndex):
+            group = model.getGroup(parentIndex)
+            contact = model.getContact(index)
+            if group in contact.groups:
+                contact.groups.remove(group)
+
+        event.accept()
+
+    def dropEvent(self, event):
+        model = self.contacts.model()
+        
+        index = self.contacts.indexAt(event.pos())
+        parentIndex = index.parent()
+        group = model.getGroup(parentIndex)
+        
+        urls = event.data().urls()
+        for url in urls:
+            xmppUrl = str(url.toString())
+            jid = xmppUrl[5:]
+            contact = model.getContactByJID(jid)
+            contact.groups.append(group)
+
+        print contact.groups
+            
+            
+

oss/jlib/jlib/gui/contactui.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
-
-designer/ui/
+
-#
-Sun Jul  6 12:03:40
-3.3
+Thu Jul 10 17:31:17
+4.2
-#
-# WARNING! All changes made in this file will be lost!
@@ -13 +13 @@
-    def setupUi(self, jlibContacts):
-        jlibContacts.setObjectName("jlibContacts")
-
-
+
-        self.contacts = QtGui.QTreeView(jlibContacts)
-        self.contacts.setGeometry(QtCore.QRect(4,4,316,408))
+        self.contacts.setDragEnabled(True)
+        self.contacts.setDragDropMode(QtGui.QAbstractItemView.InternalMove)
+        self.contacts.setAlternatingRowColors(True)
-        self.contacts.setObjectName("contacts")
-

oss/jlib/jlib/gui/subscriptiondialog.py

@@ -4 +4 @@
-from jlib.gui.subscriptiondialogui import Ui_jlibsubscriptiondialog
-
+__all__ = ['jlibSubscriptionDialog']
+
-class jlibSubscriptionDialog(QtGui.QDialog, Ui_jlibsubscriptiondialog):
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-
-
-
-
+