Has function for ActivityModel, typos

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index c377c69bb2a4c5a6782d59720ad10add0be9d397..c5f1d1723cd574ceed175badfb3d19c7617a5685 100644 (file)
--- 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 4a875d2f610c371d54aad2ab33e4799f6cba1b2e..48ec7d018f51f175177d73cce03237c85c3dfa0e 100644 (file)
--- 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 1353015921fe6bffbcc368072eedfb1a09389004..d633bb07f537e64c3323d6d95c740f74f693b752 100644 (file)
--- 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 337302960676e61b8cf6bbe4dfd0130b48594fb5..0735d61613ac809eadcbd29944a85773c17d041f 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -397,12 +397,12 @@ Window {
                     Layout.alignment: Qt.AlignLeft\r
                     Text {\r
                         id: activityTextTitle\r
-                        text: filename\r
+                        text: path\r
                         font.pointSize: 9\r
                     }\r
                     Text {\r
                         id: activityTextInfo\r
-                        text: info\r
+                        text: message\r
                         font.pointSize: 8\r
                     }\r
                 }\r