Diffstat (limited to 'korganizer/kotodoviewitem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kotodoviewitem.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 6bdee18..78d4027 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -307,63 +307,59 @@ bool KOTodoViewItem::isAlternate() | |||
307 | return false; | 307 | return false; |
308 | #endif | 308 | #endif |
309 | } | 309 | } |
310 | 310 | ||
311 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) | 311 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) |
312 | { | 312 | { |
313 | QColorGroup _cg = cg; | 313 | QColorGroup _cg = cg; |
314 | QColorGroup::ColorRole role; | 314 | QColorGroup::ColorRole role; |
315 | if ( KOPrefs::instance()->mTodoViewUsesForegroundColor ) | 315 | if ( KOPrefs::instance()->mTodoViewUsesForegroundColor ) |
316 | role = QColorGroup::Text; | 316 | role = QColorGroup::Text; |
317 | else | 317 | else |
318 | role = QColorGroup::Base; | 318 | role = QColorGroup::Base; |
319 | //#ifndef KORG_NOLVALTERNATION | 319 | //#ifndef KORG_NOLVALTERNATION |
320 | // if (isAlternate()) | 320 | // if (isAlternate()) |
321 | // _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); | 321 | // _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); |
322 | bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; | 322 | bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; |
323 | QColor colorToSet; | 323 | QColor colorToSet; |
324 | if ( setColor ) { | 324 | if ( setColor ) { |
325 | QStringList categories = mTodo->categories(); | 325 | QStringList categories = mTodo->categories(); |
326 | QString cat = categories.first(); | 326 | QString cat = categories.first(); |
327 | if ( !cat.isEmpty()) { | 327 | if ( !cat.isEmpty()) { |
328 | colorToSet = *(KOPrefs::instance()->categoryColor(cat) ); | 328 | colorToSet = *(KOPrefs::instance()->categoryColor(cat) ); |
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); | 335 | colorToSet = KOPrefs::instance()->mTodoOverdueColor; |
336 | colorToSet = KOPrefs::instance()->mTodoDueTodayColor; | 336 | setColor = true; |
337 | setColor = true; | 337 | } else if ( odue == 1 ) { |
338 | } | 338 | colorToSet = KOPrefs::instance()->mTodoDueTodayColor; |
339 | if (mTodo->dtDue().date() < QDate::currentDate() && | 339 | setColor = true; |
340 | !mTodo->isCompleted()) { | 340 | } |
341 | //_cg.setColor( role, KOPrefs::instance()->mTodoOverdueColor); | 341 | |
342 | colorToSet = KOPrefs::instance()->mTodoOverdueColor; | ||
343 | setColor = true; | ||
344 | } | ||
345 | } | ||
346 | 342 | ||
347 | if ( setColor ) { | 343 | if ( setColor ) { |
348 | _cg.setColor(role,colorToSet ); | 344 | _cg.setColor(role,colorToSet ); |
349 | if ( role == QColorGroup::Base) { | 345 | if ( role == QColorGroup::Base) { |
350 | int rgb = colorToSet.red(); | 346 | int rgb = colorToSet.red(); |
351 | rgb += colorToSet.blue()/2; | 347 | rgb += colorToSet.blue()/2; |
352 | rgb += colorToSet.green(); | 348 | rgb += colorToSet.green(); |
353 | if ( rgb < 200 ) | 349 | if ( rgb < 200 ) |
354 | _cg.setColor(QColorGroup::Text,Qt::white ); | 350 | _cg.setColor(QColorGroup::Text,Qt::white ); |
355 | } | 351 | } |
356 | } | 352 | } |
357 | //#endif | 353 | //#endif |
358 | if ( column > 0 ){ | 354 | if ( column > 0 ){ |
359 | if ( column == 2 && !KOPrefs::instance()->mTodoViewShowsPercentage ) { | 355 | if ( column == 2 && !KOPrefs::instance()->mTodoViewShowsPercentage ) { |
360 | p->save(); | 356 | p->save(); |
361 | int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5); | 357 | int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5); |
362 | 358 | ||
363 | p->fillRect( 0, 0, width, height(), _cg.base() ); // background | 359 | p->fillRect( 0, 0, width, height(), _cg.base() ); // background |
364 | // p->setPen(Qt::black ); //border | 360 | // p->setPen(Qt::black ); //border |
365 | // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() ); //filling | 361 | // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() ); //filling |
366 | QColor fc = KOPrefs::instance()->mHighlightColor; | 362 | QColor fc = KOPrefs::instance()->mHighlightColor; |
367 | if ( mTodo->percentComplete() == 100 ) | 363 | if ( mTodo->percentComplete() == 100 ) |
368 | fc = darkGreen; | 364 | fc = darkGreen; |
369 | p->drawRect( 2, 2, width-4, height()-4); | 365 | p->drawRect( 2, 2, width-4, height()-4); |