-rw-r--r-- | libkcal/vcalformat.cpp | 71 |
1 files changed, 38 insertions, 33 deletions
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 076cd3f..9307f12 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp | |||
@@ -347,22 +347,24 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) | |||
347 | Alarm* alarm; | 347 | Alarm* alarm; |
348 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { | 348 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { |
349 | if (alarm->enabled()) { | 349 | if (alarm->enabled()) { |
350 | VObject *a = addProp(vtodo, VCDAlarmProp); | 350 | VObject *a; |
351 | tmpStr = qDateTimeToISO(alarm->time()); | 351 | tmpStr = qDateTimeToISO(alarm->time()); |
352 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 352 | if (alarm->type() == Alarm::Audio) { |
353 | addPropValue(a, VCRepeatCountProp, "1"); | 353 | a = addProp(vtodo, VCAAlarmProp); |
354 | addPropValue(a, VCDisplayStringProp, "beep!"); | 354 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
355 | if (alarm->type() == Alarm::Audio) { | 355 | addPropValue(a, VCRepeatCountProp, "1"); |
356 | a = addProp(vtodo, VCAAlarmProp); | 356 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); |
357 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 357 | } |
358 | addPropValue(a, VCRepeatCountProp, "1"); | 358 | else if (alarm->type() == Alarm::Procedure) { |
359 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); | 359 | a = addProp(vtodo, VCPAlarmProp); |
360 | } | 360 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
361 | else if (alarm->type() == Alarm::Procedure) { | 361 | addPropValue(a, VCRepeatCountProp, "1"); |
362 | a = addProp(vtodo, VCPAlarmProp); | 362 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); |
363 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 363 | } else { |
364 | addPropValue(a, VCRepeatCountProp, "1"); | 364 | a = addProp(vtodo, VCDAlarmProp); |
365 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); | 365 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
366 | addPropValue(a, VCRepeatCountProp, "1"); | ||
367 | addPropValue(a, VCDisplayStringProp, "beep!"); | ||
366 | } | 368 | } |
367 | } | 369 | } |
368 | } | 370 | } |
@@ -625,23 +627,26 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) | |||
625 | QPtrList<Alarm> alarms = anEvent->alarms(); | 627 | QPtrList<Alarm> alarms = anEvent->alarms(); |
626 | Alarm* alarm; | 628 | Alarm* alarm; |
627 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { | 629 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { |
628 | if (alarm->enabled()) { | 630 | if (alarm->enabled()) { |
629 | VObject *a = addProp(vevent, VCDAlarmProp); | 631 | VObject *a ; |
630 | tmpStr = qDateTimeToISO(alarm->time()); | 632 | tmpStr = qDateTimeToISO(alarm->time()); |
631 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 633 | if (alarm->type() == Alarm::Audio) { |
632 | addPropValue(a, VCRepeatCountProp, "1"); | 634 | a = addProp(vevent, VCAAlarmProp); |
633 | addPropValue(a, VCDisplayStringProp, "beep!"); | 635 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
634 | if (alarm->type() == Alarm::Audio) { | 636 | addPropValue(a, VCRepeatCountProp, "1"); |
635 | a = addProp(vevent, VCAAlarmProp); | 637 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); |
636 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 638 | } |
637 | addPropValue(a, VCRepeatCountProp, "1"); | 639 | if (alarm->type() == Alarm::Procedure) { |
638 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); | 640 | a = addProp(vevent, VCPAlarmProp); |
639 | } | 641 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
640 | if (alarm->type() == Alarm::Procedure) { | 642 | addPropValue(a, VCRepeatCountProp, "1"); |
641 | a = addProp(vevent, VCPAlarmProp); | 643 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); |
642 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 644 | } else { |
643 | addPropValue(a, VCRepeatCountProp, "1"); | 645 | a = addProp(vevent, VCDAlarmProp); |
644 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); | 646 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
647 | addPropValue(a, VCRepeatCountProp, "1"); | ||
648 | addPropValue(a, VCDisplayStringProp, "beep!"); | ||
649 | |||
645 | } | 650 | } |
646 | } | 651 | } |
647 | } | 652 | } |