-rw-r--r-- | korganizer/koeventviewer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 2faf18f..de11c13 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -418,13 +418,13 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
418 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 418 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
419 | .arg(QString::number(event->priority()))); | 419 | .arg(QString::number(event->priority()))); |
420 | 420 | ||
421 | formatReadOnly(event); | 421 | formatReadOnly(event); |
422 | formatAttendees(event); | 422 | formatAttendees(event); |
423 | if ( event->relatedTo() ) { | 423 | if ( event->relatedTo() ) { |
424 | addTag("b",i18n("Parent todo: ")); | 424 | addTag("b",i18n("Parent todo:<br>")); |
425 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 425 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |
426 | } | 426 | } |
427 | QPtrList<Incidence> Relations = event->relations(); | 427 | QPtrList<Incidence> Relations = event->relations(); |
428 | Incidence *to; | 428 | Incidence *to; |
429 | if ( Relations.first() ) | 429 | if ( Relations.first() ) |
430 | addTag("b",i18n("Sub todos:<br>")); | 430 | addTag("b",i18n("Sub todos:<br>")); |
@@ -531,29 +531,29 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
531 | 531 | ||
532 | 532 | ||
533 | if (!a->email().isEmpty()) { | 533 | if (!a->email().isEmpty()) { |
534 | if (iconPath) { | 534 | if (iconPath) { |
535 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; | 535 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; |
536 | if ( a->RSVP() ) { | 536 | if ( a->RSVP() ) { |
537 | ++a_count; | 537 | ++a_count_nr; |
538 | mText += "<IMG src=\"" + iconPath + "\">"; | 538 | mText += "<IMG src=\"" + iconPath + "\">"; |
539 | } | 539 | } |
540 | else { | 540 | else { |
541 | ++a_count_nr; | 541 | ++a_count; |
542 | mText += "<IMG src=\"" + NOiconPath + "\">"; | 542 | mText += "<IMG src=\"" + NOiconPath + "\">"; |
543 | } | 543 | } |
544 | mText += "</a>\n"; | 544 | mText += "</a>\n"; |
545 | } | 545 | } |
546 | } | 546 | } |
547 | if (a->status() != Attendee::NeedsAction ) | 547 | if (a->status() != Attendee::NeedsAction ) |
548 | mText +="[" + a->statusStr() + "] "; | 548 | mText +="[" + a->statusStr() + "] "; |
549 | if (a->role() == Attendee::Chair ) | 549 | if (a->role() == Attendee::Chair ) |
550 | mText +="(" + a->roleStr().left(1) + ".)"; | 550 | mText +="(" + a->roleStr().left(1) + ".)"; |
551 | } | 551 | } |
552 | mText.append("</li></ul>"); | 552 | mText.append("</li></ul>"); |
553 | if ( a_count > 1 ) { | 553 | if ( (a_count+a_count_nr) > 1 ) { |
554 | mText += "<a href=\"mailto:ALL\">"; | 554 | mText += "<a href=\"mailto:ALL\">"; |
555 | mText += i18n( "Mail to all" ); | 555 | mText += i18n( "Mail to all" ); |
556 | mText += "</a> ( "; | 556 | mText += "</a> ( "; |
557 | mText += "<IMG src=\"" + iconPath + "\">"; | 557 | mText += "<IMG src=\"" + iconPath + "\">"; |
558 | mText += i18n( " and " ); | 558 | mText += i18n( " and " ); |
559 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; | 559 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; |
@@ -563,13 +563,13 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
563 | } | 563 | } |
564 | if ( a_count_nr > 1 ) { | 564 | if ( a_count_nr > 1 ) { |
565 | mText += "<a href=\"mailto:RSVP\">"; | 565 | mText += "<a href=\"mailto:RSVP\">"; |
566 | mText += i18n( "Mail to selected" ); | 566 | mText += i18n( "Mail to selected" ); |
567 | mText += "</a> ( "; | 567 | mText += "</a> ( "; |
568 | mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); | 568 | mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); |
569 | mText += "\n"; | 569 | mText += "<br>\n"; |
570 | } | 570 | } |
571 | } | 571 | } |
572 | 572 | ||
573 | } | 573 | } |
574 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 574 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
575 | { | 575 | { |