3 files changed, 36 insertions, 2 deletions
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 64d0fcf..99f1f34 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -42,6 +42,7 @@ QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, SettingsProvider* setting
 #ifdef SWIFT_EXPERIMENTAL_FT
 	setAcceptDrops(true);
 #endif
+	setDragEnabled(true);
 	setRootIsDecorated(true);
 	connect(this, SIGNAL(activated(const QModelIndex&)), this, SLOT(handleItemActivated(const QModelIndex&)));
 	connect(model_, SIGNAL(itemExpanded(const QModelIndex&, bool)), this, SLOT(handleModelItemExpanded(const QModelIndex&, bool)));
@@ -157,7 +158,7 @@ void QtTreeWidget::dragMoveEvent(QDragMoveEvent* event) {
 			}
 		}
 	}
-	event->ignore();
+	QTreeView::dragMoveEvent(event);
 }
 
 void QtTreeWidget::handleExpanded(const QModelIndex& index) {
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index 1b93047..3791ffa 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -10,6 +10,7 @@
 
 #include <QColor>
 #include <QIcon>
+#include <QMimeData>
 #include <qdebug.h>
 
 #include "Swiften/Elements/StatusShow.h"
@@ -55,7 +56,7 @@ void RosterModel::reLayout() {
 
 void RosterModel::handleChildrenChanged(GroupRosterItem* /*group*/) {
 	reLayout();
-}								
+}
 
 void RosterModel::handleDataChanged(RosterItem* item) {
 	Q_ASSERT(item);
@@ -65,6 +66,14 @@ void RosterModel::handleDataChanged(RosterItem* item) {
 	}
 }
 
+Qt::ItemFlags RosterModel::flags(const QModelIndex& index) const {
+	Qt::ItemFlags flags = QAbstractItemModel::flags(index);
+	if (dynamic_cast<GroupRosterItem*>(getItem(index)) == NULL) {
+		flags |= Qt::ItemIsDragEnabled;
+	}
+	return flags;
+}
+
 int RosterModel::columnCount(const QModelIndex& /*parent*/) const {
 	return 1;
 }
@@ -230,4 +239,25 @@ int RosterModel::rowCount(const QModelIndex& parent) const {
 	return count;
 }
 
+QMimeData* RosterModel::mimeData(const QModelIndexList& indexes) const {
+	QMimeData* data = QAbstractItemModel::mimeData(indexes);
+
+	ContactRosterItem *item = dynamic_cast<ContactRosterItem*>(getItem(indexes.first()));
+	if (item == NULL) {
+		return data;
+	}
+
+	QByteArray itemData;
+	QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+
+	// jid, chatName, activity, statusType, avatarPath
+	dataStream << P2QSTRING(item->getJID().toString());
+	dataStream << P2QSTRING(item->getDisplayName());
+	dataStream << P2QSTRING(item->getStatusText());
+	dataStream << item->getSimplifiedStatusShow();
+	dataStream << P2QSTRING(item->getAvatarPath().string());
+	data->setData("application/vnd.swift.contact-jid", itemData);
+	return data;
+}
+
 }
diff --git a/Swift/QtUI/Roster/RosterModel.h b/Swift/QtUI/Roster/RosterModel.h
index 23d54f8..cae80c4 100644
--- a/Swift/QtUI/Roster/RosterModel.h
+++ b/Swift/QtUI/Roster/RosterModel.h
@@ -29,12 +29,15 @@ namespace Swift {
 			RosterModel(QtTreeWidget* view);
 			~RosterModel();
 			void setRoster(Roster* swiftRoster);
+			Qt::ItemFlags flags(const QModelIndex& index) const;
 			int columnCount(const QModelIndex& parent = QModelIndex()) const;
 			QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
 			QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const;
 			QModelIndex index(RosterItem* item) const;
 			QModelIndex parent(const QModelIndex& index) const;
 			int rowCount(const QModelIndex& parent = QModelIndex()) const;
+			QMimeData* mimeData(const QModelIndexList& indexes) const;
+
 		signals:
 			void itemExpanded(const QModelIndex& item, bool expanded);
 		private: