summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-04 21:23:46 (UTC)
committer zautrix <zautrix>2005-07-04 21:23:46 (UTC)
commit35f1ad23e06a0f6014d98c952e8b8652b5cffc49 (patch) (unidiff)
tree4c3b222a9d2baff7b43c366bb0bfa1fab24a5177
parent2767ffda27fa0e88816832d4b2c6efdd0c52a8eb (diff)
downloadkdepimpi-35f1ad23e06a0f6014d98c952e8b8652b5cffc49.zip
kdepimpi-35f1ad23e06a0f6014d98c952e8b8652b5cffc49.tar.gz
kdepimpi-35f1ad23e06a0f6014d98c952e8b8652b5cffc49.tar.bz2
highlight pix smaller
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagenda.cpp13
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
@@ -1414,10 +1414,11 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i
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;
@@ -1445,6 +1446,7 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i
1445 } 1446 }
1446 } 1447 }
1447 } 1448 }
1449 }
1448 // Highlight working hours 1450 // Highlight working hours
1449 1451
1450 if ( !backgroundOnly ) 1452 if ( !backgroundOnly )
@@ -1473,7 +1475,7 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i
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());
@@ -1676,15 +1678,14 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
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