| -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 { |