-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 | |||
@@ -546,8 +546,9 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | |||
546 | 546 | ||
547 | bool normalAllDay = FALSE; | 547 | bool normalAllDay = FALSE; |
548 | bool repeatAllDay = FALSE; | 548 | bool repeatAllDay = FALSE; |
549 | bool travelAllDay = FALSE; | 549 | bool travelAllDay = FALSE; |
550 | bool holidayAllDay = FALSE; | ||
550 | 551 | ||
551 | QValueListIterator<EffectiveEvent> itDays = d->mDayEvents.begin(); | 552 | QValueListIterator<EffectiveEvent> itDays = d->mDayEvents.begin(); |
552 | 553 | ||
553 | for ( ; itDays != d->mDayEvents.end(); ++itDays ) { | 554 | for ( ; itDays != d->mDayEvents.end(); ++itDays ) { |
@@ -557,12 +558,16 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | |||
557 | int f = (*itDays).start().hour(); // assume Effective event | 558 | int f = (*itDays).start().hour(); // assume Effective event |
558 | int t = (*itDays).end().hour(); // is truncated. | 559 | int t = (*itDays).end().hour(); // is truncated. |
559 | 560 | ||
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 { |
566 | int sLine, eLine; | 571 | int sLine, eLine; |
567 | if (f == 0) | 572 | if (f == 0) |
568 | sLine = 0; | 573 | sLine = 0; |
@@ -598,23 +603,29 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | |||
598 | } | 603 | } |
599 | } | 604 | } |
600 | 605 | ||
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(); |
604 | 609 | ||
605 | if (normalAllDay) | 610 | if (normalAllDay) |
606 | if (repeatAllDay) { | 611 | if (repeatAllDay) { |
607 | p->fillRect( 0, 0, cr.width(), cr.height() / 2, | 612 | p->fillRect( 0, 0, cr.width(), cr.height() / 2, |
608 | colorNormalLight ); | 613 | colorNormalLight ); |
609 | p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2, | 614 | p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2, |
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 { |
618 | p->fillRect( 0, 0, cr.width(), | 629 | p->fillRect( 0, 0, cr.width(), |
619 | cr.height(), selected | 630 | cr.height(), selected |
620 | ? g.brush( QColorGroup::Highlight ) | 631 | ? g.brush( QColorGroup::Highlight ) |