-rw-r--r-- | korganizer/komonthview.cpp | 2 | ||||
-rw-r--r-- | korganizer/kotodoviewitem.cpp | 18 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 9 |
3 files changed, 17 insertions, 12 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 31c5659..cb519b2 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1202,7 +1202,7 @@ void KOMonthView::updateView() | |||
1202 | break; | 1202 | break; |
1203 | invalid = true; | 1203 | invalid = true; |
1204 | //qDebug("invalid %s", event->summary().latin1()); | 1204 | //qDebug("invalid %s", event->summary().latin1()); |
1205 | incidenceStart = QDateTime( mStartDate ); | 1205 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; |
1206 | } | 1206 | } |
1207 | if ( last ) | 1207 | if ( last ) |
1208 | break; | 1208 | break; |
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 6bdee18..78d4027 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -329,20 +329,16 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i | |||
329 | } else | 329 | } else |
330 | setColor = false; | 330 | setColor = false; |
331 | } | 331 | } |
332 | if (mTodo->hasDueDate()) { | 332 | |
333 | if (mTodo->dtDue().date()==QDate::currentDate() && | 333 | int odue = mTodo->hasDueSubTodo( !isOpen()); |
334 | !mTodo->isCompleted()) { | 334 | if (odue == 2) { |
335 | //_cg.setColor( role , KOPrefs::instance()->mTodoDueTodayColor); | ||
336 | colorToSet = KOPrefs::instance()->mTodoDueTodayColor; | ||
337 | setColor = true; | ||
338 | } | ||
339 | if (mTodo->dtDue().date() < QDate::currentDate() && | ||
340 | !mTodo->isCompleted()) { | ||
341 | //_cg.setColor( role, KOPrefs::instance()->mTodoOverdueColor); | ||
342 | colorToSet = KOPrefs::instance()->mTodoOverdueColor; | 335 | colorToSet = KOPrefs::instance()->mTodoOverdueColor; |
343 | setColor = true; | 336 | setColor = true; |
337 | } else if ( odue == 1 ) { | ||
338 | colorToSet = KOPrefs::instance()->mTodoDueTodayColor; | ||
339 | setColor = true; | ||
344 | } | 340 | } |
345 | } | 341 | |
346 | 342 | ||
347 | if ( setColor ) { | 343 | if ( setColor ) { |
348 | _cg.setColor(role,colorToSet ); | 344 | _cg.setColor(role,colorToSet ); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index a2c20a8..5bc8c00 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1346,6 +1346,15 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1346 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) | 1346 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) |
1347 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ | 1347 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ |
1348 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); | 1348 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); |
1349 | if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") ) ) { | ||
1350 | bool ok; | ||
1351 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); | ||
1352 | if ( ok ) { | ||
1353 | int years = noc.date().year() - incidence->dtStart().date().year(); | ||
1354 | startString += i18n(" (%1 y.)"). arg( years ); | ||
1355 | } | ||
1356 | } | ||
1357 | else | ||
1349 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); | 1358 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); |
1350 | } | 1359 | } |
1351 | 1360 | ||