1 files changed, 91 insertions, 3 deletions

diff --git a/libsowatch/notificationsmodel.cpp b/libsowatch/notificationsmodel.cpp
index 2eba9a0..73d4ab6 100644
--- a/libsowatch/notificationsmodel.cpp
+++ b/libsowatch/notificationsmodel.cpp
@@ -12,6 +12,12 @@ using namespace sowatch;
 NotificationsModel::NotificationsModel(QObject *parent) :
     QAbstractListModel(parent)
 {
+	QHash<int, QByteArray> roles = roleNames();
+	roles[Qt::DisplayRole] = QByteArray("title");
+	roles[ObjectRole] = QByteArray("object");
+	roles[BodyRole] = QByteArray("body");
+	roles[CountRole] = QByteArray("count");
+	setRoleNames(roles);
 }
 
 int NotificationsModel::rowCount(const QModelIndex &parent) const
@@ -26,15 +32,51 @@ int NotificationsModel::rowCount(const QModelIndex &parent) const
 
 QVariant NotificationsModel::data(const QModelIndex &index, int role) const
 {
+	const Notification *n = getNotificationByIndex(index.row());
+	if (!n) return QVariant();
+	switch (role) {
+	case Qt::DisplayRole:
+		return QVariant::fromValue(n->title());
+	case ObjectRole:
+		return QVariant::fromValue(const_cast<sowatch::Notification*>(n));
+	case BodyRole:
+		return QVariant::fromValue(n->body());
+	case CountRole:
+		return QVariant::fromValue(n->count());
+	}
+	return QVariant();
 }
 
 void NotificationsModel::add(Notification *n)
 {
+	const Notification::Type type = n->type();
+	const int offset = getAppendOffsetForType(type);
+
+	beginInsertRows(QModelIndex(), offset, offset);
+	_list[type].append(n);
+	endInsertRows();
+
+	connect(n, SIGNAL(changed()), SLOT(handleNotificationChanged()));
 }
 
 void NotificationsModel::remove(Notification *n)
 {
+	const Notification::Type type = n->type();
+	remove(type, n);
+}
+
+void NotificationsModel::remove(Notification::Type type, Notification *n)
+{
+	const int subindex = _list[type].indexOf(n);
+	const int index = getOffsetForType(type) + subindex;
+
+	Q_ASSERT(index >= 0);
+
+	disconnect(n, 0, this, 0);
 
+	beginRemoveRows(QModelIndex(), index, index);
+	_list[type].removeAt(subindex);
+	endRemoveRows();
 }
 
 int NotificationsModel::fullCount() const
@@ -55,16 +97,62 @@ int NotificationsModel::fullCountByType(Notification::Type type) const
 	return count;
 }
 
-bool NotificationsModel::removeDeletedNotification(Notification *n)
+Notification::Type NotificationsModel::getTypeOfDeletedNotification(Notification *n) const
 {
 	// Can't call any methods of 'n'
+	FOREACH_TYPE(type) {
+		if (_list[type].contains(n)) {
+			return type;
+		}
+	}
+	return Notification::OtherNotification;
 }
 
-int NotificationsModel::getOffsetForType(Notification::Type type)
+int NotificationsModel::getOffsetForType(Notification::Type type) const
 {
 	int count = 0;
 	FOREACH_TYPE_UNTIL(t, type) {
-		count += _list[type].count();
+		count += _list[t].count();
 	}
 	return count;
 }
+
+int NotificationsModel::getAppendOffsetForType(Notification::Type type) const
+{
+	return getOffsetForType(type) + _list[type].count();
+}
+
+int NotificationsModel::getIndexForNotification(Notification *n) const
+{
+	Notification::Type type = n->type();
+	const int subindex = _list[type].indexOf(n);
+
+	Q_ASSERT(subindex >= 0);
+
+	return getOffsetForType(type) + subindex;
+}
+
+const Notification * NotificationsModel::getNotificationByIndex(int index) const
+{
+	FOREACH_TYPE(type) {
+		const int size = _list[type].size();
+		if (index < size) {
+			return _list[type].at(index);
+		} else {
+			index -= size;
+		}
+	}
+	qWarning() << "Notification with index" << index << "not found";
+	return 0;
+}
+
+void NotificationsModel::handleNotificationChanged()
+{
+	QObject *obj = sender();
+	if (obj) {
+		Notification* n = static_cast<Notification*>(obj);
+		const int index = getIndexForNotification(n);
+
+		emit dataChanged(createIndex(index, 0), createIndex(index, 0));
+	}
+}