1 files changed, 36 insertions, 61 deletions
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 1296872..690515d 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -6,25 +6,21 @@
 
 #include "Roster/QtTreeWidget.h"
 
-#include <QMenu>
-#include <QContextMenuEvent>
-#include <QInputDialog>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#include <QUrl>
+
 #include "Swiften/Base/Platform.h"
 #include "Swift/Controllers/Roster/ContactRosterItem.h"
 #include "Swift/Controllers/Roster/GroupRosterItem.h"
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h"
-#include "Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h"
-#include "Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h"
-#include "Swift/Controllers/UIEvents/RenameGroupUIEvent.h"
+#include "Swift/Controllers/UIEvents/SendFileUIEvent.h"
 #include "QtSwiftUtil.h"
-#include "QtContactEditWindow.h"
 
 namespace Swift {
 
-QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, QWidget* parent) : QTreeView(parent), editable_(false) {
+QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, QWidget* parent) : QTreeView(parent) {
 	eventStream_ = eventStream;
 	model_ = new RosterModel(this);
 	setModel(model_);
@@ -38,6 +34,9 @@ QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, QWidget* parent) : QTreeV
 	expandAll();
 	setAnimated(true);
 	setIndentation(0);
+#ifdef SWIFT_EXPERIMENTAL_FT
+	setAcceptDrops(true);
+#endif
 	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)));
@@ -89,21 +88,20 @@ QModelIndexList QtTreeWidget::getSelectedIndexes() const {
 }
 
 void QtTreeWidget::currentChanged(const QModelIndex& current, const QModelIndex& previous) {
-	bool valid = false;
+	RosterItem* item = NULL;
 	QModelIndexList selectedIndexList = getSelectedIndexes();
-	if (!editable_ || selectedIndexList.empty() || !selectedIndexList[0].isValid()) {
+	if (selectedIndexList.empty() || !selectedIndexList[0].isValid()) {
 		/* I didn't quite understand why using current didn't seem to work here.*/
 	}
 	else if (current.isValid()) {
-		RosterItem* item = static_cast<RosterItem*>(current.internalPointer());
-		if (dynamic_cast<ContactRosterItem*>(item)) {
-			valid = true;
-		}
+		item = static_cast<RosterItem*>(current.internalPointer());
+		item = dynamic_cast<ContactRosterItem*>(item);
 	}
-	onSomethingSelectedChanged(valid);
+	onSomethingSelectedChanged(item);
 	QTreeView::currentChanged(current, previous);
 }
 
+
 void QtTreeWidget::handleItemActivated(const QModelIndex& index) {
 	RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
@@ -112,62 +110,39 @@ void QtTreeWidget::handleItemActivated(const QModelIndex& index) {
 	}
 }
 
-void QtTreeWidget::handleEditUserActionTriggered(bool /*checked*/) {
-	if (!editable_) {
-		return;
-	}
-	QModelIndexList selectedIndexList = getSelectedIndexes();
-	if (selectedIndexList.empty()) {
-		return;
-	}
-	QModelIndex index = selectedIndexList[0];
-	if (!index.isValid()) {
-		return;
-	}
-	RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
-	if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
-		eventStream_->send(boost::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
+void QtTreeWidget::dragEnterEvent(QDragEnterEvent *event) {
+	if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
+		event->acceptProposedAction();
 	}
 }
 
-void QtTreeWidget::contextMenuEvent(QContextMenuEvent* event) {
-	if (!editable_) {
-		return;
-	}
+void QtTreeWidget::dropEvent(QDropEvent *event) {
 	QModelIndex index = indexAt(event->pos());
-	if (!index.isValid()) {
-		return;
-	}
-	RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
-	QMenu contextMenu;
-	if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
-		QAction* editContact = contextMenu.addAction(tr("Edit"));
-		QAction* removeContact = contextMenu.addAction(tr("Remove"));
-		QAction* result = contextMenu.exec(event->globalPos());
-		if (result == editContact) {
-			eventStream_->send(boost::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
-		}
-		else if (result == removeContact) {
-			if (QtContactEditWindow::confirmContactDeletion(contact->getJID())) {
-				eventStream_->send(boost::make_shared<RemoveRosterItemUIEvent>(contact->getJID()));
+	if (index.isValid()) {
+		RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
+		if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
+			if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) {
+				QString filename = event->mimeData()->urls().at(0).toLocalFile();
+				if (!filename.isEmpty()) {
+					eventStream_->send(boost::make_shared<SendFileUIEvent>(contact->getJID(), Q2PSTRING(filename)));
+				}
 			}
 		}
 	}
-	else if (GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item)) {
-		QAction* renameGroupAction = contextMenu.addAction(tr("Rename"));
-		QAction* result = contextMenu.exec(event->globalPos());
-		if (result == renameGroupAction) {
-			renameGroup(group);
-		}
-	}
 }
 
-void QtTreeWidget::renameGroup(GroupRosterItem* group) {
-	bool ok;
-	QString newName = QInputDialog::getText(NULL, tr("Rename group"), tr("Enter a new name for group '%1':").arg(P2QSTRING(group->getDisplayName())), QLineEdit::Normal, P2QSTRING(group->getDisplayName()), &ok);
-	if (ok) {
-		eventStream_->send(boost::make_shared<RenameGroupUIEvent>(group->getDisplayName(), Q2PSTRING(newName)));
+void QtTreeWidget::dragMoveEvent(QDragMoveEvent* event) {
+	QModelIndex index = indexAt(event->pos());
+	if (index.isValid()) {
+		RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
+		if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
+			if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) {
+				event->accept();
+				return;
+			}
+		}
 	}
+	event->ignore();
 }
 
 void QtTreeWidget::handleExpanded(const QModelIndex& index) {