author | zautrix <zautrix> | 2004-07-10 17:03:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-10 17:03:16 (UTC) |
commit | cf2f3f98a4811668f9e9d0d5f44ea5b51d268cef (patch) (unidiff) | |
tree | 963322cd4c539c084feb43dfde5eabe52ae4385f /libkcal/icalformatimpl.cpp | |
parent | 8cc6d456812b5a9a386e81c9e46baccd56029537 (diff) | |
download | kdepimpi-cf2f3f98a4811668f9e9d0d5f44ea5b51d268cef.zip kdepimpi-cf2f3f98a4811668f9e9d0d5f44ea5b51d268cef.tar.gz kdepimpi-cf2f3f98a4811668f9e9d0d5f44ea5b51d268cef.tar.bz2 |
Fixed some problems with the recurrence
-rw-r--r-- | libkcal/icalformatimpl.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index 32a1337..964ffe3 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp | |||
@@ -1299,361 +1299,365 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence) | |||
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | // Cancel backwards compatibility mode for subsequent changes by the application | 1301 | // Cancel backwards compatibility mode for subsequent changes by the application |
1302 | incidence->recurrence()->setCompatVersion(); | 1302 | incidence->recurrence()->setCompatVersion(); |
1303 | 1303 | ||
1304 | // add categories | 1304 | // add categories |
1305 | incidence->setCategories(categories); | 1305 | incidence->setCategories(categories); |
1306 | 1306 | ||
1307 | // iterate through all alarms | 1307 | // iterate through all alarms |
1308 | for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT); | 1308 | for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT); |
1309 | alarm; | 1309 | alarm; |
1310 | alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) { | 1310 | alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) { |
1311 | readAlarm(alarm,incidence); | 1311 | readAlarm(alarm,incidence); |
1312 | } | 1312 | } |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) | 1315 | void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) |
1316 | { | 1316 | { |
1317 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); | 1317 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); |
1318 | 1318 | ||
1319 | while (p) { | 1319 | while (p) { |
1320 | icalproperty_kind kind = icalproperty_isa(p); | 1320 | icalproperty_kind kind = icalproperty_isa(p); |
1321 | switch (kind) { | 1321 | switch (kind) { |
1322 | 1322 | ||
1323 | case ICAL_UID_PROPERTY: // unique id | 1323 | case ICAL_UID_PROPERTY: // unique id |
1324 | incidenceBase->setUid(QString::fromUtf8(icalproperty_get_uid(p))); | 1324 | incidenceBase->setUid(QString::fromUtf8(icalproperty_get_uid(p))); |
1325 | break; | 1325 | break; |
1326 | 1326 | ||
1327 | case ICAL_ORGANIZER_PROPERTY: // organizer | 1327 | case ICAL_ORGANIZER_PROPERTY: // organizer |
1328 | incidenceBase->setOrganizer(QString::fromUtf8(icalproperty_get_organizer(p))); | 1328 | incidenceBase->setOrganizer(QString::fromUtf8(icalproperty_get_organizer(p))); |
1329 | break; | 1329 | break; |
1330 | 1330 | ||
1331 | case ICAL_ATTENDEE_PROPERTY: // attendee | 1331 | case ICAL_ATTENDEE_PROPERTY: // attendee |
1332 | incidenceBase->addAttendee(readAttendee(p)); | 1332 | incidenceBase->addAttendee(readAttendee(p)); |
1333 | break; | 1333 | break; |
1334 | 1334 | ||
1335 | default: | 1335 | default: |
1336 | break; | 1336 | break; |
1337 | } | 1337 | } |
1338 | 1338 | ||
1339 | p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY); | 1339 | p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY); |
1340 | } | 1340 | } |
1341 | 1341 | ||
1342 | // custom properties | 1342 | // custom properties |
1343 | readCustomProperties(parent, incidenceBase); | 1343 | readCustomProperties(parent, incidenceBase); |
1344 | } | 1344 | } |
1345 | 1345 | ||
1346 | void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties) | 1346 | void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties) |
1347 | { | 1347 | { |
1348 | QMap<QCString, QString> customProperties; | 1348 | QMap<QCString, QString> customProperties; |
1349 | 1349 | ||
1350 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY); | 1350 | icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY); |
1351 | 1351 | ||
1352 | while (p) { | 1352 | while (p) { |
1353 | QString value = QString::fromUtf8(icalproperty_get_x(p)); | 1353 | QString value = QString::fromUtf8(icalproperty_get_x(p)); |
1354 | customProperties[icalproperty_get_x_name(p)] = value; | 1354 | customProperties[icalproperty_get_x_name(p)] = value; |
1355 | //qDebug("ICalFormatImpl::readCustomProperties %s %s",value.latin1(), icalproperty_get_x_name(p) ); | 1355 | //qDebug("ICalFormatImpl::readCustomProperties %s %s",value.latin1(), icalproperty_get_x_name(p) ); |
1356 | 1356 | ||
1357 | p = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY); | 1357 | p = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY); |
1358 | } | 1358 | } |
1359 | 1359 | ||
1360 | properties->setCustomProperties(customProperties); | 1360 | properties->setCustomProperties(customProperties); |
1361 | } | 1361 | } |
1362 | 1362 | ||
1363 | void ICalFormatImpl::readRecurrenceRule(struct icalrecurrencetype rrule,Incidence *incidence) | 1363 | void ICalFormatImpl::readRecurrenceRule(struct icalrecurrencetype rrule,Incidence *incidence) |
1364 | { | 1364 | { |
1365 | // kdDebug(5800) << "Read recurrence for " << incidence->summary() << endl; | 1365 | // kdDebug(5800) << "Read recurrence for " << incidence->summary() << endl; |
1366 | 1366 | ||
1367 | Recurrence *recur = incidence->recurrence(); | 1367 | Recurrence *recur = incidence->recurrence(); |
1368 | recur->setCompatVersion(mCalendarVersion); | 1368 | recur->setCompatVersion(mCalendarVersion); |
1369 | recur->unsetRecurs(); | 1369 | recur->unsetRecurs(); |
1370 | 1370 | ||
1371 | struct icalrecurrencetype r = rrule; | 1371 | struct icalrecurrencetype r = rrule; |
1372 | 1372 | ||
1373 | dumpIcalRecurrence(r); | 1373 | dumpIcalRecurrence(r); |
1374 | readRecurrence( r, recur, incidence); | 1374 | readRecurrence( r, recur, incidence); |
1375 | } | 1375 | } |
1376 | 1376 | ||
1377 | void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurrence* recur, Incidence *incidence) | 1377 | void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurrence* recur, Incidence *incidence) |
1378 | { | 1378 | { |
1379 | int wkst; | 1379 | int wkst; |
1380 | int index = 0; | 1380 | int index = 0; |
1381 | short day = 0; | 1381 | short day = 0; |
1382 | QBitArray qba(7); | 1382 | QBitArray qba(7); |
1383 | int frequ = r.freq; | 1383 | int frequ = r.freq; |
1384 | int interv = r.interval; | 1384 | int interv = r.interval; |
1385 | // preprocessing for odd recurrence definitions | 1385 | // preprocessing for odd recurrence definitions |
1386 | 1386 | ||
1387 | if ( r.freq == ICAL_MONTHLY_RECURRENCE ) { | 1387 | if ( r.freq == ICAL_MONTHLY_RECURRENCE ) { |
1388 | if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1388 | if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1389 | interv = 12; | 1389 | interv = 12; |
1390 | } | 1390 | } |
1391 | } | 1391 | } |
1392 | if ( r.freq == ICAL_YEARLY_RECURRENCE ) { | 1392 | if ( r.freq == ICAL_YEARLY_RECURRENCE ) { |
1393 | if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX && r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX ) { | 1393 | if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX && r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX ) { |
1394 | frequ = ICAL_MONTHLY_RECURRENCE; | 1394 | frequ = ICAL_MONTHLY_RECURRENCE; |
1395 | interv = 12; | 1395 | interv = 12* r.interval; |
1396 | } | 1396 | } |
1397 | } | 1397 | } |
1398 | 1398 | ||
1399 | switch (frequ) { | 1399 | switch (frequ) { |
1400 | case ICAL_MINUTELY_RECURRENCE: | 1400 | case ICAL_MINUTELY_RECURRENCE: |
1401 | if (!icaltime_is_null_time(r.until)) { | 1401 | if (!icaltime_is_null_time(r.until)) { |
1402 | recur->setMinutely(interv,readICalDateTime(r.until)); | 1402 | recur->setMinutely(interv,readICalDateTime(r.until)); |
1403 | } else { | 1403 | } else { |
1404 | if (r.count == 0) | 1404 | if (r.count == 0) |
1405 | recur->setMinutely(interv,-1); | 1405 | recur->setMinutely(interv,-1); |
1406 | else | 1406 | else |
1407 | recur->setMinutely(interv,r.count); | 1407 | recur->setMinutely(interv,r.count); |
1408 | } | 1408 | } |
1409 | break; | 1409 | break; |
1410 | case ICAL_HOURLY_RECURRENCE: | 1410 | case ICAL_HOURLY_RECURRENCE: |
1411 | if (!icaltime_is_null_time(r.until)) { | 1411 | if (!icaltime_is_null_time(r.until)) { |
1412 | recur->setHourly(interv,readICalDateTime(r.until)); | 1412 | recur->setHourly(interv,readICalDateTime(r.until)); |
1413 | } else { | 1413 | } else { |
1414 | if (r.count == 0) | 1414 | if (r.count == 0) |
1415 | recur->setHourly(interv,-1); | 1415 | recur->setHourly(interv,-1); |
1416 | else | 1416 | else |
1417 | recur->setHourly(interv,r.count); | 1417 | recur->setHourly(interv,r.count); |
1418 | } | 1418 | } |
1419 | break; | 1419 | break; |
1420 | case ICAL_DAILY_RECURRENCE: | 1420 | case ICAL_DAILY_RECURRENCE: |
1421 | if (!icaltime_is_null_time(r.until)) { | 1421 | if (!icaltime_is_null_time(r.until)) { |
1422 | recur->setDaily(interv,readICalDate(r.until)); | 1422 | recur->setDaily(interv,readICalDate(r.until)); |
1423 | } else { | 1423 | } else { |
1424 | if (r.count == 0) | 1424 | if (r.count == 0) |
1425 | recur->setDaily(interv,-1); | 1425 | recur->setDaily(interv,-1); |
1426 | else | 1426 | else |
1427 | recur->setDaily(interv,r.count); | 1427 | recur->setDaily(interv,r.count); |
1428 | } | 1428 | } |
1429 | break; | 1429 | break; |
1430 | case ICAL_WEEKLY_RECURRENCE: | 1430 | case ICAL_WEEKLY_RECURRENCE: |
1431 | // kdDebug(5800) << "WEEKLY_RECURRENCE" << endl; | 1431 | // kdDebug(5800) << "WEEKLY_RECURRENCE" << endl; |
1432 | wkst = (r.week_start + 5)%7 + 1; | 1432 | wkst = (r.week_start + 5)%7 + 1; |
1433 | if (!icaltime_is_null_time(r.until)) { | 1433 | if (!icaltime_is_null_time(r.until)) { |
1434 | recur->setWeekly(interv,qba,readICalDate(r.until),wkst); | 1434 | recur->setWeekly(interv,qba,readICalDate(r.until),wkst); |
1435 | } else { | 1435 | } else { |
1436 | if (r.count == 0) | 1436 | if (r.count == 0) |
1437 | recur->setWeekly(interv,qba,-1,wkst); | 1437 | recur->setWeekly(interv,qba,-1,wkst); |
1438 | else | 1438 | else |
1439 | recur->setWeekly(interv,qba,r.count,wkst); | 1439 | recur->setWeekly(interv,qba,r.count,wkst); |
1440 | } | 1440 | } |
1441 | if ( r.by_day[0] == ICAL_RECURRENCE_ARRAY_MAX) { | 1441 | if ( r.by_day[0] == ICAL_RECURRENCE_ARRAY_MAX) { |
1442 | int wday = incidence->dtStart().date().dayOfWeek ()-1; | 1442 | int wday = incidence->dtStart().date().dayOfWeek ()-1; |
1443 | //qDebug("weekly error found "); | 1443 | //qDebug("weekly error found "); |
1444 | qba.setBit(wday); | 1444 | qba.setBit(wday); |
1445 | } else { | 1445 | } else { |
1446 | while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { | 1446 | while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { |
1447 | // kdDebug(5800) << " " << day << endl; | 1447 | // kdDebug(5800) << " " << day << endl; |
1448 | qba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 | 1448 | qba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 |
1449 | } | 1449 | } |
1450 | } | 1450 | } |
1451 | break; | 1451 | break; |
1452 | case ICAL_MONTHLY_RECURRENCE: | 1452 | case ICAL_MONTHLY_RECURRENCE: |
1453 | 1453 | ||
1454 | if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1454 | if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1455 | if (!icaltime_is_null_time(r.until)) { | 1455 | if (!icaltime_is_null_time(r.until)) { |
1456 | recur->setMonthly(Recurrence::rMonthlyPos,interv, | 1456 | recur->setMonthly(Recurrence::rMonthlyPos,interv, |
1457 | readICalDate(r.until)); | 1457 | readICalDate(r.until)); |
1458 | } else { | 1458 | } else { |
1459 | if (r.count == 0) | 1459 | if (r.count == 0) |
1460 | recur->setMonthly(Recurrence::rMonthlyPos,interv,-1); | 1460 | recur->setMonthly(Recurrence::rMonthlyPos,interv,-1); |
1461 | else | 1461 | else |
1462 | recur->setMonthly(Recurrence::rMonthlyPos,interv,r.count); | 1462 | recur->setMonthly(Recurrence::rMonthlyPos,interv,r.count); |
1463 | } | 1463 | } |
1464 | bool useSetPos = false; | 1464 | bool useSetPos = false; |
1465 | short pos = 0; | 1465 | short pos = 0; |
1466 | while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { | 1466 | while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { |
1467 | // kdDebug(5800) << "----a " << index << ": " << day << endl; | 1467 | // kdDebug(5800) << "----a " << index << ": " << day << endl; |
1468 | pos = icalrecurrencetype_day_position(day); | 1468 | pos = icalrecurrencetype_day_position(day); |
1469 | if (pos) { | 1469 | if (pos) { |
1470 | day = icalrecurrencetype_day_day_of_week(day); | 1470 | day = icalrecurrencetype_day_day_of_week(day); |
1471 | QBitArray ba(7); // don't wipe qba | 1471 | QBitArray ba(7); // don't wipe qba |
1472 | ba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 | 1472 | ba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 |
1473 | recur->addMonthlyPos(pos,ba); | 1473 | recur->addMonthlyPos(pos,ba); |
1474 | } else { | 1474 | } else { |
1475 | qba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 | 1475 | qba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 |
1476 | useSetPos = true; | 1476 | useSetPos = true; |
1477 | } | 1477 | } |
1478 | } | 1478 | } |
1479 | if (useSetPos) { | 1479 | if (useSetPos) { |
1480 | if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1480 | if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1481 | recur->addMonthlyPos(r.by_set_pos[0],qba); | 1481 | recur->addMonthlyPos(r.by_set_pos[0],qba); |
1482 | } | 1482 | } |
1483 | } | 1483 | } |
1484 | } else if (r.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1484 | } else if (r.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1485 | if (!icaltime_is_null_time(r.until)) { | 1485 | if (!icaltime_is_null_time(r.until)) { |
1486 | recur->setMonthly(Recurrence::rMonthlyDay,interv, | 1486 | recur->setMonthly(Recurrence::rMonthlyDay,interv, |
1487 | readICalDate(r.until)); | 1487 | readICalDate(r.until)); |
1488 | } else { | 1488 | } else { |
1489 | if (r.count == 0) | 1489 | if (r.count == 0) |
1490 | recur->setMonthly(Recurrence::rMonthlyDay,interv,-1); | 1490 | recur->setMonthly(Recurrence::rMonthlyDay,interv,-1); |
1491 | else | 1491 | else |
1492 | recur->setMonthly(Recurrence::rMonthlyDay,interv,r.count); | 1492 | recur->setMonthly(Recurrence::rMonthlyDay,interv,r.count); |
1493 | } | 1493 | } |
1494 | while((day = r.by_month_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { | 1494 | while((day = r.by_month_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { |
1495 | // kdDebug(5800) << "----b " << day << endl; | 1495 | // kdDebug(5800) << "----b " << day << endl; |
1496 | recur->addMonthlyDay(day); | 1496 | recur->addMonthlyDay(day); |
1497 | } | 1497 | } |
1498 | } | 1498 | } |
1499 | break; | 1499 | break; |
1500 | case ICAL_YEARLY_RECURRENCE: | 1500 | case ICAL_YEARLY_RECURRENCE: |
1501 | if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1501 | if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1502 | qDebug(" YEARLY DAY OF YEAR"); | ||
1502 | if (!icaltime_is_null_time(r.until)) { | 1503 | if (!icaltime_is_null_time(r.until)) { |
1503 | recur->setYearly(Recurrence::rYearlyDay,interv, | 1504 | recur->setYearly(Recurrence::rYearlyDay,interv, |
1504 | readICalDate(r.until)); | 1505 | readICalDate(r.until)); |
1505 | } else { | 1506 | } else { |
1506 | if (r.count == 0) | 1507 | if (r.count == 0) |
1507 | recur->setYearly(Recurrence::rYearlyDay,interv,-1); | 1508 | recur->setYearly(Recurrence::rYearlyDay,interv,-1); |
1508 | else | 1509 | else |
1509 | recur->setYearly(Recurrence::rYearlyDay,interv,r.count); | 1510 | recur->setYearly(Recurrence::rYearlyDay,interv,r.count); |
1510 | } | 1511 | } |
1511 | while((day = r.by_year_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { | 1512 | while((day = r.by_year_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { |
1512 | recur->addYearlyNum(day); | 1513 | recur->addYearlyNum(day); |
1513 | } | 1514 | } |
1514 | } else if ( true /*r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX*/) { | 1515 | } else if ( true /*r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX*/) { |
1515 | if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1516 | if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1517 | qDebug("YEARLY POS NOT SUPPORTED BY GUI"); | ||
1516 | if (!icaltime_is_null_time(r.until)) { | 1518 | if (!icaltime_is_null_time(r.until)) { |
1517 | recur->setYearly(Recurrence::rYearlyPos,interv, | 1519 | recur->setYearly(Recurrence::rYearlyPos,interv, |
1518 | readICalDate(r.until)); | 1520 | readICalDate(r.until)); |
1519 | } else { | 1521 | } else { |
1520 | if (r.count == 0) | 1522 | if (r.count == 0) |
1521 | recur->setYearly(Recurrence::rYearlyPos,interv,-1); | 1523 | recur->setYearly(Recurrence::rYearlyPos,interv,-1); |
1522 | else | 1524 | else |
1523 | recur->setYearly(Recurrence::rYearlyPos,interv,r.count); | 1525 | recur->setYearly(Recurrence::rYearlyPos,interv,r.count); |
1524 | } | 1526 | } |
1525 | bool useSetPos = false; | 1527 | bool useSetPos = false; |
1526 | short pos = 0; | 1528 | short pos = 0; |
1527 | while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { | 1529 | while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { |
1528 | // kdDebug(5800) << "----a " << index << ": " << day << endl; | 1530 | // kdDebug(5800) << "----a " << index << ": " << day << endl; |
1529 | pos = icalrecurrencetype_day_position(day); | 1531 | pos = icalrecurrencetype_day_position(day); |
1530 | if (pos) { | 1532 | if (pos) { |
1531 | day = icalrecurrencetype_day_day_of_week(day); | 1533 | day = icalrecurrencetype_day_day_of_week(day); |
1532 | QBitArray ba(7); // don't wipe qba | 1534 | QBitArray ba(7); // don't wipe qba |
1533 | ba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 | 1535 | ba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 |
1534 | recur->addYearlyMonthPos(pos,ba); | 1536 | recur->addYearlyMonthPos(pos,ba); |
1535 | } else { | 1537 | } else { |
1536 | qba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 | 1538 | qba.setBit((day+5)%7); // convert from Sunday=1 to Monday=0 |
1537 | useSetPos = true; | 1539 | useSetPos = true; |
1538 | } | 1540 | } |
1539 | } | 1541 | } |
1540 | if (useSetPos) { | 1542 | if (useSetPos) { |
1541 | if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) { | 1543 | if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) { |
1542 | recur->addYearlyMonthPos(r.by_set_pos[0],qba); | 1544 | recur->addYearlyMonthPos(r.by_set_pos[0],qba); |
1543 | } | 1545 | } |
1544 | } | 1546 | } |
1545 | } else { | 1547 | } else { |
1548 | qDebug("YEARLY MONTH "); | ||
1546 | if (!icaltime_is_null_time(r.until)) { | 1549 | if (!icaltime_is_null_time(r.until)) { |
1547 | recur->setYearly(Recurrence::rYearlyMonth,interv, | 1550 | recur->setYearly(Recurrence::rYearlyMonth,interv, |
1548 | readICalDate(r.until)); | 1551 | readICalDate(r.until)); |
1549 | } else { | 1552 | } else { |
1550 | if (r.count == 0) | 1553 | if (r.count == 0) |
1551 | recur->setYearly(Recurrence::rYearlyMonth,interv,-1); | 1554 | recur->setYearly(Recurrence::rYearlyMonth,interv,-1); |
1552 | else | 1555 | else |
1553 | recur->setYearly(Recurrence::rYearlyMonth,interv,r.count); | 1556 | recur->setYearly(Recurrence::rYearlyMonth,interv,r.count); |
1554 | } | 1557 | } |
1555 | } | 1558 | if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) { |
1556 | if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) { | 1559 | index = 0; |
1557 | index = 0; | 1560 | while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { |
1558 | while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) { | 1561 | recur->addYearlyNum(day); |
1559 | recur->addYearlyNum(day); | 1562 | } |
1563 | } else { | ||
1564 | recur->addYearlyNum(incidence->dtStart().date().month()); | ||
1560 | } | 1565 | } |
1561 | } else { | ||
1562 | recur->addYearlyNum(incidence->dtStart().date().month()); | ||
1563 | } | 1566 | } |
1567 | |||
1564 | } | 1568 | } |
1565 | break; | 1569 | break; |
1566 | default: | 1570 | default: |
1567 | ; | 1571 | ; |
1568 | break; | 1572 | break; |
1569 | } | 1573 | } |
1570 | } | 1574 | } |
1571 | 1575 | ||
1572 | void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence) | 1576 | void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence) |
1573 | { | 1577 | { |
1574 | //kdDebug(5800) << "Read alarm for " << incidence->summary() << endl; | 1578 | //kdDebug(5800) << "Read alarm for " << incidence->summary() << endl; |
1575 | 1579 | ||
1576 | Alarm* ialarm = incidence->newAlarm(); | 1580 | Alarm* ialarm = incidence->newAlarm(); |
1577 | ialarm->setRepeatCount(0); | 1581 | ialarm->setRepeatCount(0); |
1578 | ialarm->setEnabled(true); | 1582 | ialarm->setEnabled(true); |
1579 | 1583 | ||
1580 | // Determine the alarm's action type | 1584 | // Determine the alarm's action type |
1581 | icalproperty *p = icalcomponent_get_first_property(alarm,ICAL_ACTION_PROPERTY); | 1585 | icalproperty *p = icalcomponent_get_first_property(alarm,ICAL_ACTION_PROPERTY); |
1582 | if ( !p ) { | 1586 | if ( !p ) { |
1583 | return; | 1587 | return; |
1584 | } | 1588 | } |
1585 | 1589 | ||
1586 | icalproperty_action action = icalproperty_get_action(p); | 1590 | icalproperty_action action = icalproperty_get_action(p); |
1587 | Alarm::Type type = Alarm::Display; | 1591 | Alarm::Type type = Alarm::Display; |
1588 | switch ( action ) { | 1592 | switch ( action ) { |
1589 | case ICAL_ACTION_DISPLAY: type = Alarm::Display; break; | 1593 | case ICAL_ACTION_DISPLAY: type = Alarm::Display; break; |
1590 | case ICAL_ACTION_AUDIO: type = Alarm::Audio; break; | 1594 | case ICAL_ACTION_AUDIO: type = Alarm::Audio; break; |
1591 | case ICAL_ACTION_PROCEDURE: type = Alarm::Procedure; break; | 1595 | case ICAL_ACTION_PROCEDURE: type = Alarm::Procedure; break; |
1592 | case ICAL_ACTION_EMAIL: type = Alarm::Email; break; | 1596 | case ICAL_ACTION_EMAIL: type = Alarm::Email; break; |
1593 | default: | 1597 | default: |
1594 | ; | 1598 | ; |
1595 | return; | 1599 | return; |
1596 | } | 1600 | } |
1597 | ialarm->setType(type); | 1601 | ialarm->setType(type); |
1598 | 1602 | ||
1599 | p = icalcomponent_get_first_property(alarm,ICAL_ANY_PROPERTY); | 1603 | p = icalcomponent_get_first_property(alarm,ICAL_ANY_PROPERTY); |
1600 | while (p) { | 1604 | while (p) { |
1601 | icalproperty_kind kind = icalproperty_isa(p); | 1605 | icalproperty_kind kind = icalproperty_isa(p); |
1602 | 1606 | ||
1603 | switch (kind) { | 1607 | switch (kind) { |
1604 | case ICAL_TRIGGER_PROPERTY: { | 1608 | case ICAL_TRIGGER_PROPERTY: { |
1605 | icaltriggertype trigger = icalproperty_get_trigger(p); | 1609 | icaltriggertype trigger = icalproperty_get_trigger(p); |
1606 | if (icaltime_is_null_time(trigger.time)) { | 1610 | if (icaltime_is_null_time(trigger.time)) { |
1607 | if (icaldurationtype_is_null_duration(trigger.duration)) { | 1611 | if (icaldurationtype_is_null_duration(trigger.duration)) { |
1608 | kdDebug(5800) << "ICalFormatImpl::readAlarm(): Trigger has no time and no duration." << endl; | 1612 | kdDebug(5800) << "ICalFormatImpl::readAlarm(): Trigger has no time and no duration." << endl; |
1609 | } else { | 1613 | } else { |
1610 | Duration duration = icaldurationtype_as_int( trigger.duration ); | 1614 | Duration duration = icaldurationtype_as_int( trigger.duration ); |
1611 | icalparameter *param = icalproperty_get_first_parameter(p,ICAL_RELATED_PARAMETER); | 1615 | icalparameter *param = icalproperty_get_first_parameter(p,ICAL_RELATED_PARAMETER); |
1612 | if (param && icalparameter_get_related(param) == ICAL_RELATED_END) | 1616 | if (param && icalparameter_get_related(param) == ICAL_RELATED_END) |
1613 | ialarm->setEndOffset(duration); | 1617 | ialarm->setEndOffset(duration); |
1614 | else | 1618 | else |
1615 | ialarm->setStartOffset(duration); | 1619 | ialarm->setStartOffset(duration); |
1616 | } | 1620 | } |
1617 | } else { | 1621 | } else { |
1618 | ialarm->setTime(readICalDateTime(trigger.time)); | 1622 | ialarm->setTime(readICalDateTime(trigger.time)); |
1619 | } | 1623 | } |
1620 | break; | 1624 | break; |
1621 | } | 1625 | } |
1622 | case ICAL_DURATION_PROPERTY: { | 1626 | case ICAL_DURATION_PROPERTY: { |
1623 | icaldurationtype duration = icalproperty_get_duration(p); | 1627 | icaldurationtype duration = icalproperty_get_duration(p); |
1624 | ialarm->setSnoozeTime(icaldurationtype_as_int(duration)/60); | 1628 | ialarm->setSnoozeTime(icaldurationtype_as_int(duration)/60); |
1625 | break; | 1629 | break; |
1626 | } | 1630 | } |
1627 | case ICAL_REPEAT_PROPERTY: | 1631 | case ICAL_REPEAT_PROPERTY: |
1628 | ialarm->setRepeatCount(icalproperty_get_repeat(p)); | 1632 | ialarm->setRepeatCount(icalproperty_get_repeat(p)); |
1629 | break; | 1633 | break; |
1630 | 1634 | ||
1631 | // Only in DISPLAY and EMAIL and PROCEDURE alarms | 1635 | // Only in DISPLAY and EMAIL and PROCEDURE alarms |
1632 | case ICAL_DESCRIPTION_PROPERTY: { | 1636 | case ICAL_DESCRIPTION_PROPERTY: { |
1633 | QString description = QString::fromUtf8(icalproperty_get_description(p)); | 1637 | QString description = QString::fromUtf8(icalproperty_get_description(p)); |
1634 | switch ( action ) { | 1638 | switch ( action ) { |
1635 | case ICAL_ACTION_DISPLAY: | 1639 | case ICAL_ACTION_DISPLAY: |
1636 | ialarm->setText( description ); | 1640 | ialarm->setText( description ); |
1637 | break; | 1641 | break; |
1638 | case ICAL_ACTION_PROCEDURE: | 1642 | case ICAL_ACTION_PROCEDURE: |
1639 | ialarm->setProgramArguments( description ); | 1643 | ialarm->setProgramArguments( description ); |
1640 | break; | 1644 | break; |
1641 | case ICAL_ACTION_EMAIL: | 1645 | case ICAL_ACTION_EMAIL: |
1642 | ialarm->setMailText( description ); | 1646 | ialarm->setMailText( description ); |
1643 | break; | 1647 | break; |
1644 | default: | 1648 | default: |
1645 | break; | 1649 | break; |
1646 | } | 1650 | } |
1647 | break; | 1651 | break; |
1648 | } | 1652 | } |
1649 | // Only in EMAIL alarm | 1653 | // Only in EMAIL alarm |
1650 | case ICAL_SUMMARY_PROPERTY: | 1654 | case ICAL_SUMMARY_PROPERTY: |
1651 | ialarm->setMailSubject(QString::fromUtf8(icalproperty_get_summary(p))); | 1655 | ialarm->setMailSubject(QString::fromUtf8(icalproperty_get_summary(p))); |
1652 | break; | 1656 | break; |
1653 | 1657 | ||
1654 | // Only in EMAIL alarm | 1658 | // Only in EMAIL alarm |
1655 | case ICAL_ATTENDEE_PROPERTY: { | 1659 | case ICAL_ATTENDEE_PROPERTY: { |
1656 | QString email = QString::fromUtf8(icalproperty_get_attendee(p)); | 1660 | QString email = QString::fromUtf8(icalproperty_get_attendee(p)); |
1657 | QString name; | 1661 | QString name; |
1658 | icalparameter *param = icalproperty_get_first_parameter(p,ICAL_CN_PARAMETER); | 1662 | icalparameter *param = icalproperty_get_first_parameter(p,ICAL_CN_PARAMETER); |
1659 | if (param) { | 1663 | if (param) { |