Diffstat (limited to 'korganizer/kowhatsnextview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 4111c5d..57623e6 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -467,24 +467,27 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
467 | QDateTime cdt = QDateTime::currentDateTime(); | 467 | QDateTime cdt = QDateTime::currentDateTime(); |
468 | QDateTime noc; | 468 | QDateTime noc; |
469 | QString tempText; | 469 | QString tempText; |
470 | if ( appendTable && !notRed ) { | 470 | if ( appendTable && !notRed ) { |
471 | tempText = "<table>"; | 471 | tempText = "<table>"; |
472 | } | 472 | } |
473 | bool ok = true; | 473 | bool ok = true; |
474 | if ( reply ) { | 474 | if ( reply ) { |
475 | noc = ev->getNextOccurence( cdt, &ok ); | 475 | noc = ev->getNextOccurence( cdt, &ok ); |
476 | if (! ok && ev->type() == "Event") | 476 | if (! ok && ev->type() == "Event") |
477 | return false; | 477 | return false; |
478 | } | 478 | } |
479 | bool bDay = false; | ||
480 | if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) ) | ||
481 | bDay = true; | ||
479 | tempText += "<tr><td><b>"; | 482 | tempText += "<tr><td><b>"; |
480 | if (ev->type()=="Event") { | 483 | if (ev->type()=="Event") { |
481 | if (reply) { | 484 | if (reply) { |
482 | if (!ev->doesFloat()) | 485 | if (!ev->doesFloat()) |
483 | tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; | 486 | tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; |
484 | else | 487 | else |
485 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 488 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
486 | 489 | ||
487 | } else { | 490 | } else { |
488 | if (!ev->doesFloat()) { | 491 | if (!ev->doesFloat()) { |
489 | Event *event = static_cast<Event *>(ev); | 492 | Event *event = static_cast<Event *>(ev); |
490 | QDateTime st,end; | 493 | QDateTime st,end; |
@@ -521,25 +524,33 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
521 | if ( !KOPrefs::instance()->mWNViewShowsPast ) | 524 | if ( !KOPrefs::instance()->mWNViewShowsPast ) |
522 | return false; | 525 | return false; |
523 | tempText += "<font color=\"#F00000\">" + dateText + "</font>"; | 526 | tempText += "<font color=\"#F00000\">" + dateText + "</font>"; |
524 | } | 527 | } |
525 | else if ( st < cdt ) | 528 | else if ( st < cdt ) |
526 | tempText += "<font color=\"#008000\">" + dateText + "</font>"; | 529 | tempText += "<font color=\"#008000\">" + dateText + "</font>"; |
527 | else | 530 | else |
528 | tempText += dateText; | 531 | tempText += dateText; |
529 | 532 | ||
530 | } | 533 | } |
531 | 534 | ||
532 | } else { | 535 | } else { |
533 | tempText += i18n("Allday:"); | 536 | if ( bDay ) { |
537 | |||
538 | if ( ev->categories().contains( i18n("Birthday") )) | ||
539 | tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>"; | ||
540 | else | ||
541 | tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>"; | ||
542 | } else { | ||
543 | tempText += i18n("Allday:"); | ||
544 | } | ||
534 | 545 | ||
535 | } | 546 | } |
536 | } | 547 | } |
537 | } else { | 548 | } else { |
538 | mTodos.append( ev ); | 549 | mTodos.append( ev ); |
539 | tempText += i18n("ToDo:"); | 550 | tempText += i18n("ToDo:"); |
540 | if (reply) { | 551 | if (reply) { |
541 | tempText += " "; | 552 | tempText += " "; |
542 | if ( noc != cdt ) { | 553 | if ( noc != cdt ) { |
543 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 554 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
544 | } | 555 | } |
545 | } else { | 556 | } else { |
@@ -591,25 +602,25 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
591 | tempText += "] "; | 602 | tempText += "] "; |
592 | } | 603 | } |
593 | if ( ev->cancelled() ) | 604 | if ( ev->cancelled() ) |
594 | tempText += "</font>"; | 605 | tempText += "</font>"; |
595 | tempText += "<a "; | 606 | tempText += "<a "; |
596 | if (ev->type()=="Event") tempText += "href=\"event:"; | 607 | if (ev->type()=="Event") tempText += "href=\"event:"; |
597 | if (ev->type()=="Todo") tempText += "href=\"todo:"; | 608 | if (ev->type()=="Todo") tempText += "href=\"todo:"; |
598 | tempText += ev->uid() + "\">"; | 609 | tempText += ev->uid() + "\">"; |
599 | if ( ev->summary().length() > 0 ) | 610 | if ( ev->summary().length() > 0 ) |
600 | tempText += ev->summary(); | 611 | tempText += ev->summary(); |
601 | else | 612 | else |
602 | tempText += i18n("-no summary-"); | 613 | tempText += i18n("-no summary-"); |
603 | if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) ) { | 614 | if ( bDay ) { |
604 | noc = ev->getNextOccurence( cdt, &ok ); | 615 | noc = ev->getNextOccurence( cdt, &ok ); |
605 | if ( ok ) { | 616 | if ( ok ) { |
606 | int years = noc.date().year() - ev->dtStart().date().year(); | 617 | int years = noc.date().year() - ev->dtStart().date().year(); |
607 | tempText += i18n(" (%1 y.)"). arg( years ); | 618 | tempText += i18n(" (%1 y.)"). arg( years ); |
608 | } | 619 | } |
609 | } | 620 | } |
610 | 621 | ||
611 | tempText += "</a>"; | 622 | tempText += "</a>"; |
612 | if ( KOPrefs::instance()->mWNViewShowLocation ) | 623 | if ( KOPrefs::instance()->mWNViewShowLocation ) |
613 | if ( !ev->location().isEmpty() ) | 624 | if ( !ev->location().isEmpty() ) |
614 | tempText += " ("+ev->location() +")"; | 625 | tempText += " ("+ev->location() +")"; |
615 | if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) | 626 | if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) |