| author | zautrix <zautrix> | 2005-03-21 17:39:46 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-03-21 17:39:46 (UTC) |
| commit | 3c5d7b484e6ab263ab4091f22815770ea8da6c9c (patch) (side-by-side diff) | |
| tree | 97f86965d7ae565fc054918978756c3953476e82 /korganizer | |
| parent | 070055b60f76ffd6907e44a4ffc2d752578f3211 (diff) | |
| download | kdepimpi-3c5d7b484e6ab263ab4091f22815770ea8da6c9c.zip kdepimpi-3c5d7b484e6ab263ab4091f22815770ea8da6c9c.tar.gz kdepimpi-3c5d7b484e6ab263ab4091f22815770ea8da6c9c.tar.bz2 | |
fix
| -rw-r--r-- | korganizer/koagendaview.cpp | 3 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 4 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 3 | ||||
| -rw-r--r-- | korganizer/kowhatsnextview.cpp | 8 |
4 files changed, 8 insertions, 10 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index e029fdb..eb3a6cd 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -1419,6 +1419,5 @@ void KOAgendaView::setHolidayMasks() Event *event; for( event = events.first(); event; event = events.next() ) { - if ( event->categories().contains("Holiday") || - event->categories().contains(i18n("Holiday"))) { + if ( event->isHoliday()) { showHoliday = true; break; diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index d7a4112..36cd990 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -349,5 +349,5 @@ void KODayMatrix::updateViewTimed() numEvents--; } - if ( event->categories().contains( i18n("Holiday") ) || event->categories().contains( "Holiday" )) { + if ( event->isHoliday()) { if ( !holiStr.isEmpty() ) holiStr += "\n"; @@ -356,5 +356,5 @@ void KODayMatrix::updateViewTimed() holiStr += " (" + event->location() + ")"; } - if ( event->categories().contains( i18n("Birthday") ) || event->categories().contains( "Birthday" )) { + if ( event->isBirthday()) { if ( !holiStr.isEmpty() ) holiStr += "\n"; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 004ff50..76982b4 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -516,6 +516,5 @@ void MonthViewCell::insertEvent(Event *event) } - if ( event->categories().contains("Holiday") || - event->categories().contains(i18n("Holiday"))) { + if ( event->isHoliday()) { setHoliday( true ); if ( mDate.dayOfWeek() == 7 ) diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 18dc656..66ff75d 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -479,5 +479,5 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a } bool bDay = false; - if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) ) + if ( ev->isBirthday() || ev->isAnniversary() ) bDay = true; tempText += "<tr><td><b>"; @@ -537,8 +537,8 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a if ( bDay ) { - if ( ev->categories().contains( i18n("Birthday") )) - tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>"; + if ( ev->isBirthday()) + tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>"; else - tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>"; + tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>"; } else { tempText += i18n("Allday:"); |