summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-27 12:25:55 (UTC)
committer zautrix <zautrix>2005-01-27 12:25:55 (UTC)
commit32ad6c6cc658d952c9dfa1fcf5857662bcf01c22 (patch) (unidiff)
tree6d25535ba67a579fd1560e6f87ceb4fef0ad8fc9
parentc8b484570a9cf8aacc070f92141c8bcfebbf3a93 (diff)
downloadkdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.zip
kdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.tar.gz
kdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.tar.bz2
birthday fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/kowhatsnextview.cpp15
2 files changed, 14 insertions, 3 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index dce95cd..3d16c1a 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1194,7 +1194,7 @@
1194{ "Size %1","Größe %1" }, 1194{ "Size %1","Größe %1" },
1195{ "New Agendasize: %1","Neue Agendagröße: %1" }, 1195{ "New Agendasize: %1","Neue Agendagröße: %1" },
1196{ " (%1 y.)"," (%1 J.)" }, 1196{ " (%1 y.)"," (%1 J.)" },
1197{ "","" }, 1197{ "Allday:","Ganztägig:" },
1198{ "","" }, 1198{ "","" },
1199{ "","" }, 1199{ "","" },
1200{ "","" }, 1200{ "","" },
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 4111c5d..57623e6 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -476,6 +476,9 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
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) {
@@ -530,7 +533,15 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
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 }
@@ -600,7 +611,7 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
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();