| author | alwin <alwin> | 2005-03-20 12:49:50 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2005-03-20 12:49:50 (UTC) |
| commit | a93e2c40f08388b7dea93a3dd0ce69b029a59092 (patch) (side-by-side diff) | |
| tree | af9e8cf769ae003db22b2a84d8b3fc3aeac90183 /library | |
| parent | e006544cf2eb82b503b3ef979a2159b5de93037e (diff) | |
| download | opie-a93e2c40f08388b7dea93a3dd0ce69b029a59092.zip opie-a93e2c40f08388b7dea93a3dd0ce69b029a59092.tar.gz opie-a93e2c40f08388b7dea93a3dd0ce69b029a59092.tar.bz2 | |
last stuff before 1.2:
when day has a holiday-fake-event and not other allday-event it will paint
green.
| -rw-r--r-- | library/datebookmonth.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp index 421559e..013ab66 100644 --- a/library/datebookmonth.cpp +++ b/library/datebookmonth.cpp @@ -549,2 +549,3 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, bool travelAllDay = FALSE; + bool holidayAllDay = FALSE; @@ -560,6 +561,10 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, if (ev.isAllDay()) { - if (!ev.hasRepeat()) - normalAllDay = TRUE; - else - repeatAllDay = TRUE; + if (!ev.hasRepeat()) { + normalAllDay = TRUE; + if (!ev.isValidUid()) { + holidayAllDay = TRUE; + } + } else { + repeatAllDay = TRUE; + } } else { @@ -601,3 +606,3 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, // draw the background - if (normalAllDay || repeatAllDay || travelAllDay) { + if (normalAllDay || repeatAllDay || travelAllDay || holidayAllDay) { p->save(); @@ -610,8 +615,14 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, colorRepeatLight ); - } else + } else { + if (!holidayAllDay) { p->fillRect( 0, 0, cr.width(), cr.height(), colorNormalLight ); - else if (repeatAllDay) + } else { + p->fillRect( 0, 0, cr.width(), cr.height(), + QColor(0,220,0) ); + } + } else if (repeatAllDay) { p->fillRect( 0, 0, cr.width(), cr.height(), colorRepeatLight ); + } } else { |