author | zautrix <zautrix> | 2005-02-17 21:45:30 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-17 21:45:30 (UTC) |
commit | b1e885da3b0a083121f940485d9c0eea53ff5139 (patch) (unidiff) | |
tree | e999d042e45cd1410cc327a3c347bbefa5896289 /korganizer | |
parent | 8e8d2bd0c31eb272a7f26756252ff4930d0602bc (diff) | |
download | kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.zip kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.tar.gz kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.tar.bz2 |
fix
-rw-r--r-- | korganizer/koeventviewer.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index d87938a..417d89c 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -411,97 +411,107 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
411 | } | 411 | } |
412 | 412 | ||
413 | if (!event->location().isEmpty()) { | 413 | if (!event->location().isEmpty()) { |
414 | addTag("b",i18n("Location: ")); | 414 | addTag("b",i18n("Location: ")); |
415 | mText.append(event->location()+"<br>"); | 415 | mText.append(event->location()+"<br>"); |
416 | mMailSubject += i18n(" at ") + event->location(); | 416 | mMailSubject += i18n(" at ") + event->location(); |
417 | } | 417 | } |
418 | 418 | ||
419 | if (event->recurrence()->doesRecur()) { | 419 | if (event->recurrence()->doesRecur()) { |
420 | 420 | ||
421 | QString recurText = event->recurrence()->recurrenceText(); | 421 | QString recurText = event->recurrence()->recurrenceText(); |
422 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | 422 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); |
423 | 423 | ||
424 | } | 424 | } |
425 | if (event->hasStartDate()) { | 425 | if (event->hasStartDate()) { |
426 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 426 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
427 | } | 427 | } |
428 | if (event->hasDueDate()) { | 428 | if (event->hasDueDate()) { |
429 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 429 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
430 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 430 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
431 | } | 431 | } |
432 | addTag("b",i18n("Access: ")); | 432 | addTag("b",i18n("Access: ")); |
433 | mText.append(event->secrecyStr()+"<br>"); | 433 | mText.append(event->secrecyStr()+"<br>"); |
434 | if ( KOPrefs::instance()->mEVshowDetails ) { | 434 | if ( KOPrefs::instance()->mEVshowDetails ) { |
435 | if (!event->description().isEmpty()) { | 435 | if (!event->description().isEmpty()) { |
436 | addTag("p",i18n("<b>Details: </b>")); | 436 | addTag("p",i18n("<b>Details: </b>")); |
437 | addTag("p",event->description()); | 437 | addTag("p",event->description()); |
438 | } | 438 | } |
439 | } | 439 | } |
440 | 440 | ||
441 | formatCategories(event); | 441 | formatCategories(event); |
442 | 442 | ||
443 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 443 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
444 | .arg(QString::number(event->priority()))); | 444 | .arg(QString::number(event->priority()))); |
445 | 445 | ||
446 | formatReadOnly(event); | 446 | formatReadOnly(event); |
447 | formatAttendees(event); | 447 | formatAttendees(event); |
448 | if ( event->relatedTo() ) { | 448 | if ( event->relatedTo() ) { |
449 | addTag("b",i18n("Parent todo:<br>")); | 449 | addTag("b",i18n("Parent todo:<br>")); |
450 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 450 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |
451 | } | 451 | } |
452 | QPtrList<Incidence> Relations = event->relations(); | 452 | QPtrList<Incidence> Relations = event->relations(); |
453 | Incidence *to; | 453 | Incidence *to; |
454 | if ( Relations.first() ) | 454 | if ( Relations.first() ) |
455 | addTag("b",i18n("Sub todos:<br>")); | 455 | addTag("b",i18n("Sub todos:<br>")); |
456 | for (to=Relations.first();to;to=Relations.next()) { | 456 | for (to=Relations.first();to;to=Relations.next()) { |
457 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); | 457 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); |
458 | 458 | ||
459 | } | 459 | } |
460 | if ( KOPrefs::instance()->mEVshowCreated ) { | ||
461 | addTag("p",i18n("<b>Created: ") +" </b>"); | ||
462 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | ||
463 | |||
464 | } | ||
465 | if ( KOPrefs::instance()->mEVshowChanged ) { | ||
466 | addTag("p",i18n("<b>Last modified: ") +" </b>"); | ||
467 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); | ||
468 | |||
469 | } | ||
460 | setText(mText); | 470 | setText(mText); |
461 | } | 471 | } |
462 | 472 | ||
463 | void KOEventViewer::formatCategories(Incidence *event) | 473 | void KOEventViewer::formatCategories(Incidence *event) |
464 | { | 474 | { |
465 | if (!event->categoriesStr().isEmpty()) { | 475 | if (!event->categoriesStr().isEmpty()) { |
466 | if (event->categories().count() == 1) { | 476 | if (event->categories().count() == 1) { |
467 | addTag("h3",i18n("Category")); | 477 | addTag("h3",i18n("Category")); |
468 | } else { | 478 | } else { |
469 | addTag("h3",i18n("Categories")); | 479 | addTag("h3",i18n("Categories")); |
470 | } | 480 | } |
471 | addTag("p",event->categoriesStr()); | 481 | addTag("p",event->categoriesStr()); |
472 | } | 482 | } |
473 | } | 483 | } |
474 | void KOEventViewer::formatAttendees(Incidence *event) | 484 | void KOEventViewer::formatAttendees(Incidence *event) |
475 | { | 485 | { |
476 | QPtrList<Attendee> attendees = event->attendees(); | 486 | QPtrList<Attendee> attendees = event->attendees(); |
477 | if (attendees.count()) { | 487 | if (attendees.count()) { |
478 | 488 | ||
479 | 489 | ||
480 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 490 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
481 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); | 491 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); |
482 | addTag("h3",i18n("Organizer")); | 492 | addTag("h3",i18n("Organizer")); |
483 | mText.append("<ul><li>"); | 493 | mText.append("<ul><li>"); |
484 | #ifndef KORG_NOKABC | 494 | #ifndef KORG_NOKABC |
485 | 495 | ||
486 | #ifdef DESKTOP_VERSION | 496 | #ifdef DESKTOP_VERSION |
487 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 497 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
488 | KABC::Addressee::List addressList; | 498 | KABC::Addressee::List addressList; |
489 | addressList = add_book->findByEmail(event->organizer()); | 499 | addressList = add_book->findByEmail(event->organizer()); |
490 | KABC::Addressee o = addressList.first(); | 500 | KABC::Addressee o = addressList.first(); |
491 | if (!o.isEmpty() && addressList.size()<2) { | 501 | if (!o.isEmpty() && addressList.size()<2) { |
492 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 502 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
493 | mText += o.formattedName(); | 503 | mText += o.formattedName(); |
494 | mText += "</a>\n"; | 504 | mText += "</a>\n"; |
495 | } else { | 505 | } else { |
496 | mText.append(event->organizer()); | 506 | mText.append(event->organizer()); |
497 | } | 507 | } |
498 | #else //DESKTOP_VERSION | 508 | #else //DESKTOP_VERSION |
499 | mText += "<a href=\"uid:organizer\">"; | 509 | mText += "<a href=\"uid:organizer\">"; |
500 | mText += event->organizer(); | 510 | mText += event->organizer(); |
501 | mText += "</a>\n"; | 511 | mText += "</a>\n"; |
502 | #endif //DESKTOP_VERSION | 512 | #endif //DESKTOP_VERSION |
503 | 513 | ||
504 | 514 | ||
505 | #else | 515 | #else |
506 | mText.append(event->organizer()); | 516 | mText.append(event->organizer()); |
507 | #endif | 517 | #endif |