-rw-r--r-- | korganizer/koagendaview.cpp | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 131a345..a01323a 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -1176,2 +1176,3 @@ void KOAgendaView::fillAgenda() | |||
1176 | int curCol = 0; | 1176 | int curCol = 0; |
1177 | int maxCol = mSelectedDates.count()-1; | ||
1177 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 1178 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
@@ -1188,2 +1189,3 @@ void KOAgendaView::fillAgenda() | |||
1188 | unsigned int numEvent; | 1189 | unsigned int numEvent; |
1190 | //qDebug("+++++NUMEVENT %d", dayEvents.count()); | ||
1189 | for(numEvent=0;numEvent<dayEvents.count();++numEvent) { | 1191 | for(numEvent=0;numEvent<dayEvents.count();++numEvent) { |
@@ -1209,8 +1211,21 @@ void KOAgendaView::fillAgenda() | |||
1209 | } else { | 1211 | } else { |
1210 | //qDebug("days %d %s",endX , currentDate.toString().latin1()); | 1212 | //qDebug("days endX %d curCol %d max Col %d %s",endX ,curCol, maxCol, currentDate.toString().latin1()); |
1211 | QDate dateit = currentDate.addDays( -endX ); | 1213 | if ( curCol == maxCol && maxCol+1 < endX ) { |
1212 | if ( event->recursOn( dateit ) ) { | 1214 | int i; |
1213 | //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); | 1215 | for ( i = 1; i< endX; ++i ) { |
1214 | if ( curCol-endX < 0 ) { | 1216 | if ( event->recursOn( currentDate.addDays( -i ) ) ) |
1217 | break; | ||
1218 | } | ||
1219 | if ( i > maxCol ) { | ||
1215 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); | 1220 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); |
1221 | //qDebug("BINGO "); | ||
1222 | } | ||
1223 | |||
1224 | } else { | ||
1225 | QDate dateit = currentDate.addDays( -endX ); | ||
1226 | if ( event->recursOn( dateit ) ) { | ||
1227 | //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); | ||
1228 | if ( curCol-endX < 0 ) { | ||
1229 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); | ||
1230 | } | ||
1216 | } | 1231 | } |