-rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 369c7a0..56b3fb0 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1305,91 +1305,93 @@ void CalendarView::syncExternal( int mode ) | |||
1305 | lse->setDescription( "" ); | 1305 | lse->setDescription( "" ); |
1306 | lse->setReadOnly( true ); | 1306 | lse->setReadOnly( true ); |
1307 | } | 1307 | } |
1308 | } | 1308 | } |
1309 | } | 1309 | } |
1310 | setModified( true ); | 1310 | setModified( true ); |
1311 | } else { | 1311 | } else { |
1312 | QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; | 1312 | QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; |
1313 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), | 1313 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), |
1314 | question, i18n("Ok")) ; | 1314 | question, i18n("Ok")) ; |
1315 | 1315 | ||
1316 | } | 1316 | } |
1317 | delete calendar; | 1317 | delete calendar; |
1318 | updateView(); | 1318 | updateView(); |
1319 | return ;//syncOK; | 1319 | return ;//syncOK; |
1320 | 1320 | ||
1321 | } | 1321 | } |
1322 | void CalendarView::syncSharp() | 1322 | void CalendarView::syncSharp() |
1323 | { | 1323 | { |
1324 | syncExternal( 0 ); | 1324 | syncExternal( 0 ); |
1325 | 1325 | ||
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | 1328 | ||
1329 | #include <kabc/stdaddressbook.h> | 1329 | //#include <kabc/stdaddressbook.h> |
1330 | bool CalendarView::importBday() | 1330 | bool CalendarView::importBday() |
1331 | { | 1331 | { |
1332 | #if 0 | ||
1332 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 1333 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
1333 | KABC::AddressBook::Iterator it; | 1334 | KABC::AddressBook::Iterator it; |
1334 | int count = 0; | 1335 | int count = 0; |
1335 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 1336 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
1336 | ++count; | 1337 | ++count; |
1337 | } | 1338 | } |
1338 | QProgressBar bar(count,0 ); | 1339 | QProgressBar bar(count,0 ); |
1339 | int w = 300; | 1340 | int w = 300; |
1340 | if ( QApplication::desktop()->width() < 320 ) | 1341 | if ( QApplication::desktop()->width() < 320 ) |
1341 | w = 220; | 1342 | w = 220; |
1342 | int h = bar.sizeHint().height() ; | 1343 | int h = bar.sizeHint().height() ; |
1343 | int dw = QApplication::desktop()->width(); | 1344 | int dw = QApplication::desktop()->width(); |
1344 | int dh = QApplication::desktop()->height(); | 1345 | int dh = QApplication::desktop()->height(); |
1345 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1346 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
1346 | bar.show(); | 1347 | bar.show(); |
1347 | bar.setCaption (i18n("Reading addressbook - close to abort!") ); | 1348 | bar.setCaption (i18n("Reading addressbook - close to abort!") ); |
1348 | qApp->processEvents(); | 1349 | qApp->processEvents(); |
1349 | count = 0; | 1350 | count = 0; |
1350 | int addCount = 0; | 1351 | int addCount = 0; |
1351 | KCal::Attendee* a = 0; | 1352 | KCal::Attendee* a = 0; |
1352 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 1353 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
1353 | if ( ! bar.isVisible() ) | 1354 | if ( ! bar.isVisible() ) |
1354 | return false; | 1355 | return false; |
1355 | bar.setProgress( count++ ); | 1356 | bar.setProgress( count++ ); |
1356 | qApp->processEvents(); | 1357 | qApp->processEvents(); |
1357 | //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() ); | 1358 | //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() ); |
1358 | if ( (*it).birthday().date().isValid() ){ | 1359 | if ( (*it).birthday().date().isValid() ){ |
1359 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; | 1360 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; |
1360 | if ( addAnniversary( (*it).birthday().date(), (*it).assembledName(), a, true ) ) | 1361 | if ( addAnniversary( (*it).birthday().date(), (*it).assembledName(), a, true ) ) |
1361 | ++addCount; | 1362 | ++addCount; |
1362 | } | 1363 | } |
1363 | QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); | 1364 | QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); |
1364 | if ( anni.isValid() ){ | 1365 | if ( anni.isValid() ){ |
1365 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; | 1366 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; |
1366 | if ( addAnniversary( anni, (*it).assembledName(), a, false ) ) | 1367 | if ( addAnniversary( anni, (*it).assembledName(), a, false ) ) |
1367 | ++addCount; | 1368 | ++addCount; |
1368 | } | 1369 | } |
1369 | } | 1370 | } |
1370 | updateView(); | 1371 | updateView(); |
1371 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); | 1372 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |
1373 | #endif | ||
1372 | return true; | 1374 | return true; |
1373 | } | 1375 | } |
1374 | 1376 | ||
1375 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) | 1377 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) |
1376 | { | 1378 | { |
1377 | //qDebug("addAnni "); | 1379 | //qDebug("addAnni "); |
1378 | Event * ev = new Event(); | 1380 | Event * ev = new Event(); |
1379 | if ( a ) { | 1381 | if ( a ) { |
1380 | ev->addAttendee( a ); | 1382 | ev->addAttendee( a ); |
1381 | } | 1383 | } |
1382 | QString kind; | 1384 | QString kind; |
1383 | if ( birthday ) | 1385 | if ( birthday ) |
1384 | kind = i18n( "Birthday" ); | 1386 | kind = i18n( "Birthday" ); |
1385 | else | 1387 | else |
1386 | kind = i18n( "Anniversary" ); | 1388 | kind = i18n( "Anniversary" ); |
1387 | ev->setSummary( name + " - " + kind ); | 1389 | ev->setSummary( name + " - " + kind ); |
1388 | ev->setOrganizer( "nobody@nowhere" ); | 1390 | ev->setOrganizer( "nobody@nowhere" ); |
1389 | ev->setCategories( kind ); | 1391 | ev->setCategories( kind ); |
1390 | ev->setDtStart( QDateTime(date) ); | 1392 | ev->setDtStart( QDateTime(date) ); |
1391 | ev->setDtEnd( QDateTime(date) ); | 1393 | ev->setDtEnd( QDateTime(date) ); |
1392 | ev->setFloats( true ); | 1394 | ev->setFloats( true ); |
1393 | Recurrence * rec = ev->recurrence(); | 1395 | Recurrence * rec = ev->recurrence(); |
1394 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); | 1396 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); |
1395 | rec->addYearlyNum( date.month() ); | 1397 | rec->addYearlyNum( date.month() ); |