-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, | |||
549 | bool travelAllDay = FALSE; | 549 | bool travelAllDay = FALSE; |
550 | bool holidayAllDay = FALSE; | ||
550 | 551 | ||
@@ -560,6 +561,10 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | |||
560 | if (ev.isAllDay()) { | 561 | if (ev.isAllDay()) { |
561 | if (!ev.hasRepeat()) | 562 | if (!ev.hasRepeat()) { |
562 | normalAllDay = TRUE; | 563 | normalAllDay = TRUE; |
563 | else | 564 | if (!ev.isValidUid()) { |
564 | repeatAllDay = TRUE; | 565 | holidayAllDay = TRUE; |
566 | } | ||
567 | } else { | ||
568 | repeatAllDay = TRUE; | ||
569 | } | ||
565 | } else { | 570 | } else { |
@@ -601,3 +606,3 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | |||
601 | // draw the background | 606 | // draw the background |
602 | if (normalAllDay || repeatAllDay || travelAllDay) { | 607 | if (normalAllDay || repeatAllDay || travelAllDay || holidayAllDay) { |
603 | p->save(); | 608 | p->save(); |
@@ -610,8 +615,14 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | |||
610 | colorRepeatLight ); | 615 | colorRepeatLight ); |
611 | } else | 616 | } else { |
617 | if (!holidayAllDay) { | ||
612 | p->fillRect( 0, 0, cr.width(), cr.height(), | 618 | p->fillRect( 0, 0, cr.width(), cr.height(), |
613 | colorNormalLight ); | 619 | colorNormalLight ); |
614 | else if (repeatAllDay) | 620 | } else { |
621 | p->fillRect( 0, 0, cr.width(), cr.height(), | ||
622 | QColor(0,220,0) ); | ||
623 | } | ||
624 | } else if (repeatAllDay) { | ||
615 | p->fillRect( 0, 0, cr.width(), cr.height(), | 625 | p->fillRect( 0, 0, cr.width(), cr.height(), |
616 | colorRepeatLight ); | 626 | colorRepeatLight ); |
627 | } | ||
617 | } else { | 628 | } else { |