todo tt

6 files changed, 86 insertions, 29 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5879a2d..e8c7c76 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -59,19 +59,15 @@ KOPrefs::KOPrefs() :
   QColor defaultHolidayColor      = QColor(255,0,0);
   QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
   QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
   QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
   QColor defaultTodoDueTodayColor = QColor(255,220,100);
   QColor defaultTodoOverdueColor  = QColor(255,153,125);
-
- 
+  QColor defaultTodoRunColor  = QColor(99,194,30);
   KPrefs::setCurrentGroup("General");
-
-
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
-
   addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
   addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
   addItemBool("ShowIconSearch",&mShowIconSearch,true);
   addItemBool("ShowIconList",&mShowIconList,true);
   addItemBool("ShowIconDay1",&mShowIconDay1,true);
   addItemBool("ShowIconDay5",&mShowIconDay5,true);
@@ -214,12 +210,13 @@ KOPrefs::KOPrefs() :
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
+  addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("MonthViewWeek",&mMonthViewWeek,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index cf8dae6..d511faa 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -136,12 +136,13 @@ class KOPrefs : public KPimPrefs
     QColor  mEventColor;
     QColor  mTodoDoneColor;
     QColor  mAgendaBgColor;
     QColor  mWorkingHoursColor;
     QColor  mTodoDueTodayColor;
     QColor  mTodoOverdueColor;
+    QColor  mTodoRunColor;
     QColor  mMonthViewEvenColor;
     QColor  mMonthViewOddColor;
     QColor  mMonthViewHolidayColor;
     bool mMonthViewUsesDayColors;
     bool mMonthViewSatSunTog;
     bool mMonthViewWeek;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 0bbb3bf..a8943de 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -892,18 +892,28 @@ dummy =
  dummy =
     addWidBool(i18n("Todo view uses category colors"),
                &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
-  QWidget* wid = new QWidget( topFrame );
+ QWidget* wid = new QWidget( topFrame );
+  // Todo run today color
+  KPrefsDialogWidColor *todoRunColor =
+      addWidColor(i18n("Color for running todos:"),
+                  &(KOPrefs::instance()->mTodoRunColor),wid);
+  QHBoxLayout *widLayout = new QHBoxLayout(wid);
+  widLayout->addWidget( todoRunColor->label() );
+  widLayout->addWidget( todoRunColor->button() );
+  topLayout->addWidget(wid,ii++,0);
+
+  wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
-  QHBoxLayout *widLayout = new QHBoxLayout(wid);
+  widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 935a5f5..7ee1eef 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -478,12 +478,14 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mItemPopupMenu->insertItem( i18n("Beam..."), this,
                              SLOT (beamTodo()));
   mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                              SLOT (cancelTodo()));
   mItemPopupMenu->insertSeparator();
 
+  mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
+                             SLOT (toggleRunningItem()));
   mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                              SLOT (newTodo()));
   mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                              SLOT (newSubTodo())); 
   mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
                              SLOT (unparentTodo()),0,21);
@@ -1096,23 +1098,49 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
     //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
-        if ( row == 1 || row == 2 ) {
+        if ( row == 2 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
         }
+        if ( row == 1 ) {
+            mActiveItem = (KOTodoViewItem *) item;
+            toggleRunningItem();
+            return;
+        }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
+void KOTodoView::toggleRunningItem()
+{
+    qDebug("KOTodoView::toggleRunning() ");
+    if ( ! mActiveItem )
+        return;
+    Todo * t = mActiveItem->todo();
+    if ( t->isRunning() ) {
+        int result = KMessageBox::warningContinueCancel(this,
+                                                        i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 20 ) ),i18n("Todo is started"),i18n("Stop todo"),i18n("Cancel"), true);
+        if (result != KMessageBox::Continue) return;
+        t->setRunning( false );
+        mActiveItem->construct();
+    } else {
+        int result = KMessageBox::warningContinueCancel(this,
+                                                        i18n("The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?").arg(mActiveItem->text(0).left( 20 ) ),i18n("Todo is stopped"),i18n("Start todo"),i18n("Cancel"), true);
+        if (result != KMessageBox::Continue) return;
+        t->setRunning( true );
+        mActiveItem->construct();
+    }
+}
+
 void KOTodoView::itemClicked(QListViewItem *item)
 {
     //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d0788a9..d368513 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -203,12 +203,13 @@ class KOTodoView : public KOrg::BaseView
     void cancelTodoSignal( Incidence * );
     void moveTodoSignal( Incidence * );
     void beamTodoSignal( Incidence * );
     void purgeCompletedSignal();
 
   protected slots:
+    void toggleRunningItem();
     void paintNeeded();
     void processSelectionChange();
     void addQuickTodo();
     void setTodoModified( Todo* );
     void todoModified(Todo *, int );
 
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 6559119..66f8d06 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -17,12 +17,13 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <qapp.h>
+#include <kglobal.h>
 
 #include <kiconloader.h>
 #include "kotodoviewitem.h"
 #include "kotodoview.h"
 #include "koprefs.h"
 
@@ -117,30 +118,41 @@ void KOTodoViewItem::construct()
 
   if (mTodo->isCompleted()) setSortKey(1,"6" + QString::number(mTodo->priority())+keyd+keyt);
   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"));
   setText(8,mTodo->categoriesStr());
 
@@ -365,19 +377,27 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
           setColor = false;  
    }
    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 ) {
       _cg.setColor(role,colorToSet );
       if ( role == QColorGroup::Base) {