From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Fri, 17 Jan 2020 13:50:05 +0000 (+0100)
Subject: Inclusion of possible 'notification' type descriptions in activity
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~413^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=599dae0486704c57e601f9a5456b22795aae793a;p=nextcloud-desktop.git

Inclusion of possible 'notification' type descriptions in activity

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

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 6423e1bc5..f3fed155a 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -524,7 +524,7 @@ Window {
                     Layout.alignment: Qt.AlignLeft
                     Text {
                         id: activityTextTitle
-                        text: (type === "Activity") ? subject : message
+                        text: (type === "Activity" || type === "Notification") ? subject : message
                         width: 240 + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
                         elide: Text.ElideRight
                         font.pixelSize: 12
@@ -532,8 +532,8 @@ Window {
 
                     Text {
                         id: activityTextInfo
-                        text: displaypath
-                        height: (displaypath === "") ? 0 : activityTextTitle.height
+                        text: (type === "Activity" || type === "File" || type === "Sync") ? displaypath : message
+                        height: (text === "") ? 0 : activityTextTitle.height
                         width: 240 + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
                         elide: Text.ElideRight
                         font.pixelSize: 10