Commit cc466164 authored by David Jarvie's avatar David Jarvie
Browse files

Don't write font/colour into calendar for a notification alarm

parent a02ef2e9
Pipeline #35258 passed with stage
in 14 minutes and 12 seconds
......@@ -1492,7 +1492,7 @@ Alarm::Ptr KAEventPrivate::initKCalAlarm(const KCalendarCore::Event::Ptr &event,
}
break;
}
if (display)
if (display && !mNotify)
alarm->setCustomProperty(KACalendar::APPNAME, FONT_COLOUR_PROPERTY,
QStringLiteral("%1;%2;%3").arg(mBgColour.name(), mFgColour.name(), mUseDefaultFont ? QString() : mFont.toString()));
break;
......@@ -5232,7 +5232,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
* Set the DTEND time to the DTSTART time.
* Convert all alarm times to DTSTART offsets.
* For display alarms, convert the first unlabelled category to an
* X-KDE-KALARM-FONTCOLOUR property.
* X-KDE-KALARM-FONTCOLOR property.
* Convert BEEP category into an audio alarm with no audio file.
*/
if (CalEvent::status(event) == CalEvent::ARCHIVED) {
......
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