summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-04 21:23:46 (UTC)
committer zautrix <zautrix>2005-07-04 21:23:46 (UTC)
commit35f1ad23e06a0f6014d98c952e8b8652b5cffc49 (patch) (unidiff)
tree4c3b222a9d2baff7b43c366bb0bfa1fab24a5177 /korganizer
parent2767ffda27fa0e88816832d4b2c6efdd0c52a8eb (diff)
downloadkdepimpi-35f1ad23e06a0f6014d98c952e8b8652b5cffc49.zip
kdepimpi-35f1ad23e06a0f6014d98c952e8b8652b5cffc49.tar.gz
kdepimpi-35f1ad23e06a0f6014d98c952e8b8652b5cffc49.tar.bz2
highlight pix smaller
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagenda.cpp225
1 files changed, 113 insertions, 112 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 63fdecd..9b817bc 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1367,209 +1367,211 @@ void KOAgenda::finishUpdate()
1367 globalFlagBlockAgendaItemUpdate = 0; 1367 globalFlagBlockAgendaItemUpdate = 0;
1368 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1368 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1369 item->repaintMe( ); 1369 item->repaintMe( );
1370 } 1370 }
1371 globalFlagBlockAgendaItemUpdate = 1; 1371 globalFlagBlockAgendaItemUpdate = 1;
1372 qApp->processEvents(); 1372 qApp->processEvents();
1373 globalFlagBlockAgendaItemPaint = 0; 1373 globalFlagBlockAgendaItemPaint = 0;
1374 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1374 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1375 item->repaint( false ); 1375 item->repaint( false );
1376 } 1376 }
1377 1377
1378} 1378}
1379 1379
1380/* 1380/*
1381 Draw grid in the background of the agenda. 1381 Draw grid in the background of the agenda.
1382*/ 1382*/
1383void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch) 1383void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch)
1384{ 1384{
1385 1385
1386 1386
1387 if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask ) 1387 if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask )
1388 return; 1388 return;
1389 if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 ) 1389 if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 )
1390 return; 1390 return;
1391 int cx = 0, cy = 0, cw = contentsWidth(), ch = contentsHeight(); 1391 int cx = 0, cy = 0, cw = contentsWidth(), ch = contentsHeight();
1392 if ( ch < 1 ) 1392 if ( ch < 1 )
1393 ch = 1; 1393 ch = 1;
1394 if ( mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) { 1394 if ( mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) {
1395 mPaintPixmap.resize( contentsWidth()+42, ch ); 1395 mPaintPixmap.resize( contentsWidth()+42, ch );
1396 } 1396 }
1397 mCurPixWid = contentsWidth(); 1397 mCurPixWid = contentsWidth();
1398 mCurPixHei = ch; 1398 mCurPixHei = ch;
1399 if ( mHighlightPixmap.width() < mGridSpacingX-1 ) { 1399 if ( mHighlightPixmap.width() < mGridSpacingX-1 ) {
1400 mHighlightPixmap.resize( mGridSpacingX-1, 5 ); 1400 mHighlightPixmap.resize( mGridSpacingX-1, 5 );
1401 mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor ); 1401 mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor );
1402 } 1402 }
1403 mPixPainter.begin( &mPaintPixmap) ; 1403 mPixPainter.begin( &mPaintPixmap) ;
1404 //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height() ); 1404 //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height() );
1405 QPainter * p ; 1405 QPainter * p ;
1406 if (paint == 0) { 1406 if (paint == 0) {
1407 mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor); 1407 mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor);
1408 p = &mPixPainter; 1408 p = &mPixPainter;
1409 } 1409 }
1410 else 1410 else
1411 p = paint ; 1411 p = paint ;
1412 // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ", cx, cy, cw, ch); 1412 // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ", cx, cy, cw, ch);
1413 1413
1414 //--cx;++cw; 1414 //--cx;++cw;
1415 int lGridSpacingY = mGridSpacingY*2; 1415 int lGridSpacingY = mGridSpacingY*2;
1416 int selDay; 1416 int selDay;
1417 if ( !backgroundOnly ) 1417 QDate curDate = QDate::currentDate();
1418 for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay) 1418 if ( !backgroundOnly ) {
1419 { 1419 for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay)
1420 if ( mSelectedDates[selDay] == QDateTime::currentDateTime ().date() && KOPrefs::instance()->mHighlightCurrentDay) { 1420 {
1421 int x1 = cx; 1421 if ( mSelectedDates[selDay] == curDate && KOPrefs::instance()->mHighlightCurrentDay) {
1422 int y1 = 0; 1422 int x1 = cx;
1423 if (y1 < cy) y1 = cy; 1423 int y1 = 0;
1424 int x2 = cx+cw-1; 1424 if (y1 < cy) y1 = cy;
1425 int y2 = contentsHeight(); 1425 int x2 = cx+cw-1;
1426 if (y2 > cy+ch-1) y2=cy+ch-1; 1426 int y2 = contentsHeight();
1427 if (x2 >= x1 && y2 >= y1) { 1427 if (y2 > cy+ch-1) y2=cy+ch-1;
1428 int gxStart = selDay; 1428 if (x2 >= x1 && y2 >= y1) {
1429 int gxEnd = gxStart ; 1429 int gxStart = selDay;
1430 int xStart = KOGlobals::self()->reverseLayout() ? 1430 int gxEnd = gxStart ;
1431 (mColumns - 1 - gxStart)*mGridSpacingX : 1431 int xStart = KOGlobals::self()->reverseLayout() ?
1432 gxStart*mGridSpacingX; 1432 (mColumns - 1 - gxStart)*mGridSpacingX :
1433 if (xStart < x1) xStart = x1; 1433 gxStart*mGridSpacingX;
1434 int xEnd = KOGlobals::self()->reverseLayout() ? 1434 if (xStart < x1) xStart = x1;
1435 (mColumns - gxStart)*mGridSpacingX-1 : 1435 int xEnd = KOGlobals::self()->reverseLayout() ?
1436 (gxStart+1)*mGridSpacingX-1; 1436 (mColumns - gxStart)*mGridSpacingX-1 :
1437 if (xEnd > x2) xEnd = x2; 1437 (gxStart+1)*mGridSpacingX-1;
1438 if ( KOPrefs::instance()->mUseHighlightLightColor ) 1438 if (xEnd > x2) xEnd = x2;
1439 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1439 if ( KOPrefs::instance()->mUseHighlightLightColor )
1440 KOPrefs::instance()->mAgendaBgColor.light()); 1440 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1441 else 1441 KOPrefs::instance()->mAgendaBgColor.light());
1442 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1442 else
1443 KOPrefs::instance()->mAgendaBgColor.dark()); 1443 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1444 KOPrefs::instance()->mAgendaBgColor.dark());
1444 1445
1445 } 1446 }
1446 } 1447 }
1447 } 1448 }
1448 // Highlight working hours 1449 }
1449 1450 // Highlight working hours
1450 if ( !backgroundOnly ) 1451
1451 if (mWorkingHoursEnable) { 1452 if ( !backgroundOnly )
1452 int x1 = cx; 1453 if (mWorkingHoursEnable) {
1453 int y1 = mWorkingHoursYTop; 1454 int x1 = cx;
1454 if (y1 < cy) y1 = cy; 1455 int y1 = mWorkingHoursYTop;
1455 int x2 = cx+cw-1; 1456 if (y1 < cy) y1 = cy;
1456 // int x2 = mGridSpacingX * 5 - 1; 1457 int x2 = cx+cw-1;
1457 // if (x2 > cx+cw-1) x2 = cx + cw - 1; 1458 // int x2 = mGridSpacingX * 5 - 1;
1458 int y2 = mWorkingHoursYBottom; 1459 // if (x2 > cx+cw-1) x2 = cx + cw - 1;
1459 if (y2 > cy+ch-1) y2=cy+ch-1; 1460 int y2 = mWorkingHoursYBottom;
1460 1461 if (y2 > cy+ch-1) y2=cy+ch-1;
1461 if (x2 >= x1 && y2 >= y1) { 1462
1462 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX ); 1463 if (x2 >= x1 && y2 >= y1) {
1463 int gxStart = x1/mGridSpacingX; 1464 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX );
1464 int gxEnd = x2/mGridSpacingX; 1465 int gxStart = x1/mGridSpacingX;
1465 while(gxStart <= gxEnd) { 1466 int gxEnd = x2/mGridSpacingX;
1466 if (gxStart < int(mHolidayMask->count()) && 1467 while(gxStart <= gxEnd) {
1467 !mHolidayMask->at(gxStart)) { 1468 if (gxStart < int(mHolidayMask->count()) &&
1468 int xStart = KOGlobals::self()->reverseLayout() ? 1469 !mHolidayMask->at(gxStart)) {
1469 (mColumns - 1 - gxStart)*mGridSpacingX : 1470 int xStart = KOGlobals::self()->reverseLayout() ?
1470 gxStart*mGridSpacingX; 1471 (mColumns - 1 - gxStart)*mGridSpacingX :
1471 if (xStart < x1) xStart = x1; 1472 gxStart*mGridSpacingX;
1472 int xEnd = KOGlobals::self()->reverseLayout() ? 1473 if (xStart < x1) xStart = x1;
1473 (mColumns - gxStart)*mGridSpacingX-1 : 1474 int xEnd = KOGlobals::self()->reverseLayout() ?
1474 (gxStart+1)*mGridSpacingX-1; 1475 (mColumns - gxStart)*mGridSpacingX-1 :
1475 if (xEnd > x2) xEnd = x2; 1476 (gxStart+1)*mGridSpacingX-1;
1476 if ( mSelectedDates[gxStart] == QDateTime::currentDateTime ().date()&& KOPrefs::instance()->mHighlightCurrentDay ) { 1477 if (xEnd > x2) xEnd = x2;
1477 if ( KOPrefs::instance()->mUseHighlightLightColor ) 1478 if ( mSelectedDates[gxStart] == curDate && KOPrefs::instance()->mHighlightCurrentDay ) {
1478 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1479 if ( KOPrefs::instance()->mUseHighlightLightColor )
1479 KOPrefs::instance()->mWorkingHoursColor.light()); 1480 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1480 else 1481 KOPrefs::instance()->mWorkingHoursColor.light());
1481 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1482 else
1482 KOPrefs::instance()->mWorkingHoursColor.dark()); 1483 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1483 } else { 1484 KOPrefs::instance()->mWorkingHoursColor.dark());
1484 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1485 } else {
1485 KOPrefs::instance()->mWorkingHoursColor); 1486 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1486 } 1487 KOPrefs::instance()->mWorkingHoursColor);
1488 }
1489 }
1490 ++gxStart;
1491 }
1492 }
1487 } 1493 }
1488 ++gxStart; 1494 /*
1495 int selectionX = KOGlobals::self()->reverseLayout() ?
1496 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1497 mSelectionCellX * mGridSpacingX;
1498
1499 // Draw selection
1500 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1501 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1502 // TODO: paint only part within cx,cy,cw,ch
1503 p->fillRect( selectionX, mSelectionYTop, mGridSpacingX,
1504 mSelectionHeight, KOPrefs::instance()->mHighlightColor );
1489 } 1505 }
1490 } 1506 */
1491 } 1507 // Draw vertical lines of grid
1492 /*
1493 int selectionX = KOGlobals::self()->reverseLayout() ?
1494 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1495 mSelectionCellX * mGridSpacingX;
1496
1497 // Draw selection
1498 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1499 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1500 // TODO: paint only part within cx,cy,cw,ch
1501 p->fillRect( selectionX, mSelectionYTop, mGridSpacingX,
1502 mSelectionHeight, KOPrefs::instance()->mHighlightColor );
1503 }
1504 */
1505 // Draw vertical lines of grid
1506 1508
1507 int x = ((int)(cx/mGridSpacingX))*mGridSpacingX; 1509 int x = ((int)(cx/mGridSpacingX))*mGridSpacingX;
1508 if ( mGridSpacingX > 0 ) { 1510 if ( mGridSpacingX > 0 ) {
1509 while (x < cx + cw) { 1511 while (x < cx + cw) {
1510 p->drawLine(x,cy,x,cy+ch); 1512 p->drawLine(x,cy,x,cy+ch);
1511 x+=mGridSpacingX; 1513 x+=mGridSpacingX;
1512 } 1514 }
1513 } 1515 }
1514 // Draw horizontal lines of grid 1516 // Draw horizontal lines of grid
1515 int y = ((int)(cy/lGridSpacingY))*lGridSpacingY; 1517 int y = ((int)(cy/lGridSpacingY))*lGridSpacingY;
1516 if ( lGridSpacingY > 0 ) { 1518 if ( lGridSpacingY > 0 ) {
1517 while (y < cy + ch) { 1519 while (y < cy + ch) {
1518 p->setPen( SolidLine ); 1520 p->setPen( SolidLine );
1519 p->drawLine(cx,y,cx+cw,y); 1521 p->drawLine(cx,y,cx+cw,y);
1520 y+=lGridSpacingY; 1522 y+=lGridSpacingY;
1521 p->setPen( DotLine ); 1523 p->setPen( DotLine );
1522 p->drawLine(cx,y,cx+cw,y); 1524 p->drawLine(cx,y,cx+cw,y);
1523 y+=lGridSpacingY; 1525 y+=lGridSpacingY;
1524 } 1526 }
1525 p->setPen( SolidLine ); 1527 p->setPen( SolidLine );
1526 } 1528 }
1527 mPixPainter.end() ; 1529 mPixPainter.end() ;
1528} 1530}
1529 1531
1530/* 1532/*
1531 Convert srcollview contents coordinates to agenda grid coordinates. 1533 Convert srcollview contents coordinates to agenda grid coordinates.
1532*/ 1534*/
1533void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy) 1535void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy)
1534{ 1536{
1535 gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX : 1537 gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX :
1536 x/mGridSpacingX; 1538 x/mGridSpacingX;
1537 gy = y/mGridSpacingY; 1539 gy = y/mGridSpacingY;
1538} 1540}
1539 1541
1540/* 1542/*
1541 Convert agenda grid coordinates to scrollview contents coordinates. 1543 Convert agenda grid coordinates to scrollview contents coordinates.
1542*/ 1544*/
1543void KOAgenda::gridToContents (int gx, int gy, int& x, int& y) 1545void KOAgenda::gridToContents (int gx, int gy, int& x, int& y)
1544{ 1546{
1545 x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX: 1547 x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX:
1546 gx*mGridSpacingX; 1548 gx*mGridSpacingX;
1547 y = gy*mGridSpacingY; 1549 y = gy*mGridSpacingY;
1548} 1550}
1549 1551
1550 1552
1551/* 1553/*
1552 Return Y coordinate corresponding to time. Coordinates are rounded to fit into 1554 Return Y coordinate corresponding to time. Coordinates are rounded to fit into
1553 the grid. 1555 the grid.
1554*/ 1556*/
1555int KOAgenda::timeToY(const QTime &time) 1557int KOAgenda::timeToY(const QTime &time)
1556{ 1558{
1557 int minutesPerCell = 24 * 60 / mRows; 1559 int minutesPerCell = 24 * 60 / mRows;
1558 int timeMinutes = time.hour() * 60 + time.minute(); 1560 int timeMinutes = time.hour() * 60 + time.minute();
1559 int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell; 1561 int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell;
1560 return Y; 1562 return Y;
1561} 1563}
1562 1564
1563 1565
1564/* 1566/*
1565 Return time corresponding to cell y coordinate. Coordinates are rounded to 1567 Return time corresponding to cell y coordinate. Coordinates are rounded to
1566 fit into the grid. 1568 fit into the grid.
1567*/ 1569*/
1568QTime KOAgenda::gyToTime(int gy) 1570QTime KOAgenda::gyToTime(int gy)
1569{ 1571{
1570 1572
1571 int secondsPerCell = 24 * 60 * 60/ mRows; 1573 int secondsPerCell = 24 * 60 * 60/ mRows;
1572 1574
1573 int timeSeconds = secondsPerCell * gy; 1575 int timeSeconds = secondsPerCell * gy;
1574 1576
1575 QTime time( 0, 0, 0 ); 1577 QTime time( 0, 0, 0 );
@@ -1631,105 +1633,104 @@ KOAgendaItem * KOAgenda::getItemForTodo ( Todo * todo )
1631 return item; 1633 return item;
1632 } 1634 }
1633 } 1635 }
1634 return 0; 1636 return 0;
1635} 1637}
1636 1638
1637 1639
1638void KOAgenda::updateTodo( Todo * todo, int days, bool remove) 1640void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
1639{ 1641{
1640 // ( todo->hasCompletedDate() && todo->completed().date() == currentDate )|| 1642 // ( todo->hasCompletedDate() && todo->completed().date() == currentDate )||
1641 KOAgendaItem *item; 1643 KOAgendaItem *item;
1642 item = getItemForTodo ( todo ); 1644 item = getItemForTodo ( todo );
1643 //qDebug("KOAgenda::updateTodo %d %d %d %d", this, todo, days, remove); 1645 //qDebug("KOAgenda::updateTodo %d %d %d %d", this, todo, days, remove);
1644 if ( item ) { 1646 if ( item ) {
1645 blockSignals( true ); 1647 blockSignals( true );
1646 //qDebug("item found "); 1648 //qDebug("item found ");
1647 item->hide(); 1649 item->hide();
1648 item->setCellX(-2, -1 ); 1650 item->setCellX(-2, -1 );
1649 item->select(false); 1651 item->select(false);
1650 mUnusedItems.append( item ); 1652 mUnusedItems.append( item );
1651 mItems.remove( item ); 1653 mItems.remove( item );
1652 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); 1654 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
1653 KOAgendaItem *itemit; 1655 KOAgendaItem *itemit;
1654 //globalFlagBlockAgendaItemPaint = 1; 1656 //globalFlagBlockAgendaItemPaint = 1;
1655 for ( itemit=oldconflictItems.first(); itemit != 0; 1657 for ( itemit=oldconflictItems.first(); itemit != 0;
1656 itemit=oldconflictItems.next() ) { 1658 itemit=oldconflictItems.next() ) {
1657 if ( itemit != item ) 1659 if ( itemit != item )
1658 placeSubCells(itemit); 1660 placeSubCells(itemit);
1659 } 1661 }
1660 qApp->processEvents(); 1662 qApp->processEvents();
1661 //globalFlagBlockAgendaItemPaint = 0; 1663 //globalFlagBlockAgendaItemPaint = 0;
1662 for ( itemit=oldconflictItems.first(); itemit != 0; 1664 for ( itemit=oldconflictItems.first(); itemit != 0;
1663 itemit=oldconflictItems.next() ) { 1665 itemit=oldconflictItems.next() ) {
1664 globalFlagBlockAgendaItemUpdate = 0; 1666 globalFlagBlockAgendaItemUpdate = 0;
1665 if ( itemit != item ) 1667 if ( itemit != item )
1666 itemit->repaintMe(); 1668 itemit->repaintMe();
1667 globalFlagBlockAgendaItemUpdate = 1; 1669 globalFlagBlockAgendaItemUpdate = 1;
1668 itemit->repaint(); 1670 itemit->repaint();
1669 } 1671 }
1670 blockSignals( false ); 1672 blockSignals( false );
1671 } 1673 }
1672 if ( remove ) { 1674 if ( remove ) {
1673 //qDebug("remove****************************************** "); 1675 //qDebug("remove****************************************** ");
1674 return; 1676 return;
1675 } 1677 }
1676 if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) 1678 if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
1677 return; 1679 return;
1678 //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ "); 1680 //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
1679 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < QDate::currentDate())&& ( KOPrefs::instance()->mShowTodoInAgenda ); 1681 QDate currentDate = QDate::currentDate();
1680 QDate currentDate; 1682 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&& ( KOPrefs::instance()->mShowTodoInAgenda );
1681 QDateTime dt; 1683 QDateTime dt;
1682 if ( todo->hasCompletedDate() ) 1684 if ( todo->hasCompletedDate() )
1683 dt = todo->completed(); 1685 dt = todo->completed();
1684 else 1686 else
1685 dt = todo->dtDue(); 1687 dt = todo->dtDue();
1686 if ( overdue ) { 1688 if ( overdue ) {
1687 currentDate = QDate::currentDate();
1688 days += todo->dtDue().date().daysTo( currentDate ); 1689 days += todo->dtDue().date().daysTo( currentDate );
1689 } 1690 }
1690 else 1691 else
1691 currentDate = dt.date(); 1692 currentDate = dt.date();
1692 1693
1693 if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) { 1694 if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) {
1694 if ( ! mAllDayMode ) return; 1695 if ( ! mAllDayMode ) return;
1695 // aldayagenda 1696 // aldayagenda
1696 globalFlagBlockAgendaItemPaint = 1; 1697 globalFlagBlockAgendaItemPaint = 1;
1697 item = insertAllDayItem(todo, currentDate,days, days); 1698 item = insertAllDayItem(todo, currentDate,days, days);
1698 item->show(); 1699 item->show();
1699 1700
1700 } 1701 }
1701 else { 1702 else {
1702 if ( mAllDayMode ) return; 1703 if ( mAllDayMode ) return;
1703 // mAgenda 1704 // mAgenda
1704 globalFlagBlockAgendaItemPaint = 1; 1705 globalFlagBlockAgendaItemPaint = 1;
1705 int endY = timeToY(dt.time()) - 1; 1706 int endY = timeToY(dt.time()) - 1;
1706 int hi = 12/KOPrefs::instance()->mHourSize; 1707 int hi = 12/KOPrefs::instance()->mHourSize;
1707 int startY = endY - 1-hi; 1708 int startY = endY - 1-hi;
1708 item = insertItem(todo,currentDate,days,startY,endY); 1709 item = insertItem(todo,currentDate,days,startY,endY);
1709 item->show(); 1710 item->show();
1710 } 1711 }
1711 qApp->processEvents(); 1712 qApp->processEvents();
1712 globalFlagBlockAgendaItemPaint = 0; 1713 globalFlagBlockAgendaItemPaint = 0;
1713 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); 1714 QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
1714 KOAgendaItem *itemit; 1715 KOAgendaItem *itemit;
1715 for ( itemit=oldconflictItems.first(); itemit != 0; 1716 for ( itemit=oldconflictItems.first(); itemit != 0;
1716 itemit=oldconflictItems.next() ) { 1717 itemit=oldconflictItems.next() ) {
1717 globalFlagBlockAgendaItemUpdate = 0; 1718 globalFlagBlockAgendaItemUpdate = 0;
1718 itemit->repaintMe(); 1719 itemit->repaintMe();
1719 globalFlagBlockAgendaItemUpdate = 1; 1720 globalFlagBlockAgendaItemUpdate = 1;
1720 itemit->repaint(); 1721 itemit->repaint();
1721 } 1722 }
1722 globalFlagBlockAgendaItemUpdate = 0; 1723 globalFlagBlockAgendaItemUpdate = 0;
1723 item->repaintMe(); 1724 item->repaintMe();
1724 globalFlagBlockAgendaItemUpdate = 1; 1725 globalFlagBlockAgendaItemUpdate = 1;
1725 item->repaint(); 1726 item->repaint();
1726} 1727}
1727/* 1728/*
1728 Insert KOAgendaItem into agenda. 1729 Insert KOAgendaItem into agenda.
1729*/ 1730*/
1730KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom) 1731KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom)
1731{ 1732{
1732 if (mAllDayMode) { 1733 if (mAllDayMode) {
1733 qDebug("KOAgenda: calling insertItem in all-day mode is illegal. "); 1734 qDebug("KOAgenda: calling insertItem in all-day mode is illegal. ");
1734 return 0; 1735 return 0;
1735 } 1736 }