Commit 250c180e authored by blam's avatar blam

Merge branch 'notifications' into 'master'

Notifications

See merge request !38
parents 994c017a fac21dc5
appIcon=icon-lock-missed-call
app_icon=icon-lock-missed-call
urgency=2
x-nemo-icon=icon-lock-missed-call
x-nemo-priority=120
x-nemo-max-content-lines=1
x-nemo-feedback=call_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-missed-call
app_icon=icon-lock-missed-call
urgency=2
x-nemo-icon=icon-lock-missed-call
x-nemo-priority=120
x-nemo-max-content-lines=1
x-nemo-feedback=call_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-sms
x-nemo-icon=icon-lock-invitation
x-nemo-preview-icon=icon-s-status-invitation-pending
app_icon=icon-s-status-invitation-pending
x-nemo-feedback=default
x-nemo-user-removable=false
x-nemo-priority=90
appIcon=icon-lock-information
app_icon=icon-lock-information
urgency=2
transient=true
appIcon=icon-lock-information
app_icon=icon-lock-information
urgency=2
transient=true
x-nemo-feedback=warning_strong
appIcon=icon-lock-sms
app_icon=icon-lock-sms
urgency=2
x-nemo-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-sms
app_icon=icon-lock-sms
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=sms
x-nemo-display-on=true
appIcon=icon-lock-sms
app_icon=icon-lock-sms
urgency=2
x-nemo-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-max-content-lines=6
x-nemo-feedback=chat_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-sms
app_icon=icon-lock-sms
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=chat
x-nemo-display-on=true
appIcon=icon-lock-sms
app_icon=icon-lock-sms
urgency=2
x-nemo-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-max-content-lines=6
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-sms
app_icon=icon-lock-sms
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=sms
x-nemo-display-on=true
appIcon=icon-lock-sms
app_icon=icon-lock-sms
urgency=2
x-nemo-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-max-content-lines=6
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-sms
app_icon=icon-lock-sms
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=sms
x-nemo-display-on=true
appIcon=icon-lock-sms
app_icon=icon-lock-sms
urgency=2
x-nemo-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-sms
app_icon=icon-lock-sms
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-sms
x-nemo-priority=120
x-nemo-feedback=sms
x-nemo-display-on=true
appIcon=icon-lock-voicemail
x-nemo-icon=icon-lock-voicemail
x-nemo-preview-icon=icon-lock-voicemail
app_icon=icon-lock-voicemail
x-nemo-priority=120
x-nemo-max-content-lines=1
x-nemo-user-removable=false
x-nemo-feedback=sms,sms_exists
x-nemo-led-disabled-without-body-and-summary=false
x-nemo-display-on=true
appIcon=icon-lock-voicemail
app_icon=icon-lock-voicemail
urgency=2
x-nemo-icon=icon-lock-voicemail
x-nemo-user-removable=false
x-nemo-priority=120
x-nemo-max-content-lines=1
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-voicemail
app_icon=icon-lock-voicemail
urgency=2
x-nemo-icon=icon-lock-voicemail
x-nemo-priority=120
x-nemo-user-removable=false
x-nemo-max-content-lines=1
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
appIcon=icon-lock-voicemail
app_icon=icon-lock-voicemail
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-voicemail
x-nemo-priority=120
x-nemo-feedback=sms
x-nemo-display-on=true
appIcon=icon-lock-voicemail
app_icon=icon-lock-voicemail
transient=true
urgency=2
x-nemo-preview-icon=icon-lock-voicemail
x-nemo-priority=120
x-nemo-feedback=sms
x-nemo-display-on=true
......@@ -2,7 +2,8 @@
**
** This file is part of commhistory-daemon.
**
** Copyright (C) 2013 Jolla Ltd.
** Copyright (C) 2020 Open Mobile Platform LLC.
** Copyright (C) 2013 - 2019 Jolla Ltd.
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** Contact: John Brooks <john.brooks@jolla.com>
**
......@@ -145,10 +146,20 @@ void NotificationGroup::updateGroup()
connect(mGroup, SIGNAL(closed(uint)), SLOT(onClosed(uint)));
}
const QString body(notificationGroupText());
mGroup->setAppName(groupName(m_collection));
mGroup->setCategory(groupCategory(m_collection));
mGroup->setSummary(mLocale.joinStringList(contactNames()));
mGroup->setBody(notificationGroupText());
if (m_collection != PersonalNotification::Voice
&& m_collection != PersonalNotification::Voicemail) {
// For missed calls and voicemail, the Events view notification is compressed into one
// line with only the summary, as the body information is duplicated in the notification
// group header ('missed calls' or 'new voicemails').
mGroup->setBody(body);
}
mGroup->clearPreviewSummary();
mGroup->clearPreviewBody();
mGroup->setItemCount(mNotifications.size());
// This group is only visible if the members are hidden
......@@ -186,7 +197,7 @@ void NotificationGroup::updateGroup()
preview.setAppName(mGroup->appName());
preview.setCategory(mGroup->category() + QStringLiteral(".preview"));
preview.setPreviewSummary(mGroup->summary());
preview.setPreviewBody(mGroup->body());
preview.setPreviewBody(body);
NotificationManager::instance()->setNotificationProperties(&preview, mNotifications[0], grouped);
......
......@@ -2,6 +2,7 @@
**
** This file is part of commhistory-daemon.
**
** Copyright (C) 2020 Open Mobile Platform LLC.
** Copyright (C) 2013-2016 Jolla Ltd.
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** Contact: John Brooks <john.brooks@jolla.com>
......@@ -809,7 +810,6 @@ void NotificationManager::slotVoicemailWaitingChanged()
voicemailNotification.setPreviewBody(txt_qtn_voicemail_prompt);
voicemailNotification.setSummary(voicemailNotification.previewSummary());
voicemailNotification.setBody(voicemailNotification.previewBody());
voicemailNotification.setItemCount(voicemailCount);
......
......@@ -128,6 +128,8 @@ void PersonalNotification::publishNotification()
m_notification->setHintValue("x-nemo-hidden", m_hidden);
m_notification->setSummary(name);
m_notification->setBody(notificationText());
m_notification->clearPreviewSummary();
m_notification->clearPreviewBody();
NotificationManager::instance()->setNotificationProperties(m_notification, this, false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment