1 files changed, 88 insertions, 28 deletions
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index 1fc20dd..730ffbb 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010 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 "RosterModel.h"
+#include <Swift/QtUI/Roster/RosterModel.h>
 
 #include <boost/bind.hpp>
@@ -11,21 +11,28 @@
 #include <QColor>
 #include <QIcon>
+#include <QMimeData>
 #include <qdebug.h>
 
-#include "Swiften/Elements/StatusShow.h"
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include <Swiften/Elements/StatusShow.h>
+#include <Swiften/Base/Path.h>
+
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
 #include <Swift/Controllers/StatusUtil.h>
 
-#include "QtSwiftUtil.h"
-#include "Swift/QtUI/Roster/QtTreeWidget.h"
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
+#include <Swift/QtUI/Roster/RosterTooltip.h>
+#include <Swift/QtUI/QtResourceHelper.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
-RosterModel::RosterModel(QtTreeWidget* view) : view_(view) {
-	roster_ = NULL;
+RosterModel::RosterModel(QtTreeWidget* view, bool screenReaderMode) : roster_(NULL), view_(view), screenReader_(screenReaderMode) {
+	const int tooltipAvatarSize = 96; // maximal suggested size according to XEP-0153
+	cachedImageScaler_ = new QtScaledAvatarCache(tooltipAvatarSize);
 }
 
 RosterModel::~RosterModel() {
+	delete cachedImageScaler_;
 }
 
@@ -41,5 +48,6 @@ void RosterModel::setRoster(Roster* roster) {
 void RosterModel::reLayout() {
 	//emit layoutChanged();
-	reset();
+	beginResetModel();
+	endResetModel(); // TODO: Not sure if this isn't too early?
 	if (!roster_) {
 		return;
@@ -61,5 +69,14 @@ void RosterModel::handleDataChanged(RosterItem* item) {
 	if (modelIndex.isValid()) {
 		emit dataChanged(modelIndex, modelIndex);
+		view_->refreshTooltip();
+	}
+}
+
+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;
 }
 
@@ -77,5 +94,5 @@ QVariant RosterModel::data(const QModelIndex& index, int role) const {
 
 	switch (role) {
-		case Qt::DisplayRole: return P2QSTRING(item->getDisplayName());
+		case Qt::DisplayRole: return getScreenReaderTextOr(item, P2QSTRING(item->getDisplayName()));
 		case Qt::TextColorRole: return getTextColor(item);
 		case Qt::BackgroundColorRole: return getBackgroundColor(item);
@@ -85,8 +102,26 @@ QVariant RosterModel::data(const QModelIndex& index, int role) const {
 		case PresenceIconRole: return getPresenceIcon(item);
 		case ChildCountRole: return getChildCount(item);
+		case IdleRole: return getIsIdle(item);
+		case JIDRole: return getJID(item);
+		case DisplayJIDRole: return getDisplayJID(item);
 		default: return QVariant();
 	}
 }
 
+QString RosterModel::getScreenReaderTextOr(RosterItem* item, const QString& alternative) const {
+	QString name = P2QSTRING(item->getDisplayName());
+	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+	if (contact && screenReader_) {
+		name += ": " + P2QSTRING(statusShowTypeToFriendlyName(contact->getStatusShow()));
+		if (!contact->getStatusText().empty()) {
+			name += " (" + P2QSTRING(contact->getStatusText()) + ")";
+		}
+		return name;
+	}
+	else {
+		return alternative;
+	}
+}
+
 int RosterModel::getChildCount(RosterItem* item) const {
 	GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
@@ -94,4 +129,9 @@ int RosterModel::getChildCount(RosterItem* item) const {
 }
 
+bool RosterModel::getIsIdle(RosterItem* item) const {
+	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+	return contact ? !contact->getIdleText().empty() : false;
+}
+
 QColor RosterModel::intToColor(int color) const {
 	return QColor(
@@ -125,11 +165,5 @@ QString RosterModel::getToolTip(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (contact) {
-		if (contact->getDisplayJID().isValid()) {
-			tip += "\n" + P2QSTRING(contact->getDisplayJID().toBare().toString());
-		}
-		tip += "\n " + P2QSTRING(statusShowTypeToFriendlyName(contact->getStatusShow()));
-		if (!getStatusText(item).isEmpty()) {
-			tip += ": " + getStatusText(item);
-		}
+		return RosterTooltip::buildDetailedTooltip(contact, cachedImageScaler_);
 	}
 	return tip;
@@ -141,5 +175,5 @@ QString RosterModel::getAvatar(RosterItem* item) const {
 		return "";
 	}
-	return QString(contact->getAvatarPath().c_str());
+	return P2QSTRING(pathToString(contact->getAvatarPath()));
 }
 
@@ -150,17 +184,27 @@ QString RosterModel::getStatusText(RosterItem* item) const {
 }
 
+QString RosterModel::getJID(RosterItem* item) const {
+	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+	return contact ? P2QSTRING(contact->getJID().toString()) : QString();
+}
+
+QString RosterModel::getDisplayJID(RosterItem* item) const {
+	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+	QString result = contact ? P2QSTRING(contact->getDisplayJID().toString()) : QString();
+	if (result.isEmpty()) {
+		result = getJID(item);
+	}
+	return result;
+}
+
 QIcon RosterModel::getPresenceIcon(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) return QIcon();
-	QString iconString;
-	switch (contact->getStatusShow()) {
-	 	case StatusShow::Online: iconString = "online";break;
-	 	case StatusShow::Away: iconString = "away";break;
-	 	case StatusShow::XA: iconString = "away";break;
-	 	case StatusShow::FFC: iconString = "online";break;
-	 	case StatusShow::DND: iconString = "dnd";break;
-	 	case StatusShow::None: iconString = "offline";break;
+	if (contact->blockState() == ContactRosterItem::IsBlocked ||
+		contact->blockState() == ContactRosterItem::IsDomainBlocked) {
+		return QIcon(":/icons/stop.png");
 	}
-	return QIcon(":/icons/" + iconString + ".png");
+
+	return QIcon(statusShowTypeToIconPath(contact->getStatusShow()));
 }
 
@@ -216,3 +260,19 @@ int RosterModel::rowCount(const QModelIndex& parent) const {
 }
 
+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;
+	}
+
+	/* only a single JID in this list */
+	QByteArray itemData;
+	QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+	dataStream << P2QSTRING(item->getJID().toString());
+	data->setData("application/vnd.swift.contact-jid-list", itemData);
+	return data;
+}
+
 }