| -rw-r--r-- | korganizer/kodaymatrix.cpp | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 59618bf..d543aaf 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -117,5 +117,7 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const bDays.resize ( NUMDAYS ); + hDays.resize ( NUMDAYS );; + eDays.resize ( NUMDAYS );; days = new QDate[NUMDAYS]; daylbls = new QString[NUMDAYS]; - events = new int[NUMDAYS]; + //events = new int[NUMDAYS]; mToolTip = new DynamicTip(this); @@ -242,3 +244,3 @@ KODayMatrix::~KODayMatrix() delete [] daylbls; - delete [] events; + //delete [] events; delete mToolTip; @@ -313,3 +315,3 @@ void KODayMatrix::recalculateToday() for (int i=0; i<NUMDAYS; i++) { - events[i] = 0; + //events[i] = 0; days[i] = startdate.addDays(i); @@ -351,2 +353,4 @@ void KODayMatrix::updateViewTimed() bDays.clearBit(i); + hDays.clearBit(i); + eDays.clearBit(i); for(event=eventlist.first();event != 0;event=eventlist.next()) { @@ -358,2 +362,3 @@ void KODayMatrix::updateViewTimed() if ( event->isHoliday()) { + hDays.setBit(i); if ( !holiStr.isEmpty() ) @@ -373,3 +378,4 @@ void KODayMatrix::updateViewTimed() } - events[i] = numEvents; + if ( numEvents ) + eDays.setBit(i); //if it is a holy day then draw it red. Sundays are consider holidays, too @@ -449,4 +455,7 @@ void KODayMatrix::updateEvents() } - } - events[ i ] = numEvents; + } + if ( numEvents ) + eDays.setBit(i); + else + eDays.clearBit(i); } @@ -864,3 +873,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // if any events are on that day then draw it using a bold font - if (events[i] > 0) { + if ( eDays.testBit(i) ) { QFont myFont = font(); @@ -871,7 +880,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // if it is a holiday then use the default holiday color - if (!mHolidays[i].isNull()) { + if ( !mHolidays[i].isNull()) { if ( bDays.testBit(i) ) { - p.setPen(Qt::green); + if ( hDays.testBit(i) ) + p.setPen(QColor(Qt::green)); + else + p.setPen(QColor(Qt::green).dark()); } else { - if (actcol == mDefaultTextColor) { + if (actcol == mDefaultTextColor ) { p.setPen(KOPrefs::instance()->mHolidayColor); @@ -911,3 +923,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // reset bold font to plain font - if (events[i] > 0) { + if ( eDays.testBit(i)) { QFont myFont = font(); |