-rw-r--r-- | korganizer/calendarview.cpp | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index b3b4cdb..d71ea08 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1415,58 +1415,59 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd | |||
1415 | bar.show(); | 1415 | bar.show(); |
1416 | bar.setCaption (i18n("inserting birthdays - close to abort!") ); | 1416 | bar.setCaption (i18n("inserting birthdays - close to abort!") ); |
1417 | qApp->processEvents(); | 1417 | qApp->processEvents(); |
1418 | 1418 | ||
1419 | QDate birthday; | 1419 | QDate birthday; |
1420 | QDate anniversary; | 1420 | QDate anniversary; |
1421 | QString realName; | 1421 | QString realName; |
1422 | QString email; | 1422 | QString email; |
1423 | QString assembledName; | 1423 | QString assembledName; |
1424 | QString uid; | 1424 | QString uid; |
1425 | bool ok = true; | 1425 | bool ok = true; |
1426 | for ( int i = 0; i < count; i++) | 1426 | for ( int i = 0; i < count; i++) |
1427 | { | 1427 | { |
1428 | if ( ! bar.isVisible() ) | 1428 | if ( ! bar.isVisible() ) |
1429 | return; | 1429 | return; |
1430 | bar.setProgress( i ); | 1430 | bar.setProgress( i ); |
1431 | qApp->processEvents(); | 1431 | qApp->processEvents(); |
1432 | |||
1433 | qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() ); | ||
1434 | |||
1435 | birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); | ||
1436 | if (!ok) | ||
1437 | qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); | ||
1438 | |||
1439 | anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); | ||
1440 | if (!ok) | ||
1441 | qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); | ||
1442 | realName = realNameList[i]; | ||
1443 | email = emailList[i]; | ||
1444 | assembledName = assembledNameList[i]; | ||
1445 | uid = uidList[i]; | ||
1446 | 1432 | ||
1447 | if ( birthday.isValid() ){ | 1433 | birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); |
1448 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | 1434 | if (!ok) { |
1449 | KCal::Attendee::ReqParticipant,uid) ; | 1435 | ; //qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); |
1450 | if ( addAnniversary( birthday, assembledName, a, true ) ) | 1436 | } |
1451 | ++addCount; | ||
1452 | } | ||
1453 | 1437 | ||
1454 | if ( anniversary.isValid() ){ | 1438 | anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); |
1455 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | 1439 | if (!ok) { |
1456 | KCal::Attendee::ReqParticipant,uid) ; | 1440 | ;// qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); |
1457 | if ( addAnniversary( anniversary, assembledName, a, false ) ) | 1441 | } |
1458 | ++addCount; | 1442 | realName = realNameList[i]; |
1443 | email = emailList[i]; | ||
1444 | assembledName = assembledNameList[i]; | ||
1445 | uid = uidList[i]; | ||
1446 | //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() ); | ||
1447 | |||
1448 | if ( birthday.isValid() ){ | ||
1449 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | ||
1450 | KCal::Attendee::ReqParticipant,uid) ; | ||
1451 | if ( addAnniversary( birthday, assembledName, a, true ) ) | ||
1452 | ++addCount; | ||
1453 | } | ||
1454 | |||
1455 | if ( anniversary.isValid() ){ | ||
1456 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | ||
1457 | KCal::Attendee::ReqParticipant,uid) ; | ||
1458 | if ( addAnniversary( anniversary, assembledName, a, false ) ) | ||
1459 | ++addCount; | ||
1460 | } | ||
1459 | } | 1461 | } |
1460 | } | ||
1461 | 1462 | ||
1462 | updateView(); | 1463 | updateView(); |
1463 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); | 1464 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |
1464 | 1465 | ||
1465 | } | 1466 | } |
1466 | 1467 | ||
1467 | } | 1468 | } |
1468 | 1469 | ||
1469 | 1470 | ||
1470 | 1471 | ||
1471 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) | 1472 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) |
1472 | { | 1473 | { |