summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-01-27 12:25:55 (UTC)
committer zautrix <zautrix>2005-01-27 12:25:55 (UTC)
commit32ad6c6cc658d952c9dfa1fcf5857662bcf01c22 (patch) (side-by-side diff)
tree6d25535ba67a579fd1560e6f87ceb4fef0ad8fc9 /korganizer
parentc8b484570a9cf8aacc070f92141c8bcfebbf3a93 (diff)
downloadkdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.zip
kdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.tar.gz
kdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.tar.bz2
birthday fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kowhatsnextview.cpp15
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
@@ -476,6 +476,9 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
if (! ok && ev->type() == "Event")
return false;
}
+ bool bDay = false;
+ if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) )
+ bDay = true;
tempText += "<tr><td><b>";
if (ev->type()=="Event") {
if (reply) {
@@ -530,7 +533,15 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
}
} else {
- tempText += i18n("Allday:");
+ if ( bDay ) {
+
+ if ( ev->categories().contains( i18n("Birthday") ))
+ tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>";
+ else
+ tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>";
+ } else {
+ tempText += i18n("Allday:");
+ }
}
}
@@ -600,7 +611,7 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
tempText += ev->summary();
else
tempText += i18n("-no summary-");
- if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) ) {
+ if ( bDay ) {
noc = ev->getNextOccurence( cdt, &ok );
if ( ok ) {
int years = noc.date().year() - ev->dtStart().date().year();