-rw-r--r-- | korganizer/kodaymatrix.cpp | 144 |
1 files changed, 140 insertions, 4 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index c7e1b45..322131f 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -118,8 +118,9 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const mPendingUpdateBeforeRepaint = false; mouseDown = false; // initialize dynamic arrays bDays.resize ( NUMDAYS ); + pDays.resize ( NUMDAYS ); hDays.resize ( NUMDAYS ); eDays.resize ( NUMDAYS ); days = new QDate[NUMDAYS]; daylbls = new QString[NUMDAYS]; @@ -339,20 +340,153 @@ void KODayMatrix::updateView() void KODayMatrix::repaintViewTimed() { mRedrawNeeded = true; bDays.fill( false); + pDays.fill( false); hDays.fill( false); eDays.fill( false); mRepaintTimer->stop(); + int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday + int i; + for(i = 0; i < NUMDAYS; i++) { + if ( ( (i+startDay) % 7 == 0 ) ) { + pDays.setBit(i); + } + } repaint(false); } +void KODayMatrix::computeEvent(Event *event, int i ) +{ + QString holiStr = mHolidays[i]; + if ( event->isHoliday()) { + pDays.setBit(i); + hDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += event->summary(); + if ( !event->location().isEmpty() ) + holiStr += " (" + event->location() + ")"; + mHolidays[i] =holiStr ; + } + if ( event->isBirthday()) { + pDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += i18n("Birthday") + ": "+event->summary(); + if ( !event->location().isEmpty() ) + holiStr += " (" + event->location() + ")"; + bDays.setBit(i); + mHolidays[i] =holiStr ; + } + eDays.setBit(i); +} void KODayMatrix::updateViewTimed() { mUpdateTimer->stop(); if ( !mCalendar ) { qDebug("NOT CAL "); return; } +#if 1 + + int i; + int timeSpan = NUMDAYS-1; + QPtrList<Event> events = mCalendar->events(); + Event *event; + QDateTime dt; + bool ok; + bDays.fill( false); + pDays.fill( false); + hDays.fill( false); + eDays.fill( false); + mHolidays.clear(); + QDate mStartDate = days[0]; + QDate endDate = mStartDate.addDays( timeSpan ); + for( event = events.first(); event; event = events.next() ) { // for event + ushort recurType = event->recurrence()->doesRecur(); + if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || + (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { + continue; + } + if ( event->doesRecur() ) { + bool last; + QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); + QDateTime incidenceEnd; + int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); + bool invalid = false; + while( true ) { + if ( incidenceStart.isValid() ) { + incidenceEnd = incidenceStart.addDays( eventlen ); + int st = incidenceStart.date().daysTo( endDate ); + if ( st >= 0 ) { // start before timeend + int end = mStartDate.daysTo( incidenceEnd.date() ); + if ( end >= 0 ) { // end after timestart --- got one! + //normalize + st = timeSpan - st; + if ( st < 0 ) st = 0; + if ( end > timeSpan ) end = timeSpan; + int iii; + //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); + for ( iii = st;iii<= end;++iii) { + computeEvent( event, iii ); + } + } + } + } else { + if ( invalid ) + break; + invalid = true; + //qDebug("invalid %s", event->summary().latin1()); + incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; + } + if ( last ) + break; + bool ok; + incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); + if ( ! ok ) + break; + if ( incidenceStart.date() > endDate ) + break; + } + } else { // no recur + int st = event->dtStart().date().daysTo( endDate ); + if ( st >= 0 ) { // start before timeend + int end = mStartDate.daysTo( event->dtEnd().date() ); + if ( end >= 0 ) { // end after timestart --- got one! + //normalize + st = timeSpan - st; + if ( st < 0 ) st = 0; + if ( end > timeSpan ) end = timeSpan; + int iii; + for ( iii = st;iii<= end;++iii) + computeEvent( event, iii ); + } + } + } + } + int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday + for(i = 0; i < NUMDAYS; i++) { + if ( ( (i+startDay) % 7 == 0 ) ) { + pDays.setBit(i); + } + } + +#if 0 + // insert due todos + QPtrList<Todo> todos = calendar()->todos( ); + Todo *todo; + for(todo = todos.first(); todo; todo = todos.next()) { + //insertTodo( todo ); + if ( todo->hasDueDate() ) { + int day = mStartDate.daysTo( todo->dtDue().date() ); + if ( day >= 0 && day < timeSpan + 1) { + (*cells)[day]->insertTodo( todo ); + } + } + } +#endif + +#else //qDebug("KODayMatrix::updateViewTimed "); for(int i = 0; i < NUMDAYS; i++) { // if events are set for the day then remember to draw it bold QPtrList<Event> eventlist = mCalendar->events(days[i]); @@ -362,8 +496,9 @@ void KODayMatrix::updateViewTimed() bDays.clearBit(i); hDays.clearBit(i); eDays.clearBit(i); for(event=eventlist.first();event != 0;event=eventlist.next()) { + qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF "); ushort recurType = event->recurrence()->doesRecur(); if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { numEvents--; @@ -394,8 +529,9 @@ void KODayMatrix::updateViewTimed() } else { mHolidays[i] = QString::null; } } +#endif mRedrawNeeded = true; if ( ! mPendingUpdateBeforeRepaint ) repaint(false); } @@ -441,9 +577,9 @@ void KODayMatrix::updateView(QDate actdate) //updateViewTimed(); mUpdateTimer->start( 50 ); #else mRepaintTimer->start( 350 ); - mUpdateTimer->start( 1200 ); + mUpdateTimer->start( 800 ); #endif } } void KODayMatrix::updateEvents() @@ -872,9 +1008,9 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) mTodayPen.setWidth(1); else mTodayPen.setWidth(mTodayMarginWidth); //draw red rectangle for holidays - if (!mHolidays[i].isNull()) { + if (pDays.testBit(i)) { if (actcol == mDefaultTextColor) { mTodayPen.setColor(KOPrefs::instance()->mHolidayColor); } else { mTodayPen.setColor(mHolidayColorShaded); @@ -913,9 +1049,9 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) p.setFont(myFont); } // if it is a holiday then use the default holiday color - if ( !mHolidays[i].isNull()) { + if ( pDays.testBit(i)) { if ( bDays.testBit(i) ) { if ( hDays.testBit(i) ) p.setPen(QColor(Qt::green)); else @@ -952,9 +1088,9 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); // reset color to actual color - if (!mHolidays[i].isNull()) { + if (pDays.testBit(i)) { p.setPen(actcol); } // reset bold font to plain font if ( eDays.testBit(i)) { |