author | zautrix <zautrix> | 2004-10-07 08:21:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-07 08:21:07 (UTC) |
commit | 9345818e9c291130691288e4b065190259eb4e01 (patch) (unidiff) | |
tree | 860b8666dc71fc34819e380bda48ec3427aee822 /korganizer | |
parent | f1699230250cdfb37216121257196b5be9f094fa (diff) | |
download | kdepimpi-9345818e9c291130691288e4b065190259eb4e01.zip kdepimpi-9345818e9c291130691288e4b065190259eb4e01.tar.gz kdepimpi-9345818e9c291130691288e4b065190259eb4e01.tar.bz2 |
did I chanhe something?
-rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index d71ea08..1d62046 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1387,102 +1387,102 @@ bool CalendarView::importBday() | |||
1387 | 1387 | ||
1388 | 1388 | ||
1389 | return true; | 1389 | return true; |
1390 | } | 1390 | } |
1391 | 1391 | ||
1392 | // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI | 1392 | // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI |
1393 | void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, | 1393 | void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, |
1394 | const QStringList& anniversaryList, const QStringList& realNameList, | 1394 | const QStringList& anniversaryList, const QStringList& realNameList, |
1395 | const QStringList& emailList, const QStringList& assembledNameList, | 1395 | const QStringList& emailList, const QStringList& assembledNameList, |
1396 | const QStringList& uidList) | 1396 | const QStringList& uidList) |
1397 | { | 1397 | { |
1398 | qDebug("CalendarView::insertBirthdays"); | 1398 | qDebug("CalendarView::insertBirthdays"); |
1399 | if (uid == this->name()) | 1399 | if (uid == this->name()) |
1400 | { | 1400 | { |
1401 | int count = birthdayList.count(); | 1401 | int count = birthdayList.count(); |
1402 | int addCount = 0; | 1402 | int addCount = 0; |
1403 | KCal::Attendee* a = 0; | 1403 | KCal::Attendee* a = 0; |
1404 | 1404 | ||
1405 | qDebug("CalView 1 %i", count); | 1405 | qDebug("CalView 1 %i", count); |
1406 | 1406 | ||
1407 | QProgressBar bar(count,0 ); | 1407 | QProgressBar bar(count,0 ); |
1408 | int w = 300; | 1408 | int w = 300; |
1409 | if ( QApplication::desktop()->width() < 320 ) | 1409 | if ( QApplication::desktop()->width() < 320 ) |
1410 | w = 220; | 1410 | w = 220; |
1411 | int h = bar.sizeHint().height() ; | 1411 | int h = bar.sizeHint().height() ; |
1412 | int dw = QApplication::desktop()->width(); | 1412 | int dw = QApplication::desktop()->width(); |
1413 | int dh = QApplication::desktop()->height(); | 1413 | int dh = QApplication::desktop()->height(); |
1414 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1414 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
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 | 1432 | ||
1433 | birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); | 1433 | birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); |
1434 | if (!ok) { | 1434 | if (!ok) { |
1435 | ; //qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); | 1435 | ;//qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); |
1436 | } | 1436 | } |
1437 | 1437 | ||
1438 | anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); | 1438 | anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); |
1439 | if (!ok) { | 1439 | if (!ok) { |
1440 | ;// qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); | 1440 | ;//qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); |
1441 | } | 1441 | } |
1442 | realName = realNameList[i]; | 1442 | realName = realNameList[i]; |
1443 | email = emailList[i]; | 1443 | email = emailList[i]; |
1444 | assembledName = assembledNameList[i]; | 1444 | assembledName = assembledNameList[i]; |
1445 | uid = uidList[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() ); | 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 | 1447 | ||
1448 | if ( birthday.isValid() ){ | 1448 | if ( birthday.isValid() ){ |
1449 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | 1449 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, |
1450 | KCal::Attendee::ReqParticipant,uid) ; | 1450 | KCal::Attendee::ReqParticipant,uid) ; |
1451 | if ( addAnniversary( birthday, assembledName, a, true ) ) | 1451 | if ( addAnniversary( birthday, assembledName, a, true ) ) |
1452 | ++addCount; | 1452 | ++addCount; |
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | if ( anniversary.isValid() ){ | 1455 | if ( anniversary.isValid() ){ |
1456 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, | 1456 | a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, |
1457 | KCal::Attendee::ReqParticipant,uid) ; | 1457 | KCal::Attendee::ReqParticipant,uid) ; |
1458 | if ( addAnniversary( anniversary, assembledName, a, false ) ) | 1458 | if ( addAnniversary( anniversary, assembledName, a, false ) ) |
1459 | ++addCount; | 1459 | ++addCount; |
1460 | } | 1460 | } |
1461 | } | 1461 | } |
1462 | 1462 | ||
1463 | updateView(); | 1463 | updateView(); |
1464 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); | 1464 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |
1465 | 1465 | ||
1466 | } | 1466 | } |
1467 | 1467 | ||
1468 | } | 1468 | } |
1469 | 1469 | ||
1470 | 1470 | ||
1471 | 1471 | ||
1472 | 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) |
1473 | { | 1473 | { |
1474 | //qDebug("addAnni "); | 1474 | //qDebug("addAnni "); |
1475 | Event * ev = new Event(); | 1475 | Event * ev = new Event(); |
1476 | if ( a ) { | 1476 | if ( a ) { |
1477 | ev->addAttendee( a ); | 1477 | ev->addAttendee( a ); |
1478 | } | 1478 | } |
1479 | QString kind; | 1479 | QString kind; |
1480 | if ( birthday ) | 1480 | if ( birthday ) |
1481 | kind = i18n( "Birthday" ); | 1481 | kind = i18n( "Birthday" ); |
1482 | else | 1482 | else |
1483 | kind = i18n( "Anniversary" ); | 1483 | kind = i18n( "Anniversary" ); |
1484 | ev->setSummary( name + " - " + kind ); | 1484 | ev->setSummary( name + " - " + kind ); |
1485 | ev->setOrganizer( "nobody@nowhere" ); | 1485 | ev->setOrganizer( "nobody@nowhere" ); |
1486 | ev->setCategories( kind ); | 1486 | ev->setCategories( kind ); |
1487 | ev->setDtStart( QDateTime(date) ); | 1487 | ev->setDtStart( QDateTime(date) ); |
1488 | ev->setDtEnd( QDateTime(date) ); | 1488 | ev->setDtEnd( QDateTime(date) ); |