Allow contacts to be dragged from the Chats tab into the search window

Change-Id: Ib1ecd2f95fb26269d8aa19094aac6e1f691cdf35
author: Richard Maudsley <richard.maudsley@isode.com> 2014-04-07 09:19:50 (GMT)
committer: Richard Maudsley <richard.maudsley@isode.com> 2014-04-07 13:07:43 (GMT)
commit: a7c7602e89d58056940885112f8764a31e9991da (patch)
tree: e713e2d7eed2c2ba2925ec0a70fe93eb707c077a /Swift/QtUI/ChatList
parent: 1a35178bcad7c30e50a19e4017d021fb0485ccf0 (diff)
download: swift-contrib-a7c7602e89d58056940885112f8764a31e9991da.zip
swift-contrib-a7c7602e89d58056940885112f8764a31e9991da.tar.bz2
4 files changed, 63 insertions, 13 deletions
diff --git a/Swift/QtUI/ChatList/ChatListModel.cpp b/Swift/QtUI/ChatList/ChatListModel.cpp
index 7913c61..d09b0dd 100644
--- a/Swift/QtUI/ChatList/ChatListModel.cpp
+++ b/Swift/QtUI/ChatList/ChatListModel.cpp
@@ -1,117 +1,157 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swift/QtUI/ChatList/ChatListModel.h>
 
+#include <QMimeData>
+#include <QUrl>
+
 #include <Swift/QtUI/ChatList/ChatListMUCItem.h>
 #include <Swift/QtUI/ChatList/ChatListRecentItem.h>
 #include <Swift/QtUI/ChatList/ChatListWhiteboardItem.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 ChatListModel::ChatListModel() : whiteboards_(NULL) {
 	root_ = new ChatListGroupItem("", NULL, false);
 	mucBookmarks_ = new ChatListGroupItem(tr("Bookmarked Rooms"), root_);
 	recents_ = new ChatListGroupItem(tr("Recent Chats"), root_, false);
 #ifdef SWIFT_EXPERIMENTAL_WB
 	whiteboards_ = new ChatListGroupItem(tr("Opened Whiteboards"), root_, false);
 	root_->addItem(whiteboards_);
 #endif
 
 	root_->addItem(recents_);
 	root_->addItem(mucBookmarks_);
 }
 
+Qt::ItemFlags ChatListModel::flags(const QModelIndex& index) const {
+	Qt::ItemFlags flags = QAbstractItemModel::flags(index);
+	if (dynamic_cast<ChatListRecentItem*>(getItemForIndex(index))) {
+		flags |= Qt::ItemIsDragEnabled;
+	}
+	return flags;
+}
+
 void ChatListModel::clearBookmarks() {
 	emit layoutAboutToBeChanged();
 	mucBookmarks_->clear();
 	emit layoutChanged();
 }
 
 void ChatListModel::addMUCBookmark(const Swift::MUCBookmark& bookmark) {
 	emit layoutAboutToBeChanged();
 	mucBookmarks_->addItem(new ChatListMUCItem(bookmark, mucBookmarks_));
 	emit layoutChanged();
 	//QModelIndex index = createIndex(mucBookmarks_->rowCount() - 1, 0, mucBookmarks_);
 	//emit dataChanged(index, index);
 	//emit dataChanged(parent(index), parent(index));
 }
 
 void ChatListModel::removeMUCBookmark(const Swift::MUCBookmark& bookmark) {
 	for (int i = 0; i < mucBookmarks_->rowCount(); i++) {
 		ChatListMUCItem* item = dynamic_cast<ChatListMUCItem*>(mucBookmarks_->item(i));
 		if (item->getBookmark() == bookmark) {
 			emit layoutAboutToBeChanged();
 			mucBookmarks_->remove(i);
 			emit layoutChanged();
 			break;
 		}
 	}
 }
 
 void ChatListModel::addWhiteboardSession(const ChatListWindow::Chat& chat) {
 	emit layoutAboutToBeChanged();
 	whiteboards_->addItem(new ChatListWhiteboardItem(chat, whiteboards_));
 	emit layoutChanged();
 }
 
 void ChatListModel::removeWhiteboardSession(const JID& jid) {
 	for (int i = 0; i < whiteboards_->rowCount(); i++) {
 		ChatListWhiteboardItem* item = dynamic_cast<ChatListWhiteboardItem*>(whiteboards_->item(i));
 		if (item->getChat().jid == jid) {
 			emit layoutAboutToBeChanged();
 			whiteboards_->remove(i);
 			emit layoutChanged();
 			break;
 		}
 	}
 }
 
 void ChatListModel::setRecents(const std::list<ChatListWindow::Chat>& recents) {
 	emit layoutAboutToBeChanged();
 	recents_->clear();
 	foreach (const ChatListWindow::Chat chat, recents) {
 		recents_->addItem(new ChatListRecentItem(chat, recents_));
 //whiteboards_->addItem(new ChatListRecentItem(chat, whiteboards_));
 	}
 	emit layoutChanged();
 }
 
+QMimeData* ChatListModel::mimeData(const QModelIndexList& indexes) const {
+	QMimeData* data = QAbstractItemModel::mimeData(indexes);
+	ChatListRecentItem *item = dynamic_cast<ChatListRecentItem*>(getItemForIndex(indexes.first()));
+	if (item == NULL) {
+		return data;
+	}
+
+	QByteArray itemData;
+	QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+	const ChatListWindow::Chat& chat = item->getChat();
+
+	QString mimeType = "application/vnd.swift.contact-jid-list";
+	if (!chat.impromptuJIDs.size()) {
+		if (chat.isMUC) {
+			mimeType = "application/vnd.swift.contact-jid-muc";
+		}
+		dataStream << P2QSTRING(chat.jid.toString());
+	} else {
+		typedef std::map<std::string, JID> JIDMap;
+		foreach (const JIDMap::value_type& jid, chat.impromptuJIDs) {
+			dataStream << P2QSTRING(jid.second.toString());
+		}
+	}
+
+	data->setData(mimeType, itemData);
+	return data;
+}
+
 int ChatListModel::columnCount(const QModelIndex& /*parent*/) const {
 	return 1;
 }
 
 ChatListItem* ChatListModel::getItemForIndex(const QModelIndex& index) const {
 	return index.isValid() ? static_cast<ChatListItem*>(index.internalPointer()) : NULL;
 }
 
 QVariant ChatListModel::data(const QModelIndex& index, int role) const {
 	ChatListItem* item = getItemForIndex(index);
 	return item ? item->data(role) : QVariant();
 }
 
 QModelIndex ChatListModel::index(int row, int column, const QModelIndex & parent) const {
 	if (!hasIndex(row, column, parent)) {
 		return QModelIndex();
 	}
 
 	ChatListGroupItem *parentItem = parent.isValid() ? static_cast<ChatListGroupItem*>(parent.internalPointer()) : root_;
 
 	return row < parentItem->rowCount() ? createIndex(row, column, parentItem->item(row)) : QModelIndex();
 }
 
 QModelIndex ChatListModel::parent(const QModelIndex& index) const {
 	if (!index.isValid()) {
 		return QModelIndex();
 	}
 	ChatListGroupItem* parent = static_cast<ChatListGroupItem*>(index.internalPointer())->parent();
 	return (parent == root_) ? QModelIndex() : createIndex(parent->parent()->row(parent), 0, parent);
 }
 
 int ChatListModel::rowCount(const QModelIndex& parentIndex) const {
 	ChatListGroupItem* parent = NULL;
 	if (parentIndex.isValid()) {
 		parent = dynamic_cast<ChatListGroupItem*>(static_cast<ChatListItem*>(parentIndex.internalPointer()));
diff --git a/Swift/QtUI/ChatList/ChatListModel.h b/Swift/QtUI/ChatList/ChatListModel.h
index 04e369a..a15cbcd 100644
--- a/Swift/QtUI/ChatList/ChatListModel.h
+++ b/Swift/QtUI/ChatList/ChatListModel.h
@@ -1,41 +1,43 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <QAbstractItemModel>
 #include <QList>
 
 #include <Swiften/MUC/MUCBookmark.h>
 #include <Swift/Controllers/UIInterfaces/ChatListWindow.h>
 
 #include <Swift/QtUI/ChatList/ChatListGroupItem.h>
 
 namespace Swift {
 	class ChatListModel : public QAbstractItemModel {
 		Q_OBJECT
 		public:
 			ChatListModel();
+			Qt::ItemFlags flags(const QModelIndex& index) const;
 			void addMUCBookmark(const MUCBookmark& bookmark);
 			void removeMUCBookmark(const MUCBookmark& bookmark);
 			void addWhiteboardSession(const ChatListWindow::Chat& chat);
 			void removeWhiteboardSession(const JID& jid);
 			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 parent(const QModelIndex& index) const;
 			int rowCount(const QModelIndex& parent = QModelIndex()) const;
 			ChatListItem* getItemForIndex(const QModelIndex& index) const;
 			void clearBookmarks();
 			void setRecents(const std::list<ChatListWindow::Chat>& recents);
+			QMimeData* mimeData(const QModelIndexList& indexes) const;
 		private:
 			ChatListGroupItem* mucBookmarks_;
 			ChatListGroupItem* recents_;
 			ChatListGroupItem* whiteboards_;
 			ChatListGroupItem* root_;
 	};
 
 }
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index 4d1f19b..7455fb5 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -1,80 +1,82 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swift/QtUI/ChatList/QtChatListWindow.h"
 
 #include <boost/bind.hpp>
 
-#include <QMenu>
 #include <QContextMenuEvent>
+#include <QMenu>
+#include <QMimeData>
+#include <QUrl>
 
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h>
+#include <Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h>
+#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
+#include <Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
+#include <Swift/Controllers/UIEvents/ShowWhiteboardUIEvent.h>
 #include <Swift/QtUI/ChatList/ChatListMUCItem.h>
 #include <Swift/QtUI/ChatList/ChatListRecentItem.h>
 #include <Swift/QtUI/ChatList/ChatListWhiteboardItem.h>
 #include <Swift/QtUI/QtAddBookmarkWindow.h>
 #include <Swift/QtUI/QtEditBookmarkWindow.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
-#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
-#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
-#include <Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h>
-#include <Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h>
-#include <Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h>
-#include <Swift/Controllers/UIEvents/ShowWhiteboardUIEvent.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
-
 
 namespace Swift {
 
 QtChatListWindow::QtChatListWindow(UIEventStream *uiEventStream, SettingsProvider* settings, QWidget* parent) : QTreeView(parent) {
 	eventStream_ = uiEventStream;
 	settings_ = settings;
 	bookmarksEnabled_ = false;
 	model_ = new ChatListModel();
 	setModel(model_);
 	delegate_ = new ChatListDelegate(settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
 	setItemDelegate(delegate_);
 	setHeaderHidden(true);
 #ifdef SWIFT_PLATFORM_MACOSX
 	setAlternatingRowColors(true);
 #endif
 	expandAll();
 	setAnimated(true);
 	setIndentation(0);
+	setDragEnabled(true);
 	setRootIsDecorated(true);
 	setupContextMenus();
 	connect(this, SIGNAL(activated(const QModelIndex&)), this, SLOT(handleItemActivated(const QModelIndex&)));
 	connect(this, SIGNAL(clicked(const QModelIndex&)), this, SLOT(handleClicked(const QModelIndex&)));
 
 	settings_->onSettingChanged.connect(boost::bind(&QtChatListWindow::handleSettingChanged, this, _1));
 }
 
 QtChatListWindow::~QtChatListWindow() {
 	settings_->onSettingChanged.disconnect(boost::bind(&QtChatListWindow::handleSettingChanged, this, _1));
 	delete model_;
 	delete delegate_;
 	delete mucMenu_;
 	delete emptyMenu_;
 }
 
 void QtChatListWindow::handleSettingChanged(const std::string& setting) {
 	if (setting == QtUISettingConstants::COMPACT_ROSTER.getKey()) {
 		delegate_->setCompact(settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
 		repaint();
 	}
 }
 
 void QtChatListWindow::setBookmarksEnabled(bool enabled) {
 	bookmarksEnabled_ = enabled;
 }
 
 void QtChatListWindow::handleClicked(const QModelIndex& index) {
 	ChatListGroupItem* item = dynamic_cast<ChatListGroupItem*>(static_cast<ChatListItem*>(index.internalPointer()));
 	if (item) {
 		setExpanded(index, !isExpanded(index));
 	}
 }
 
 void QtChatListWindow::setupContextMenus() {
@@ -120,63 +122,68 @@ void QtChatListWindow::removeMUCBookmark(const MUCBookmark& bookmark) {
 
 void QtChatListWindow::addWhiteboardSession(const ChatListWindow::Chat& chat) {
 	model_->addWhiteboardSession(chat);
 }
 
 void QtChatListWindow::removeWhiteboardSession(const JID& jid) {
 	model_->removeWhiteboardSession(jid);
 }
 
 void QtChatListWindow::setRecents(const std::list<ChatListWindow::Chat>& recents) {
 	model_->setRecents(recents);
 }
 
 void QtChatListWindow::setUnreadCount(int unread) {
 	emit onCountUpdated(unread);
 }
 
 void QtChatListWindow::handleRemoveBookmark() {
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(contextMenuItem_);
 	if (!mucItem) return;
 	eventStream_->send(boost::shared_ptr<UIEvent>(new RemoveMUCBookmarkUIEvent(mucItem->getBookmark())));
 }
 
 void QtChatListWindow::handleAddBookmark() {
 	(new QtAddBookmarkWindow(eventStream_))->show();
 }
 
 
 void QtChatListWindow::handleEditBookmark() {
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(contextMenuItem_);
 	if (!mucItem) return;
 	QtEditBookmarkWindow* window = new QtEditBookmarkWindow(eventStream_, mucItem->getBookmark());
 	window->show();
 }
 
+void QtChatListWindow::dragEnterEvent(QDragEnterEvent *event) {
+	if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
+		event->acceptProposedAction();
+	}
+}
 
 void QtChatListWindow::contextMenuEvent(QContextMenuEvent* event) {
 	QModelIndex index = indexAt(event->pos());
 	ChatListItem* baseItem = index.isValid() ? static_cast<ChatListItem*>(index.internalPointer()) : NULL;
 	contextMenuItem_ = baseItem;
 	if (!baseItem) {
 		emptyMenu_->exec(QCursor::pos());
 		return;
 	}
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(baseItem);
 	if (mucItem) {
 		if (!bookmarksEnabled_) {
 			return;
 		}
 		mucMenu_->exec(QCursor::pos());
 	}
 	else {
 		QMenu menu;
 		QAction* clearRecents = menu.addAction(tr("Clear recents"));
 		menu.addAction(clearRecents);
 		QAction* result = menu.exec(event->globalPos());
 		if (result == clearRecents) {
 			onClearRecentsRequested();
 		}
 	}
 }
 
 }
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.h b/Swift/QtUI/ChatList/QtChatListWindow.h
index ef4ce0f..e218266 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.h
+++ b/Swift/QtUI/ChatList/QtChatListWindow.h
@@ -1,57 +1,58 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <QTreeView>
 
 #include "Swift/Controllers/UIInterfaces/ChatListWindow.h"
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include "Swift/QtUI/ChatList/ChatListModel.h"
 #include "Swift/QtUI/ChatList/ChatListDelegate.h"
 
 namespace Swift {
 	class SettingsProvider;
 	class QtChatListWindow : public QTreeView, public ChatListWindow {
 		Q_OBJECT
 		public:
 			QtChatListWindow(UIEventStream *uiEventStream, SettingsProvider* settings, QWidget* parent = NULL);
 			virtual ~QtChatListWindow();
 			void addMUCBookmark(const MUCBookmark& bookmark);
 			void removeMUCBookmark(const MUCBookmark& bookmark);
 			void addWhiteboardSession(const ChatListWindow::Chat& chat);
 			void removeWhiteboardSession(const JID& jid);
 			void setBookmarksEnabled(bool enabled);
 			void setRecents(const std::list<ChatListWindow::Chat>& recents);
 			void setUnreadCount(int unread);
 			void clearBookmarks();
 
 		signals:
 			void onCountUpdated(int count);
 		private slots:
 			void handleItemActivated(const QModelIndex&);
 			void handleAddBookmark();
 			void handleEditBookmark();
 			void handleRemoveBookmark();
 			void handleClicked(const QModelIndex& index);
 			void handleSettingChanged(const std::string& setting);
 
 		protected:
+			void dragEnterEvent(QDragEnterEvent* event);
 			void contextMenuEvent(QContextMenuEvent* event);
 
 		private:
 			void setupContextMenus();
 			bool bookmarksEnabled_;
 			UIEventStream* eventStream_;
 			ChatListModel* model_;
 			ChatListDelegate* delegate_;
 			QMenu* mucMenu_;
 			QMenu* emptyMenu_;
 			ChatListItem* contextMenuItem_;
 			SettingsProvider* settings_;
 	};
 
 }
author	Richard Maudsley <richard.maudsley@isode.com>	2014-04-07 09:19:50 (GMT)
committer	Richard Maudsley <richard.maudsley@isode.com>	2014-04-07 13:07:43 (GMT)
commit	a7c7602e89d58056940885112f8764a31e9991da (patch)
tree	e713e2d7eed2c2ba2925ec0a70fe93eb707c077a /Swift/QtUI/ChatList
parent	1a35178bcad7c30e50a19e4017d021fb0485ccf0 (diff)
download	swift-contrib-a7c7602e89d58056940885112f8764a31e9991da.zip swift-contrib-a7c7602e89d58056940885112f8764a31e9991da.tar.bz2