todo tt

1 files changed, 41 insertions, 21 deletions

diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 6559119..66f8d06 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -19,8 +19,9 @@
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <qapp.h>
+#include <kglobal.h>
 
 #include <kiconloader.h>
 #include "kotodoviewitem.h"
 #include "kotodoview.h"
@@ -119,26 +120,37 @@ void KOTodoViewItem::construct()
   else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
 
 
 
-  if (mTodo->hasStartDate()) {
-    setText(5, mTodo->dtStartDateStr());
-    QDate d = mTodo->dtStart().date();
-    skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
-    
-    if (mTodo->doesFloat()) {
-      setText(6,"");
-    }
-    else {
-      setText(6,mTodo->dtStartTimeStr());
-      QTime t = mTodo->dtStart().time();
+  keyd = "";
+  keyt = "";
+
+  if (mTodo->isRunning() ) {
+      QDate d = mTodo->runStart().date();
+      QTime t = mTodo->runStart().time();
       skeyt.sprintf("%02d%02d",t.hour(),t.minute());
-      
-    }
+      skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
+      keyd = KGlobal::locale()->formatDate( d );
+      keyt = KGlobal::locale()->formatTime( t );
+
   } else {
-    setText(5,"");
-    setText(6,"");
+
+      if (mTodo->hasStartDate()) {
+          keyd = mTodo->dtStartDateStr();
+          QDate d = mTodo->dtStart().date();
+          skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
+    
+          if ( !mTodo->doesFloat()) {
+              keyt = mTodo->dtStartTimeStr();
+              QTime t = mTodo->dtStart().time();
+              skeyt.sprintf("%02d%02d",t.hour(),t.minute());
+      
+          }
+      
+      }
   }
+  setText(5,keyd);
+  setText(6,keyt);
   setSortKey(5,skeyd);
   setSortKey(6,skeyt);
 
   setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
@@ -367,15 +379,23 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
    bool openMode = !isOpen();
    // maybe we are in flat-display-mode
    if ( !firstChild() )
        openMode = false;
-   int odue = mTodo->hasDueSubTodo( openMode );
-   if (odue == 2) {
-       colorToSet = KOPrefs::instance()->mTodoOverdueColor;
-       setColor = true;
-   } else if ( odue == 1 ) {
-       colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
+   bool colorRunning = mTodo->isRunning();
+   if ( ! colorRunning && openMode )
+       colorRunning = mTodo->hasRunningSub();
+   if ( colorRunning ) {
        setColor = true;
+       colorToSet = KOPrefs::instance()->mTodoRunColor;     
+   } else {
+       int odue = mTodo->hasDueSubTodo( openMode );
+       if (odue == 2) {
+           colorToSet = KOPrefs::instance()->mTodoOverdueColor;
+           setColor = true;
+       } else if ( odue == 1 ) {
+           colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
+           setColor = true;
+       }
    }
  
 
   if ( setColor ) {