-rw-r--r-- | libkcal/vcalformat.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 076cd3f..9307f12 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp | |||
@@ -344,28 +344,30 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) | |||
344 | // alarm stuff | 344 | // alarm stuff |
345 | kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl; | 345 | kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl; |
346 | QPtrList<Alarm> alarms = anEvent->alarms(); | 346 | QPtrList<Alarm> alarms = anEvent->alarms(); |
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()); | ||
353 | addPropValue(a, VCRepeatCountProp, "1"); | ||
354 | addPropValue(a, VCDisplayStringProp, "beep!"); | ||
355 | if (alarm->type() == Alarm::Audio) { | 352 | if (alarm->type() == Alarm::Audio) { |
356 | a = addProp(vtodo, VCAAlarmProp); | 353 | a = addProp(vtodo, VCAAlarmProp); |
357 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 354 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
358 | addPropValue(a, VCRepeatCountProp, "1"); | 355 | addPropValue(a, VCRepeatCountProp, "1"); |
359 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); | 356 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); |
360 | } | 357 | } |
361 | else if (alarm->type() == Alarm::Procedure) { | 358 | else if (alarm->type() == Alarm::Procedure) { |
362 | a = addProp(vtodo, VCPAlarmProp); | 359 | a = addProp(vtodo, VCPAlarmProp); |
363 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 360 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
364 | addPropValue(a, VCRepeatCountProp, "1"); | 361 | addPropValue(a, VCRepeatCountProp, "1"); |
365 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); | 362 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); |
363 | } else { | ||
364 | a = addProp(vtodo, VCDAlarmProp); | ||
365 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | ||
366 | addPropValue(a, VCRepeatCountProp, "1"); | ||
367 | addPropValue(a, VCDisplayStringProp, "beep!"); | ||
366 | } | 368 | } |
367 | } | 369 | } |
368 | } | 370 | } |
369 | 371 | ||
370 | if (anEvent->pilotId()) { | 372 | if (anEvent->pilotId()) { |
371 | // pilot sync stuff | 373 | // pilot sync stuff |
@@ -623,28 +625,31 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) | |||
623 | 625 | ||
624 | // alarm stuff | 626 | // alarm stuff |
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()); | ||
632 | addPropValue(a, VCRepeatCountProp, "1"); | ||
633 | addPropValue(a, VCDisplayStringProp, "beep!"); | ||
634 | if (alarm->type() == Alarm::Audio) { | 633 | if (alarm->type() == Alarm::Audio) { |
635 | a = addProp(vevent, VCAAlarmProp); | 634 | a = addProp(vevent, VCAAlarmProp); |
636 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 635 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
637 | addPropValue(a, VCRepeatCountProp, "1"); | 636 | addPropValue(a, VCRepeatCountProp, "1"); |
638 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); | 637 | addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile())); |
639 | } | 638 | } |
640 | if (alarm->type() == Alarm::Procedure) { | 639 | if (alarm->type() == Alarm::Procedure) { |
641 | a = addProp(vevent, VCPAlarmProp); | 640 | a = addProp(vevent, VCPAlarmProp); |
642 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | 641 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); |
643 | addPropValue(a, VCRepeatCountProp, "1"); | 642 | addPropValue(a, VCRepeatCountProp, "1"); |
644 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); | 643 | addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile())); |
644 | } else { | ||
645 | a = addProp(vevent, VCDAlarmProp); | ||
646 | addPropValue(a, VCRunTimeProp, tmpStr.local8Bit()); | ||
647 | addPropValue(a, VCRepeatCountProp, "1"); | ||
648 | addPropValue(a, VCDisplayStringProp, "beep!"); | ||
649 | |||
645 | } | 650 | } |
646 | } | 651 | } |
647 | } | 652 | } |
648 | 653 | ||
649 | // priority | 654 | // priority |
650 | tmpStr.sprintf("%i",anEvent->priority()); | 655 | tmpStr.sprintf("%i",anEvent->priority()); |