summaryrefslogtreecommitdiffabout
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
parentc8b484570a9cf8aacc070f92141c8bcfebbf3a93 (diff)
downloadkdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.zip
kdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.tar.gz
kdepimpi-32ad6c6cc658d952c9dfa1fcf5857662bcf01c22.tar.bz2
birthday fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/kowhatsnextview.cpp13
2 files changed, 13 insertions, 2 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
@@ -1191,13 +1191,13 @@
{ "Day after tomorrow","Übermorgen" },
{ "Tomorrow","Morgen" },
{ "Day before yesterday","Vorgestern" },
{ "Size %1","Größe %1" },
{ "New Agendasize: %1","Neue Agendagröße: %1" },
{ " (%1 y.)"," (%1 J.)" },
-{ "","" },
+{ "Allday:","Ganztägig:" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 4111c5d..57623e6 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -473,12 +473,15 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
bool ok = true;
if ( reply ) {
noc = ev->getNextOccurence( cdt, &ok );
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) {
if (!ev->doesFloat())
tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
else
@@ -527,13 +530,21 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
else
tempText += dateText;
}
} else {
+ 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:");
+ }
}
}
} else {
mTodos.append( ev );
tempText += i18n("ToDo:");
@@ -597,13 +608,13 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
if (ev->type()=="Todo") tempText += "href=\"todo:";
tempText += ev->uid() + "\">";
if ( ev->summary().length() > 0 )
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();
tempText += i18n(" (%1 y.)"). arg( years );
}
}