-rw-r--r-- | korganizer/koagendaview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index f53e5d5..17f791d 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -1154,36 +1154,36 @@ void KOAgendaView::fillAgenda() | |||
1154 | // kdDebug() << " Event: " << event->summary() << endl; | 1154 | // kdDebug() << " Event: " << event->summary() << endl; |
1155 | 1155 | ||
1156 | int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; | 1156 | int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; |
1157 | int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; | 1157 | int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; |
1158 | 1158 | ||
1159 | // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; | 1159 | // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; |
1160 | 1160 | ||
1161 | if (event->doesFloat()) { | 1161 | if (event->doesFloat()) { |
1162 | if (event->recurrence()->doesRecur()) { | 1162 | if (event->recurrence()->doesRecur()) { |
1163 | if (event->isMultiDay() ) { | 1163 | if (event->isMultiDay() ) { |
1164 | endX = endX - beginX;// endX is now number of days | 1164 | endX = endX - beginX;// endX is now number of days |
1165 | if ( event->recursOn( currentDate ) ) { | 1165 | if ( event->recursOn( currentDate ) ) { |
1166 | endX += curCol; | 1166 | endX += curCol; |
1167 | beginX = curCol; | 1167 | beginX = curCol; |
1168 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); | 1168 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); |
1169 | } else { | 1169 | } else { |
1170 | //qDebug("days %d %s",endX , currentDate.toString().latin1()); | 1170 | qDebug("days %d %s",endX , currentDate.toString().latin1()); |
1171 | QDate dateit = currentDate.addDays( -endX ); | 1171 | QDate dateit = currentDate.addDays( -endX ); |
1172 | if ( event->recursOn( dateit ) ) { | 1172 | if ( event->recursOn( dateit ) ) { |
1173 | //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); | 1173 | qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); |
1174 | if ( curCol-endX < 0 ) { | 1174 | if ( curCol-endX < 0 ) { |
1175 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); | 1175 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); |
1176 | } | 1176 | } |
1177 | } | 1177 | } |
1178 | } | 1178 | } |
1179 | } else { | 1179 | } else { |
1180 | mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); | 1180 | mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); |
1181 | } | 1181 | } |
1182 | #if 0 | 1182 | #if 0 |
1183 | if (beginX <= 0 && curCol == 0) { | 1183 | if (beginX <= 0 && curCol == 0) { |
1184 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); | 1184 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); |
1185 | } else if (beginX == curCol) { | 1185 | } else if (beginX == curCol) { |
1186 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); | 1186 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); |
1187 | } else { | 1187 | } else { |
1188 | qDebug("skipped %d %d %d ",beginX , endX, curCol); | 1188 | qDebug("skipped %d %d %d ",beginX , endX, curCol); |
1189 | } | 1189 | } |