1 files changed, 134 insertions, 110 deletions
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index 4d1f19b..2fd05c4 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -1,15 +1,25 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
-#include "Swift/QtUI/ChatList/QtChatListWindow.h"
+#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>
@@ -17,166 +27,180 @@
 #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);
+QtChatListWindow::QtChatListWindow(UIEventStream *uiEventStream, SettingsProvider* settings, QWidget* parent) : QTreeView(parent), isOnline_(false) {
+    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);
+    setAlternatingRowColors(true);
 #endif
-	expandAll();
-	setAnimated(true);
-	setIndentation(0);
-	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&)));
+    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));
+    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_;
+    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();
-	}
+    if (setting == QtUISettingConstants::COMPACT_ROSTER.getKey()) {
+        delegate_->setCompact(settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
+        repaint();
+    }
+}
+
+void QtChatListWindow::handleClearRecentsRequested() {
+    onClearRecentsRequested();
 }
 
 void QtChatListWindow::setBookmarksEnabled(bool enabled) {
-	bookmarksEnabled_ = 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));
-	}
+    ChatListGroupItem* item = dynamic_cast<ChatListGroupItem*>(static_cast<ChatListItem*>(index.internalPointer()));
+    if (item) {
+        setExpanded(index, !isExpanded(index));
+    }
 }
 
 void QtChatListWindow::setupContextMenus() {
-	mucMenu_ = new QMenu();
-	mucMenu_->addAction(tr("Add New Bookmark"), this, SLOT(handleAddBookmark()));
-	mucMenu_->addAction(tr("Edit Bookmark"), this, SLOT(handleEditBookmark()));
-	mucMenu_->addAction(tr("Remove Bookmark"), this, SLOT(handleRemoveBookmark()));
-	emptyMenu_ = new QMenu();
-	emptyMenu_->addAction(tr("Add New Bookmark"), this, SLOT(handleAddBookmark()));
-	
+    mucMenu_ = new QMenu();
+    onlineOnlyActions_ << mucMenu_->addAction(tr("Edit Bookmark"), this, SLOT(handleEditBookmark()));
+    onlineOnlyActions_ << mucMenu_->addAction(tr("Remove Bookmark"), this, SLOT(handleRemoveBookmark()));
+    emptyMenu_ = new QMenu();
 }
 
 void QtChatListWindow::handleItemActivated(const QModelIndex& index) {
-	ChatListItem* item = model_->getItemForIndex(index);
-	if (ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item)) {
-		if (bookmarksEnabled_) {
-			onMUCBookmarkActivated(mucItem->getBookmark());
-		}
-	}
-	else if (ChatListRecentItem* recentItem = dynamic_cast<ChatListRecentItem*>(item)) {
-		if (!recentItem->getChat().isMUC || bookmarksEnabled_) {
-			onRecentActivated(recentItem->getChat());
-		}
-	}
-	else if (ChatListWhiteboardItem* whiteboardItem = dynamic_cast<ChatListWhiteboardItem*>(item)) {
-		if (!whiteboardItem->getChat().isMUC || bookmarksEnabled_) {
-			eventStream_->send(boost::make_shared<ShowWhiteboardUIEvent>(whiteboardItem->getChat().jid));
-		}
-	}
+    ChatListItem* item = model_->getItemForIndex(index);
+    if (ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item)) {
+        onMUCBookmarkActivated(mucItem->getBookmark());
+    }
+    else if (ChatListRecentItem* recentItem = dynamic_cast<ChatListRecentItem*>(item)) {
+        onRecentActivated(recentItem->getChat());
+    }
+    else if (ChatListWhiteboardItem* whiteboardItem = dynamic_cast<ChatListWhiteboardItem*>(item)) {
+        if (!whiteboardItem->getChat().isMUC || bookmarksEnabled_) {
+            eventStream_->send(std::make_shared<ShowWhiteboardUIEvent>(whiteboardItem->getChat().jid));
+        }
+    }
 }
 
 void QtChatListWindow::clearBookmarks() {
-	model_->clearBookmarks();
+    model_->clearBookmarks();
 }
 
 void QtChatListWindow::addMUCBookmark(const MUCBookmark& bookmark) {
-	model_->addMUCBookmark(bookmark);
+    model_->addMUCBookmark(bookmark);
 }
 
 void QtChatListWindow::removeMUCBookmark(const MUCBookmark& bookmark) {
-	model_->removeMUCBookmark(bookmark);
+    model_->removeMUCBookmark(bookmark);
 }
 
 void QtChatListWindow::addWhiteboardSession(const ChatListWindow::Chat& chat) {
-	model_->addWhiteboardSession(chat);
+    model_->addWhiteboardSession(chat);
 }
 
 void QtChatListWindow::removeWhiteboardSession(const JID& jid) {
-	model_->removeWhiteboardSession(jid);
+    model_->removeWhiteboardSession(jid);
 }
 
 void QtChatListWindow::setRecents(const std::list<ChatListWindow::Chat>& recents) {
-	model_->setRecents(recents);
+    model_->setRecents(recents);
 }
 
-void QtChatListWindow::setUnreadCount(int unread) {
-	emit onCountUpdated(unread);
+void QtChatListWindow::setUnreadCount(size_t 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::setOnline(bool isOnline) {
+    isOnline_ = isOnline;
 }
 
-void QtChatListWindow::handleAddBookmark() {
-	(new QtAddBookmarkWindow(eventStream_))->show();
+void QtChatListWindow::handleRemoveBookmark() {
+    const ChatListMUCItem* mucItem = dynamic_cast<const ChatListMUCItem*>(contextMenuItem_);
+    if (!mucItem) return;
+    eventStream_->send(std::make_shared<RemoveMUCBookmarkUIEvent>(mucItem->getBookmark()));
 }
 
-
 void QtChatListWindow::handleEditBookmark() {
-	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(contextMenuItem_);
-	if (!mucItem) return;
-	QtEditBookmarkWindow* window = new QtEditBookmarkWindow(eventStream_, mucItem->getBookmark());
-	window->show();
+    const ChatListMUCItem* mucItem = dynamic_cast<const 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();
-		}
-	}
+    QModelIndex index = indexAt(event->pos());
+    ChatListItem* baseItem = index.isValid() ? static_cast<ChatListItem*>(index.internalPointer()) : nullptr;
+    contextMenuItem_ = baseItem;
+
+    for (auto action : onlineOnlyActions_) {
+        action->setEnabled(isOnline_);
+    }
+
+    if (!baseItem) {
+        emptyMenu_->exec(QCursor::pos());
+        return;
+    }
+
+    ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(baseItem);
+    if (mucItem) {
+        if (!bookmarksEnabled_) {
+            return;
+        }
+        mucMenu_->exec(QCursor::pos());
+        return;
+    }
+
+    ChatListRecentItem* recentItem = dynamic_cast<ChatListRecentItem*>(baseItem);
+    if (recentItem) {
+        const ChatListWindow::Chat& chat = recentItem->getChat();
+        if (chat.isMUC) {
+            QMenu mucRecentsMenu;
+            QAction* bookmarkAction = nullptr;
+            const ChatListMUCItem* mucItem = model_->getChatListMUCItem(chat.jid);
+            if (mucItem) {
+                contextMenuItem_ = mucItem;
+                bookmarkAction = mucRecentsMenu.addAction(tr("Edit Bookmark"), this, SLOT(handleEditBookmark()));
+                bookmarkAction->setEnabled(isOnline_);
+            }
+            mucRecentsMenu.addAction(tr("Clear recents"), this, SLOT(handleClearRecentsRequested()));
+            mucRecentsMenu.exec(QCursor::pos());
+            return;
+        }
+    }
+
+    QMenu menu;
+    menu.addAction(tr("Clear recents"), this, SLOT(handleClearRecentsRequested()));
+    menu.exec(event->globalPos());
 }
 
 }