nf

author: zautrix <zautrix> 2005-04-09 16:49:42 (UTC)
committer: zautrix <zautrix> 2005-04-09 16:49:42 (UTC)
commit: d1982b1423417eb59c275bb09d4e3012a67ca086 (patch) (unidiff)
tree: f170a17f3d04e9d11d450233ea2d55f5803760fb
parent: 329ecb2c6b4153c51415513a28f2dc0576f4ddca (diff)
download: kdepimpi-d1982b1423417eb59c275bb09d4e3012a67ca086.zip
kdepimpi-d1982b1423417eb59c275bb09d4e3012a67ca086.tar.gz
kdepimpi-d1982b1423417eb59c275bb09d4e3012a67ca086.tar.bz2
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
@@ -1363,83 +1363,73 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
    if ( globalFlagBlockAgenda )
        return;
-    //qDebug("KOAgenda::drawContents ");
+    if ( ! mAllDayMode ) {
-    if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
+        // currently not working for
-        ;//drawContentsToPainter();
   
-    QPaintDevice* pd = p->device();
+        //qDebug("KOAgenda::drawContents ");
-    p->end();
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-    int vx, vy; 
+            ;//drawContentsToPainter();
-    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); 
+        contentsToViewport ( cx, cy, vx,vy); 
-    //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
+        //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
-    if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
+        if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
-        if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+            if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
-                                         ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
+                                                                    ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
            
-          int vxSel, vySel;
+                int vxSel, vySel;
-        contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
+                contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
-        int off = mSelectionHeight;
+                int off = mSelectionHeight;
-        if ( vySel < 0 )
+                if ( vySel < 0 )
-            off += vySel;
+                    off += vySel;
-        //qDebug("OFF %d %d %d", off,vySel, vy );  
+                //qDebug("OFF %d %d %d", off,vySel, vy );  
-        bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
+                bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
-        } else {
+            } else {
-            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+                bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+            }
        }
-    }
+        if ( mSelectionHeight > 0 ) { 
-    if ( mSelectionHeight > 0 ) { 
+            //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
-        //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
+            if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
-        if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+                 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
-             ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
+                contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
-            contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
+                bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
-            bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
+            }     
-        }     
+        } 
-    } 
+        p->begin( pd );
-    //qDebug("btbl ");  
+    } else {
-    p->begin( pd );
+ 
-    //qDebug("end "); 
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-#if 0
+            ;//drawContentsToPainter();
-   if ( globalFlagBlockAgenda )
-        return;
-    //qDebug("KOAgenda::drawContents ");
-    if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-        ;//drawContentsToPainter();
   
-    QPaintDevice* pd = p->device();
+        QPaintDevice* pd = p->device();
-    p->end();
+        p->end();
-    int vx, vy; 
+        int vx, vy; 
-    int selectionX = KOGlobals::self()->reverseLayout() ?
+        int selectionX = KOGlobals::self()->reverseLayout() ?
            (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
            mSelectionCellX * mGridSpacingX;
-    contentsToViewport ( cx, cy, vx,vy); 
+        contentsToViewport ( cx, cy, vx,vy); 
-    // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
+        // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
-    if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
+        if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
-        bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
    
-    if ( mSelectionHeight > 0 ) { 
+        if ( mSelectionHeight > 0 ) { 
-        //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
+            //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
-        if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+            if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
-             ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
+                 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
-            contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
+                contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
-            bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
+                bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
-        }     
+            }     
-    } 
+        } 
-    //qDebug("btbl ");  
+        p->begin( pd );
-    p->begin( pd );
+    }
-    //qDebug("end "); 
-#endif
 }
 void KOAgenda::finishUpdate()
@@ -1967,7 +1957,7 @@ void KOAgenda::finishResize ( )
 */
 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,11 +548,14 @@ 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->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->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() ) {
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 76d5c4b..f53e5d5 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1160,7 +1160,35 @@ void KOAgendaView::fillAgenda()
            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);
author	zautrix <zautrix>	2005-04-09 16:49:42 (UTC)
committer	zautrix <zautrix>	2005-04-09 16:49:42 (UTC)
commit	d1982b1423417eb59c275bb09d4e3012a67ca086 (patch) (unidiff)
tree	f170a17f3d04e9d11d450233ea2d55f5803760fb
parent	329ecb2c6b4153c51415513a28f2dc0576f4ddca (diff)
download	kdepimpi-d1982b1423417eb59c275bb09d4e3012a67ca086.zip kdepimpi-d1982b1423417eb59c275bb09d4e3012a67ca086.tar.gz kdepimpi-d1982b1423417eb59c275bb09d4e3012a67ca086.tar.bz2

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 148d914..18c506e 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp
@@ -1363,83 +1363,73 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
1363	{	1363	{
1364	if ( globalFlagBlockAgenda )	1364	if ( globalFlagBlockAgenda )
1365	return;	1365	return;
1366	//qDebug("KOAgenda::drawContents ");	1366	if ( ! mAllDayMode ) {
1367	if ( mCurPixWid != contentsWidth() \|\| mCurPixHei != contentsHeight() )	1367	// currently not working for
1368	;//drawContentsToPainter();
1369		1368
1370	QPaintDevice* pd = p->device();	1369	//qDebug("KOAgenda::drawContents ");
1371	p->end();	1370	if ( mCurPixWid != contentsWidth() \|\| mCurPixHei != contentsHeight() )
1372	int vx, vy;	1371	;//drawContentsToPainter();
1373	int selectionX = KOGlobals::self()->reverseLayout() ?	1372
		1373	QPaintDevice* pd = p->device();
		1374	p->end();
		1375	int vx, vy;
		1376	int selectionX = KOGlobals::self()->reverseLayout() ?
1374	(mColumns - 1 - mSelectionCellX) * mGridSpacingX :	1377	(mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1375	mSelectionCellX * mGridSpacingX;	1378	mSelectionCellX * mGridSpacingX;
1376	contentsToViewport ( cx, cy, vx,vy);	1379	contentsToViewport ( cx, cy, vx,vy);
1377	//qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ;	1380	//qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ;
1378		1381
1379	if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) {	1382	if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
1380	if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&	1383	if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1381	( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {	1384	( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
1382		1385
1383	int vxSel, vySel;	1386	int vxSel, vySel;
1384	contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel);	1387	contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel);
1385	int off = mSelectionHeight;	1388	int off = mSelectionHeight;
1386	if ( vySel < 0 )	1389	if ( vySel < 0 )
1387	off += vySel;	1390	off += vySel;
1388	//qDebug("OFF %d %d %d", off,vySel, vy );	1391	//qDebug("OFF %d %d %d", off,vySel, vy );
1389	bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,CopyROP);	1392	bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,CopyROP);
1390	} else {	1393	} else {
1391	bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);	1394	bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
		1395	}
1392	}	1396	}
1393	}	1397	if ( mSelectionHeight > 0 ) {
1394	if ( mSelectionHeight > 0 ) {	1398	//qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
1395	//qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );	1399	if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1396	if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&	1400	( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1397	( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {	1401	contentsToViewport ( selectionX, mSelectionYTop, vx,vy);
1398	contentsToViewport ( selectionX, mSelectionYTop, vx,vy);	1402	bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);
1399	bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);	1403	}
1400	}	1404	}
1401	}	1405	p->begin( pd );
1402	//qDebug("btbl ");	1406	} else {
1403	p->begin( pd );	1407
1404	//qDebug("end ");	1408	if ( mCurPixWid != contentsWidth() \|\| mCurPixHei != contentsHeight() )
1405	#if 0	1409	;//drawContentsToPainter();
1406
1407	if ( globalFlagBlockAgenda )
1408	return;
1409	//qDebug("KOAgenda::drawContents ");
1410	if ( mCurPixWid != contentsWidth() \|\| mCurPixHei != contentsHeight() )
1411	;//drawContentsToPainter();
1412		1410
1413	QPaintDevice* pd = p->device();	1411	QPaintDevice* pd = p->device();
1414	p->end();	1412	p->end();
1415	int vx, vy;	1413	int vx, vy;
1416	int selectionX = KOGlobals::self()->reverseLayout() ?	1414	int selectionX = KOGlobals::self()->reverseLayout() ?
1417	(mColumns - 1 - mSelectionCellX) * mGridSpacingX :	1415	(mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1418	mSelectionCellX * mGridSpacingX;	1416	mSelectionCellX * mGridSpacingX;
1419	contentsToViewport ( cx, cy, vx,vy);	1417	contentsToViewport ( cx, cy, vx,vy);
1420	// qDebug(" %d %d %d %d ", cx, cy, cw,ch) ;	1418	// qDebug(" %d %d %d %d ", cx, cy, cw,ch) ;
1421	if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) )	1419	if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) )
1422	bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);	1420	bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
1423		1421
1424	if ( mSelectionHeight > 0 ) {	1422	if ( mSelectionHeight > 0 ) {
1425	//qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );	1423	//qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
1426	if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&	1424	if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1427	( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {	1425	( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1428	contentsToViewport ( selectionX, mSelectionYTop, vx,vy);	1426	contentsToViewport ( selectionX, mSelectionYTop, vx,vy);
1429	bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);	1427	bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);
1430	}	1428	}
1431	}	1429	}
1432	//qDebug("btbl ");	1430	p->begin( pd );
1433	p->begin( pd );	1431	}
1434	//qDebug("end ");
1435
1436
1437
1438
1439
1440
1441		1432
1442	#endif
1443	}	1433	}
1444		1434
1445	void KOAgenda::finishUpdate()	1435	void KOAgenda::finishUpdate()
@@ -1967,7 +1957,7 @@ void KOAgenda::finishResize ( )
1967	*/	1957	*/
1968	void KOAgenda::resizeEvent ( QResizeEvent *ev )	1958	void KOAgenda::resizeEvent ( QResizeEvent *ev )
1969	{	1959	{
1970		1960	mSelectionHeight = 0;
1971	mResizeTimer.start( 150 , true );	1961	mResizeTimer.start( 150 , true );
1972	computeSizes();	1962	computeSizes();
1973	return;	1963	return;


diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index c9e307f..1801d7e 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp
@@ -548,11 +548,14 @@ void KOAgendaItem::computeText()
548	mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event>(mIncidence))->dtEnd().time()) ;	548	mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event>(mIncidence))->dtEnd().time()) ;
549		549
550	if ( mAllDay ) {	550	if ( mAllDay ) {
551	if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {	551	if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
552	mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event>(mIncidence))->dtEnd().date(), true) ;	552	if ( mIncidence->doesRecur() ) {
553	}	553	mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")";
		554	} else {
		555	mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event>(mIncidence))->dtEnd().date(), true) ;
		556	}
		557	}
554	}	558	}
555
556	}	559	}
557		560
558	if ( !mIncidence->location().isEmpty() ) {	561	if ( !mIncidence->location().isEmpty() ) {


diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 76d5c4b..f53e5d5 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp
@@ -1160,7 +1160,35 @@ void KOAgendaView::fillAgenda()
1160		1160
1161	if (event->doesFloat()) {	1161	if (event->doesFloat()) {
1162	if (event->recurrence()->doesRecur()) {	1162	if (event->recurrence()->doesRecur()) {
1163	mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);	1163	if (event->isMultiDay() ) {
		1164	endX = endX - beginX;// endX is now number of days
		1165	if ( event->recursOn( currentDate ) ) {
		1166	endX += curCol;
		1167	beginX = curCol;
		1168	mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
		1169	} else {
		1170	//qDebug("days %d %s",endX , currentDate.toString().latin1());
		1171	QDate dateit = currentDate.addDays( -endX );
		1172	if ( event->recursOn( dateit ) ) {
		1173	//qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() );
		1174	if ( curCol-endX < 0 ) {
		1175	mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
		1176	}
		1177	}
		1178	}
		1179	} else {
		1180	mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
		1181	}
		1182	#if 0
		1183	if (beginX <= 0 && curCol == 0) {
		1184	mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
		1185	} else if (beginX == curCol) {
		1186	mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
		1187	} else {
		1188	qDebug("skipped %d %d %d ",beginX , endX, curCol);
		1189	}
		1190	#endif
		1191	//mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
1164	} else {	1192	} else {
1165	if (beginX <= 0 && curCol == 0) {	1193	if (beginX <= 0 && curCol == 0) {
1166	mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);	1194	mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);