-rw-r--r-- | korganizer/koagenda.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 63fdecd..9b817bc 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -1405,28 +1405,29 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i | |||
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 | if ( !backgroundOnly ) { | ||
1418 | for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay) | 1419 | for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay) |
1419 | { | 1420 | { |
1420 | if ( mSelectedDates[selDay] == QDateTime::currentDateTime ().date() && KOPrefs::instance()->mHighlightCurrentDay) { | 1421 | if ( mSelectedDates[selDay] == curDate && KOPrefs::instance()->mHighlightCurrentDay) { |
1421 | int x1 = cx; | 1422 | int x1 = cx; |
1422 | int y1 = 0; | 1423 | int y1 = 0; |
1423 | if (y1 < cy) y1 = cy; | 1424 | if (y1 < cy) y1 = cy; |
1424 | int x2 = cx+cw-1; | 1425 | int x2 = cx+cw-1; |
1425 | int y2 = contentsHeight(); | 1426 | int y2 = contentsHeight(); |
1426 | if (y2 > cy+ch-1) y2=cy+ch-1; | 1427 | if (y2 > cy+ch-1) y2=cy+ch-1; |
1427 | if (x2 >= x1 && y2 >= y1) { | 1428 | if (x2 >= x1 && y2 >= y1) { |
1428 | int gxStart = selDay; | 1429 | int gxStart = selDay; |
1429 | int gxEnd = gxStart ; | 1430 | int gxEnd = gxStart ; |
1430 | int xStart = KOGlobals::self()->reverseLayout() ? | 1431 | int xStart = KOGlobals::self()->reverseLayout() ? |
1431 | (mColumns - 1 - gxStart)*mGridSpacingX : | 1432 | (mColumns - 1 - gxStart)*mGridSpacingX : |
1432 | gxStart*mGridSpacingX; | 1433 | gxStart*mGridSpacingX; |
@@ -1436,24 +1437,25 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i | |||
1436 | (gxStart+1)*mGridSpacingX-1; | 1437 | (gxStart+1)*mGridSpacingX-1; |
1437 | if (xEnd > x2) xEnd = x2; | 1438 | if (xEnd > x2) xEnd = x2; |
1438 | if ( KOPrefs::instance()->mUseHighlightLightColor ) | 1439 | if ( KOPrefs::instance()->mUseHighlightLightColor ) |
1439 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, | 1440 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, |
1440 | KOPrefs::instance()->mAgendaBgColor.light()); | 1441 | KOPrefs::instance()->mAgendaBgColor.light()); |
1441 | else | 1442 | else |
1442 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, | 1443 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, |
1443 | KOPrefs::instance()->mAgendaBgColor.dark()); | 1444 | KOPrefs::instance()->mAgendaBgColor.dark()); |
1444 | 1445 | ||
1445 | } | 1446 | } |
1446 | } | 1447 | } |
1447 | } | 1448 | } |
1449 | } | ||
1448 | // Highlight working hours | 1450 | // Highlight working hours |
1449 | 1451 | ||
1450 | if ( !backgroundOnly ) | 1452 | if ( !backgroundOnly ) |
1451 | if (mWorkingHoursEnable) { | 1453 | if (mWorkingHoursEnable) { |
1452 | int x1 = cx; | 1454 | int x1 = cx; |
1453 | int y1 = mWorkingHoursYTop; | 1455 | int y1 = mWorkingHoursYTop; |
1454 | if (y1 < cy) y1 = cy; | 1456 | if (y1 < cy) y1 = cy; |
1455 | int x2 = cx+cw-1; | 1457 | int x2 = cx+cw-1; |
1456 | // int x2 = mGridSpacingX * 5 - 1; | 1458 | // int x2 = mGridSpacingX * 5 - 1; |
1457 | // if (x2 > cx+cw-1) x2 = cx + cw - 1; | 1459 | // if (x2 > cx+cw-1) x2 = cx + cw - 1; |
1458 | int y2 = mWorkingHoursYBottom; | 1460 | int y2 = mWorkingHoursYBottom; |
1459 | if (y2 > cy+ch-1) y2=cy+ch-1; | 1461 | if (y2 > cy+ch-1) y2=cy+ch-1; |
@@ -1464,25 +1466,25 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i | |||
1464 | int gxEnd = x2/mGridSpacingX; | 1466 | int gxEnd = x2/mGridSpacingX; |
1465 | while(gxStart <= gxEnd) { | 1467 | while(gxStart <= gxEnd) { |
1466 | if (gxStart < int(mHolidayMask->count()) && | 1468 | if (gxStart < int(mHolidayMask->count()) && |
1467 | !mHolidayMask->at(gxStart)) { | 1469 | !mHolidayMask->at(gxStart)) { |
1468 | int xStart = KOGlobals::self()->reverseLayout() ? | 1470 | int xStart = KOGlobals::self()->reverseLayout() ? |
1469 | (mColumns - 1 - gxStart)*mGridSpacingX : | 1471 | (mColumns - 1 - gxStart)*mGridSpacingX : |
1470 | gxStart*mGridSpacingX; | 1472 | gxStart*mGridSpacingX; |
1471 | if (xStart < x1) xStart = x1; | 1473 | if (xStart < x1) xStart = x1; |
1472 | int xEnd = KOGlobals::self()->reverseLayout() ? | 1474 | int xEnd = KOGlobals::self()->reverseLayout() ? |
1473 | (mColumns - gxStart)*mGridSpacingX-1 : | 1475 | (mColumns - gxStart)*mGridSpacingX-1 : |
1474 | (gxStart+1)*mGridSpacingX-1; | 1476 | (gxStart+1)*mGridSpacingX-1; |
1475 | if (xEnd > x2) xEnd = x2; | 1477 | if (xEnd > x2) xEnd = x2; |
1476 | if ( mSelectedDates[gxStart] == QDateTime::currentDateTime ().date()&& KOPrefs::instance()->mHighlightCurrentDay ) { | 1478 | if ( mSelectedDates[gxStart] == curDate && KOPrefs::instance()->mHighlightCurrentDay ) { |
1477 | if ( KOPrefs::instance()->mUseHighlightLightColor ) | 1479 | if ( KOPrefs::instance()->mUseHighlightLightColor ) |
1478 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, | 1480 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, |
1479 | KOPrefs::instance()->mWorkingHoursColor.light()); | 1481 | KOPrefs::instance()->mWorkingHoursColor.light()); |
1480 | else | 1482 | else |
1481 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, | 1483 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, |
1482 | KOPrefs::instance()->mWorkingHoursColor.dark()); | 1484 | KOPrefs::instance()->mWorkingHoursColor.dark()); |
1483 | } else { | 1485 | } else { |
1484 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, | 1486 | p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, |
1485 | KOPrefs::instance()->mWorkingHoursColor); | 1487 | KOPrefs::instance()->mWorkingHoursColor); |
1486 | } | 1488 | } |
1487 | } | 1489 | } |
1488 | ++gxStart; | 1490 | ++gxStart; |
@@ -1667,33 +1669,32 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove) | |||
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 | ||