| -rw-r--r-- | korganizer/kodaymatrix.cpp | 87 |
1 files changed, 62 insertions, 25 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 17a1d13..df606d0 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -368,14 +368,18 @@ void KODayMatrix::computeEvent(Event *event, int i ) mHolidays[i] =holiStr ; + eDays.setBit(i); } - 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 ; + if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) { + 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); + if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) + eDays.setBit(i); } @@ -390,2 +394,3 @@ void KODayMatrix::updateViewTimed() + int i; @@ -471,13 +476,45 @@ void KODayMatrix::updateViewTimed() } - -#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 ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { + bDays.fill( false); + // insert due todos + QPtrList<Todo> todos = mCalendar->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) { + int i = day; + QString holiStr = mHolidays[i]; + pDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += i18n("Todo") + ": "+todo->summary(); + if ( !todo->location().isEmpty() ) + holiStr += " (" + todo->location() + ")"; + bDays.setBit(i); + mHolidays[i] =holiStr ; + eDays.setBit(i); + } + } + } + } + if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { + bDays.fill( false); + // insert due todos + QPtrList<Journal> todos = mCalendar->journals( ); + Journal *todo; + for(todo = todos.first(); todo; todo = todos.next()) { + int day = mStartDate.daysTo( todo->dtStart().date() ); if ( day >= 0 && day < timeSpan + 1) { - (*cells)[day]->insertTodo( todo ); + int i = day; + QString holiStr = mHolidays[i]; + pDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += i18n("Journal"); + bDays.setBit(i); + mHolidays[i] =holiStr ; + eDays.setBit(i); + } @@ -485,4 +522,2 @@ void KODayMatrix::updateViewTimed() } -#endif - #else @@ -538,3 +573,5 @@ void KODayMatrix::updateView(QDate actdate) { - + if ( mLastView != KOPrefs::instance()->mCurrentDisplayedView ) + mRedrawNeeded = true; + mLastView = KOPrefs::instance()->mCurrentDisplayedView; if ( ! actdate.isValid() ) { @@ -1054,5 +1091,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) if ( hDays.testBit(i) ) - p.setPen(QColor(Qt::green)); + p.setPen(QColor(0,200,0)); else - p.setPen(QColor(Qt::green).dark()); + p.setPen(QColor(Qt::blue)); } else { |