nf

3 files changed, 93 insertions, 72 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 148d914..18c506e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1342,125 +1342,115 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
             }
         }
     } else {
         placeItem->setSubCell(0);
         placeItem->setSubCells(1);
         if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY);
         else placeItem->resize(mGridSpacingX,placeItem->height());
         int x,y;
         gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
         moveChild(placeItem,x,y);
     }
     placeItem->setConflictItems(conflictItems);
   //   for ( item=conflictItems.first(); item != 0;
 //           item=conflictItems.next() ) {
 //         //item->updateItem();
 //         //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() );  
 //     }
 //     placeItem->updateItem();
 } 
 
 void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
-    //qDebug("KOAgenda::drawContents ");
-    if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-        ;//drawContentsToPainter();
+    if ( ! mAllDayMode ) {
+        // currently not working for
    
-    QPaintDevice* pd = p->device();
-    p->end();
-    int vx, vy; 
-    int selectionX = KOGlobals::self()->reverseLayout() ?
+        //qDebug("KOAgenda::drawContents ");
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
+            ;//drawContentsToPainter();
+   
+        QPaintDevice* pd = p->device();
+        p->end();
+        int vx, vy; 
+        int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
-    contentsToViewport ( cx, cy, vx,vy); 
-    //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
+        contentsToViewport ( cx, cy, vx,vy); 
+        //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
 
-    if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
-        if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
-                                         ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
+        if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
+            if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+                                                                    ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
             
-          int vxSel, vySel;
-        contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
-        int off = mSelectionHeight;
-        if ( vySel < 0 )
-            off += vySel;
-        //qDebug("OFF %d %d %d", off,vySel, vy );  
-        bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
-        } else {
-            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+                int vxSel, vySel;
+                contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
+                int off = mSelectionHeight;
+                if ( vySel < 0 )
+                    off += vySel;
+                //qDebug("OFF %d %d %d", off,vySel, vy );  
+                bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
+            } else {
+                bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+            }
         }
-    }
-    if ( mSelectionHeight > 0 ) { 
-        //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
-        if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
-             ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
-            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
-
-   if ( globalFlagBlockAgenda )
-        return;
-    //qDebug("KOAgenda::drawContents ");
-    if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-        ;//drawContentsToPainter();
+        if ( mSelectionHeight > 0 ) { 
+            //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
+            if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+                 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
+                contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
+                bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
+            }     
+        } 
+        p->begin( pd );
+    } else {
+ 
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
+            ;//drawContentsToPainter();
    
-    QPaintDevice* pd = p->device();
-    p->end();
-    int vx, vy; 
-    int selectionX = KOGlobals::self()->reverseLayout() ?
+        QPaintDevice* pd = p->device();
+        p->end();
+        int vx, vy; 
+        int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
-    contentsToViewport ( cx, cy, vx,vy); 
-    // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
-    if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
-        bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+        contentsToViewport ( cx, cy, vx,vy); 
+        // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
+        if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
+            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
     
-    if ( mSelectionHeight > 0 ) { 
-        //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
-        if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
-             ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
-            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 ( mSelectionHeight > 0 ) { 
+            //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
+            if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+                 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
+                contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
+                bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
+            }     
+        } 
+        p->begin( pd );
+    }
 
-#endif
 }
 
 void KOAgenda::finishUpdate()
 {
 
     KOAgendaItem *item;
     globalFlagBlockAgendaItemPaint = 1;  
     // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( !item->checkLayout() ) {
             //qDebug(" conflictitem found ");
             int newSubCellWidth;
             if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells();
             else newSubCellWidth = mGridSpacingX / item->subCells();
 
             if (mAllDayMode) {
                 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
             } else {
                 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
             }
             int x,y;
             gridToContents(item->cellX(),item->cellYTop(),x,y);
             if (mAllDayMode) {
                 y += item->subCell() * newSubCellWidth;
@@ -1946,49 +1936,49 @@ void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd,
   // Thought this would make the all-day event agenda minimum size and the
   // normal agenda take the remaining space. But it doesnīt work. The QSplitter
   // donīt seem to think that an Expanding widget needs more space than a
   // Preferred one.
   // But it doesnīt hurt, so it stays.
 //  if (mAllDayMode) {
 //    return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
 //  } else {
 //    return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
 //  }
 //}
 void KOAgenda::finishResize ( )
 {
     //qDebug("finishResize+++++++++++++++++++++++++++++++ ( ) ");
     if ( globalFlagBlockAgenda ==  0 ) {
         finishUpdate();
         //qDebug("finishUpdate() called ");
     }
 }
 /*
   Overridden from QScrollView to provide proper resizing of KOAgendaItems.
 */
 void KOAgenda::resizeEvent ( QResizeEvent *ev )
 {
-   
+    mSelectionHeight = 0;
     mResizeTimer.start( 150 , true );
     computeSizes(); 
     return;
 
 }
 void KOAgenda::computeSizes()
 {   
     if ( globalFlagBlockStartup )
         return;
     int frameOffset = frameWidth() * 2 +1;
     if (mAllDayMode) {
         mGridSpacingX = (width()-frameOffset) / mColumns;
         mGridSpacingY = height() - 2 * frameWidth() - 1;
         resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY + 1);
         //    mGridSpacingY = height();
         //    resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
 
         KOAgendaItem *item;
         int subCellWidth;
         for ( item=mItems.first(); item != 0; item=mItems.next() ) {
             subCellWidth = mGridSpacingY / item->subCells();
             item->resize(mGridSpacingX * item->cellWidth(),subCellWidth);
             moveChild(item,KOGlobals::self()->reverseLayout() ?
                       (mColumns - 1 - item->cellX()) * mGridSpacingX :
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index c9e307f..1801d7e 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -527,53 +527,56 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
         rw =  paintFrom->width() - xx;
         if ( rw <= 1 ) {
             //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
             return;
         }
     }
     //qDebug("%d %d %d %d %d  %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh);
     bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); 
 }
 void KOAgendaItem::computeText()
 {
     mDisplayedText =  mIncidence->summary();
     if ( (mIncidence->type() == "Todo") ) {
         if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
             if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() )
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")";
             else if ( !(mIncidence->doesFloat()))
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")";
         } 
     } else {
         if ( !(mIncidence->doesFloat()) &&  KOPrefs::instance()->mShowTimeInAgenda)
             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() ) {
-                mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
-            }
+            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 )
             mDisplayedText += " (";
         else
             mDisplayedText += "\n(";
         mDisplayedText += mIncidence->location() +")";
     }
 #ifdef DESKTOP_VERSION
     QString tipText = mIncidence->summary();
     if ( !mIncidence->doesFloat() ) {
         if ( mIncidence->type() == "Event" ) {
             if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
                 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr();
                 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr();
             }
             else {
                 tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr();
                 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr();
             }
         }
         else if ( mIncidence->type() == "Todo" ) {
             if (mIncidence->hasStartDate())
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 76d5c4b..f53e5d5 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1139,49 +1139,77 @@ void KOAgendaView::fillAgenda()
         //    kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
         //              << endl;
 
         dayEvents = calendar()->events(currentDate,true);
 
         // Default values, which can never be reached
         mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
         mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
 
         unsigned int numEvent;
         for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
             Event *event = dayEvents.at(numEvent);
             if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
                 if ( event->uid().left(15) == QString("last-syncEvent-")  )
                     continue;
             //      kdDebug() << " Event: " << event->summary() << endl;
 
             int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
             int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
 
             //      kdDebug() << "  beginX: " << beginX << "  endX: " << endX << endl;
 
             if (event->doesFloat()) {
                 if (event->recurrence()->doesRecur()) {
-                    mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
+                    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) {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                     }
                 }
             } else if (event->isMultiDay()) {
                 if ( event->doesRecur () ) {
                     QDate dateit = currentDate;
                     int count = 0;
                     int max = event->dtStart().daysTo( event->dtEnd() ) +2;
                     while (! event->recursOn( dateit ) && count <= max ) {
                         ++count; 
                         dateit = dateit.addDays( -1 );
                     }
                     bool ok;
                     QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok );
                     if ( ok )
                          {
                                 int secs = event->dtStart().secsTo( event->dtEnd() );
                                 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
                                 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
                                 endX = currentDate.daysTo(nextOcend.date()) + curCol;