From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Mon, 15 Jun 2020 17:02:27 +0000 (+0200)
Subject: Don't duplicate file name in the info line
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~154
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc863584db6eb763b8badaf6e2553b0099089877;p=nextcloud-desktop.git

Don't duplicate file name in the info line

For the "Activity" type activities, displayPath contains the file name
which is also in the subject. This was redundant, so now we don't
display an info line at all for that type of activities.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 31983684c..5f646621b 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -491,9 +491,10 @@ Window {
 
                     Text {
                         id: activityTextInfo
-                        text: (type === "Activity" || type === "Sync") ? displayPath
+                        text: (type === "Sync") ? displayPath
                             : (type === "File") ? subject
-                            : message
+                            : (type === "Notification") ? message
+                            : ""
                         height: (text === "") ? 0 : activityTextTitle.height
                         width: Style.activityLabelBaseWidth + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
                         elide: Text.ElideRight