nf

3 files changed, 38 insertions, 17 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 148d914..18c506e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1362,8 +1362,11 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
+    if ( ! mAllDayMode ) {
+        // currently not working for
+   
     //qDebug("KOAgenda::drawContents ");
     if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
         ;//drawContentsToPainter();
    
@@ -1398,16 +1401,11 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
             contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
             bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
         }     
     } 
-    //qDebug("btbl ");  
     p->begin( pd );
-    //qDebug("end "); 
-#if 0
+    } else {
 
-   if ( globalFlagBlockAgenda )
-        return;
-    //qDebug("KOAgenda::drawContents ");
     if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
         ;//drawContentsToPainter();
    
     QPaintDevice* pd = p->device();
@@ -1428,19 +1426,11 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
             contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
             bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
         }     
     } 
-    //qDebug("btbl ");  
     p->begin( pd );
-    //qDebug("end "); 
-
-
-
-
-
-
+    }
 
-#endif
 }
 
 void KOAgenda::finishUpdate()
 {
@@ -1966,9 +1956,9 @@ void KOAgenda::finishResize ( )
   Overridden from QScrollView to provide proper resizing of KOAgendaItems.
 */
 void KOAgenda::resizeEvent ( QResizeEvent *ev )
 {
-   
+    mSelectionHeight = 0;
     mResizeTimer.start( 150 , true );
     computeSizes(); 
     return;
 
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index c9e307f..1801d7e 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -548,12 +548,15 @@ void KOAgendaItem::computeText()
             mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
 
         if (  mAllDay ) {
             if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
+                if ( mIncidence->doesRecur() ) {
+                    mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")";
+                } else {
                 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
             }
         }
-
+        }
     }
     
     if ( !mIncidence->location().isEmpty() ) {
         if ( mAllDay )
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 76d5c4b..f53e5d5 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1159,9 +1159,37 @@ void KOAgendaView::fillAgenda()
             //      kdDebug() << "  beginX: " << beginX << "  endX: " << endX << endl;
 
             if (event->doesFloat()) {
                 if (event->recurrence()->doesRecur()) {
+                    if (event->isMultiDay() ) {
+                        endX = endX - beginX;// endX is now number of days
+                        if ( event->recursOn( currentDate ) ) {
+                            endX +=  curCol;
+                            beginX = curCol;
+                            mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
+                        } else {
+                            //qDebug("days %d %s",endX , currentDate.toString().latin1());
+                            QDate dateit = currentDate.addDays( -endX );
+                            if ( event->recursOn( dateit ) ) {
+                                //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1()  );
+                                if ( curCol-endX < 0 ) {
+                                    mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
+                                }
+                            }
+                        }
+                    } else {
                     mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
+                    }
+#if 0
+                    if (beginX <= 0 && curCol == 0) {
+                        mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
+                    } else if (beginX == curCol) {
+                        mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
+                    } else {
+                        qDebug("skipped %d %d %d ",beginX , endX, curCol);
+                    }
+#endif
+                        //mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
                 } else {
                     if (beginX <= 0 && curCol == 0) {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                     } else if (beginX == curCol) {