Notifications: Also have clickable link #6236

owncloud · Apr 17, 2018 · 5509cd2 · 5509cd2
1 parent fa6ac9d
commit 5509cd2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/gui/activitydata.h b/src/gui/activitydata.h
@@ -58,9 +58,10 @@ class Activity
     QString _file;
     QUrl _link;
     QDateTime _dateTime;
-    QString _accName;
+    QString _accName; /* display name of the account involved */
 
-    QVector<ActivityLink> _links;
+    QVector<ActivityLink> _links; /* These links are transformed into buttons that
+                                   * call links as reactions on the activity */
     /**
      * @brief Sort operator to sort the list youngest first.
      * @param val

diff --git a/src/gui/notificationwidget.cpp b/src/gui/notificationwidget.cpp
@@ -44,7 +44,16 @@ void NotificationWidget::setActivity(const Activity &activity)
     _ui._subjectLabel->setVisible(!activity._subject.isEmpty());
     _ui._messageLabel->setVisible(!activity._message.isEmpty());
 
-    _ui._subjectLabel->setText(activity._subject);
+    if (activity._link.isEmpty()) {
+        _ui._subjectLabel->setText(activity._subject);
+    } else {
+        _ui._subjectLabel->setText( QString("<a href=\"%1\">%2</a>")
+                    .arg(activity._link.toString(QUrl::FullyEncoded),
+                         activity._subject.toHtmlEscaped() ));
+        _ui._subjectLabel->setTextFormat(Qt::RichText);
+        _ui._subjectLabel->setOpenExternalLinks(true);
+    }
+
     _ui._messageLabel->setText(activity._message);
 
     _ui._notifIcon->setPixmap(QPixmap(":/client/resources/bell.png"));