| -rw-r--r-- | korganizer/kodaymatrix.cpp | 144 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.h | 2 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 34 | ||||
| -rw-r--r-- | korganizer/komonthview.h | 6 |
4 files changed, 173 insertions, 13 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index c7e1b45..322131f 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -120,4 +120,5 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const // initialize dynamic arrays bDays.resize ( NUMDAYS ); + pDays.resize ( NUMDAYS ); hDays.resize ( NUMDAYS ); eDays.resize ( NUMDAYS ); @@ -341,9 +342,42 @@ 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() { @@ -353,4 +387,104 @@ void KODayMatrix::updateViewTimed() 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++) { @@ -364,4 +498,5 @@ void KODayMatrix::updateViewTimed() 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) || @@ -396,4 +531,5 @@ void KODayMatrix::updateViewTimed() } } +#endif mRedrawNeeded = true; if ( ! mPendingUpdateBeforeRepaint ) @@ -443,5 +579,5 @@ void KODayMatrix::updateView(QDate actdate) #else mRepaintTimer->start( 350 ); - mUpdateTimer->start( 1200 ); + mUpdateTimer->start( 800 ); #endif } @@ -874,5 +1010,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) mTodayPen.setWidth(mTodayMarginWidth); //draw red rectangle for holidays - if (!mHolidays[i].isNull()) { + if (pDays.testBit(i)) { if (actcol == mDefaultTextColor) { mTodayPen.setColor(KOPrefs::instance()->mHolidayColor); @@ -915,5 +1051,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // 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) ) @@ -954,5 +1090,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // reset color to actual color - if (!mHolidays[i].isNull()) { + if (pDays.testBit(i)) { p.setPen(actcol); } diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index d725ead..b686bd7 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -228,4 +228,5 @@ protected: private: + void computeEvent(Event *even, int dayindex ); int oldW, oldH; bool mRedrawNeeded; @@ -235,4 +236,5 @@ private: QBitArray hDays; QBitArray eDays; + QBitArray pDays; QPixmap myPix; QTimer* mUpdateTimer; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 1ed288b..425496a 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -270,4 +270,5 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) mReply = false; mInfo = false; + mdayPos = 0; isWeekItem = KOPrefs::instance()->mMonthViewWeek; //qDebug("NEWWWWWWWWWWWWW "); @@ -282,5 +283,6 @@ void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) mAlarm = false; mReply = false; - mInfo = false; + mInfo = false; + mdayPos = 0; //qDebug("recucleeeeeeeeeeeeeeeee "); } @@ -571,5 +573,5 @@ void MonthViewCell::setHoliday( const QString &holiday ) void MonthViewCell::startUpdateCell() { - + mdayCount = 0; setFocusPolicy(NoFocus); if ( !mMonthView->isUpdatePossible() ) @@ -622,5 +624,5 @@ void MonthViewCell::startUpdateCell() } -void MonthViewCell::insertEvent(Event *event) +int MonthViewCell::insertEvent(Event *event) { QString mToolTipText; @@ -628,8 +630,8 @@ void MonthViewCell::insertEvent(Event *event) if ( !(event->doesRecur() == Recurrence::rNone) ) { if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) - return; + return mdayCount; else if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) - return; + return mdayCount; } @@ -731,6 +733,22 @@ void MonthViewCell::insertEvent(Event *event) #endif item->setMultiDay( multiday ); - insertItem( item ); + if ( multiday ) { + insertItem( item ,mdayCount); + ++mdayCount; + } else { + uint i; + int pos = mdayCount; + for ( i = mdayCount; i < count();++i ) { + QListBoxItem* it = this->item ( i ); + if ( text < it->text() ) { + pos = i; + break; + } + ++pos; + } + insertItem( item ,pos); + } mToolTip.append( mToolTipText ); + return mdayCount; } void MonthViewCell::insertTodo(Todo *todo) @@ -782,5 +800,5 @@ void MonthViewCell::insertTodo(Todo *todo) item->setAlarm( todo->isAlarmEnabled() ); item->setMoreInfo( todo->description().length() > 0 ); - insertItem( item ); + insertItem( item , count()); mToolTip.append( text ); } @@ -805,5 +823,5 @@ void MonthViewCell::finishUpdateCell() } #endif - sort(); + //sort(); //setMyPalette(); setMyPalette(); diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index e962756..e39eeb0 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -109,4 +109,6 @@ class MonthViewItem: public QListBoxItem void setMoreInfo(bool on) { mInfo = on; } void setMultiDay(int type) { mMultiday = type; } + void setMultiDayPos(int type) { mdayPos = type; } + int gettMultiDayPos() { return mdayPos; } void setBlockRepaint(bool on) { mblockRepaint = on; } @@ -124,4 +126,5 @@ class MonthViewItem: public QListBoxItem private: + int mdayPos; bool isWeekItem; bool mblockRepaint; @@ -161,5 +164,5 @@ class MonthViewCell : public KNoScrollListBox void finishUpdateCell(); void repaintfinishUpdateCell(); - void insertEvent(Event *); + int insertEvent(Event *); void insertTodo(Todo *); @@ -198,4 +201,5 @@ public slots: private: + int mdayCount; QPtrList <MonthViewItem> mAvailItemList; KOMonthView *mMonthView; |