summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2004-10-05 12:44:18 (UTC)
committer zautrix <zautrix>2004-10-05 12:44:18 (UTC)
commita946c09db6f71f595d8bdcb6b34ba3160c5497dc (patch) (unidiff)
treea5286059096fd9e622c7188839d2f612c3489e50 /korganizer
parent6406e08703d51eae5fad7cf11618c502831b692b (diff)
downloadkdepimpi-a946c09db6f71f595d8bdcb6b34ba3160c5497dc.zip
kdepimpi-a946c09db6f71f595d8bdcb6b34ba3160c5497dc.tar.gz
kdepimpi-a946c09db6f71f595d8bdcb6b34ba3160c5497dc.tar.bz2
bugfix show last sync events
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 947bb66..3aae076 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -989,50 +989,51 @@ void KOAgendaView::fillAgenda()
989 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 989 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
990 // Therefore, get all of them. 990 // Therefore, get all of them.
991 QPtrList<Todo> todos = calendar()->todos(); 991 QPtrList<Todo> todos = calendar()->todos();
992 992
993 mAgenda->setDateList(mSelectedDates); 993 mAgenda->setDateList(mSelectedDates);
994 994
995 QDate today = QDate::currentDate(); 995 QDate today = QDate::currentDate();
996 996
997 DateList::ConstIterator dit; 997 DateList::ConstIterator dit;
998 int curCol = 0; 998 int curCol = 0;
999 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 999 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
1000 QDate currentDate = *dit; 1000 QDate currentDate = *dit;
1001 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() 1001 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
1002 // << endl; 1002 // << endl;
1003 1003
1004 dayEvents = calendar()->events(currentDate,true); 1004 dayEvents = calendar()->events(currentDate,true);
1005 1005
1006 // Default values, which can never be reached 1006 // Default values, which can never be reached
1007 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; 1007 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
1008 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; 1008 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
1009 1009
1010 unsigned int numEvent; 1010 unsigned int numEvent;
1011 for(numEvent=0;numEvent<dayEvents.count();++numEvent) { 1011 for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
1012 Event *event = dayEvents.at(numEvent); 1012 Event *event = dayEvents.at(numEvent);
1013 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(15) == QString("last-syncEvent-") ) 1013 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
1014 continue; 1014 if ( event->uid().left(15) == QString("last-syncEvent-") )
1015 continue;
1015 // kdDebug() << " Event: " << event->summary() << endl; 1016 // kdDebug() << " Event: " << event->summary() << endl;
1016 1017
1017 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; 1018 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
1018 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; 1019 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
1019 1020
1020 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; 1021 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl;
1021 1022
1022 if (event->doesFloat()) { 1023 if (event->doesFloat()) {
1023 if (event->recurrence()->doesRecur()) { 1024 if (event->recurrence()->doesRecur()) {
1024 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); 1025 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
1025 } else { 1026 } else {
1026 if (beginX <= 0 && curCol == 0) { 1027 if (beginX <= 0 && curCol == 0) {
1027 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1028 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1028 } else if (beginX == curCol) { 1029 } else if (beginX == curCol) {
1029 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1030 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1030 } 1031 }
1031 } 1032 }
1032 } else if (event->isMultiDay()) { 1033 } else if (event->isMultiDay()) {
1033 if ( event->doesRecur () ) { 1034 if ( event->doesRecur () ) {
1034 QDate dateit = currentDate; 1035 QDate dateit = currentDate;
1035 int count = 0; 1036 int count = 0;
1036 int max = event->dtStart().daysTo( event->dtEnd() ) +2; 1037 int max = event->dtStart().daysTo( event->dtEnd() ) +2;
1037 while (! event->recursOn( dateit ) && count <= max ) { 1038 while (! event->recursOn( dateit ) && count <= max ) {
1038 ++count; 1039 ++count;