From: Michael Schuster <michael@schuster.ms>
Date: Fri, 17 Jan 2020 19:16:20 +0000 (+0100)
Subject: Add Activity date and time
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~413^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=889cb636d38badcdbe17a25aa4a689bfb3929c2f;p=nextcloud-desktop.git

Add Activity date and time

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index 75200a939..dc1b109f6 100644
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -51,6 +51,7 @@ QHash<int, QByteArray> ActivityListModel::roleNames() const
     roles[ActionIconRole] = "icon";
     roles[ActionTextRole] = "subject";
     roles[ObjectTypeRole] = "objectType";
+    roles[PointInTimeRole] = "dateTime";
     return roles;
 }
 
@@ -184,7 +185,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
     case AccountRole:
         return a._accName;
     case PointInTimeRole:
-        return QString("%1 (%2)").arg(a._dateTime.toLocalTime().toString(Qt::DefaultLocaleShortDate), Utility::timeAgoInWords(a._dateTime.toLocalTime()));
+        return QString("%1 - %2").arg(Utility::timeAgoInWords(a._dateTime.toLocalTime()), a._dateTime.toLocalTime().toString(Qt::DefaultLocaleShortDate));
     case AccountConnectedRole:
         return (ast && ast->isConnected());
     default:
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index f3fed155a..9fd16c82f 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -538,6 +538,16 @@ Window {
                         elide: Text.ElideRight
                         font.pixelSize: 10
                     }
+
+                    Text {
+                        id: activityTextDateTime
+                        text: dateTime
+                        height: (text === "") ? 0 : activityTextTitle.height
+                        width: 240 + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
+                        elide: Text.ElideRight
+                        font.pixelSize: 10
+                        color: "#808080"
+                    }
                 }
                 Item {
                     id: activityItemFiller