From 687a99279d7d0a6c8159f1505227c5f64f25cbbc Mon Sep 17 00:00:00 2001
From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Fri, 3 Jan 2020 13:39:10 +0100
Subject: [PATCH] Has function for ActivityModel, typos

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---
 src/gui/systray.cpp                |  2 +-
 src/gui/tray/ActivityListModel.cpp |  8 ++++++++
 src/gui/tray/ActivityListModel.h   | 10 +++++++---
 src/gui/tray/Window.qml            |  4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index c377c69bb..c5f1d1723 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -46,7 +46,7 @@ Systray::Systray() // TODO: make singleton, provide ::instance()
     _trayEngine->addImageProvider("avatars", new ImageProvider);
     _trayEngine->rootContext()->setContextProperty("userModelBackend", UserModel::instance());
     _trayEngine->rootContext()->setContextProperty("systrayBackend", this);
-    _trayComponent = new QQmlComponent(_trayEngine, QUrl(QStringLiteral("qrc:/qml/src/gui/tray/window.qml")));
+    _trayComponent = new QQmlComponent(_trayEngine, QUrl(QStringLiteral("qrc:/qml/src/gui/tray/Window.qml")));
     _trayContext = _trayEngine->contextForObject(_trayComponent->create());
 
     // TODO: hack to pass the icon to QML
diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index 4a875d2f6..48ec7d018 100644
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -40,6 +40,14 @@ ActivityListModel::ActivityListModel(AccountState *accountState, QObject* parent
 {
 }
 
+QHash<int, QByteArray> ActivityListModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[PathRole] = "path";
+    roles[MessageRole] = "message";
+    return roles;
+}
+
 QVariant ActivityListModel::data(const QModelIndex &index, int role) const
 {
     Activity a;
diff --git a/src/gui/tray/ActivityListModel.h b/src/gui/tray/ActivityListModel.h
index 135301592..d633bb07f 100644
--- a/src/gui/tray/ActivityListModel.h
+++ b/src/gui/tray/ActivityListModel.h
@@ -17,7 +17,7 @@
 
 #include <QtCore>
 
-#include "activitydata.h"
+#include "ActivityData.h"
 
 class QJsonDocument;
 
@@ -48,8 +48,9 @@ public:
         iconStateSync
     };
 
-    enum datarole { ActionIconRole = Qt::UserRole + 1,
-        UserIconRole,
+    enum datarole {
+    ActionIconRole = Qt::UserRole + 1,
+    UserIconRole,
     AccountRole,
     ObjectTypeRole,
     ActionsLinksRole,
@@ -95,6 +96,9 @@ private slots:
 signals:
     void activityJobStatusCode(int statusCode);
 
+protected:
+    QHash<int, QByteArray> roleNames() const;
+
 private:
     void startFetchJob();
     void combineActivityLists();
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 337302960..0735d6161 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -397,12 +397,12 @@ Window {
                     Layout.alignment: Qt.AlignLeft
                     Text {
                         id: activityTextTitle
-                        text: filename
+                        text: path
                         font.pointSize: 9
                     }
                     Text {
                         id: activityTextInfo
-                        text: info
+                        text: message
                         font.pointSize: 8
                     }
                 }
-- 
2.30.2