3 files changed, 18 insertions, 3 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 99e6a3a..c5fae17 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -79,29 +79,36 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     lay->addWidget( cancel );
     connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
     connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
     ok = new QPushButton( i18n("Stop - do not save"), this );
     connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() )  );
     lay->addWidget( ok );
     resize( 200, 200 );
 }
        
 void KOStopTodoPrefs::accept()
 {
     qDebug("KOStopTodoPrefs::accept() ");
+
+
+#if 0
+    t->setRunningFalse( comment );
+    
+    t->setRunning( false );
+#endif   
+
     QDialog::accept();
 }
 void KOStopTodoPrefs::doNotSave() 
 {
-
     int result = KMessageBox::warningContinueCancel(this,
                                                     i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary() );
     if (result != KMessageBox::Continue) return;
     mTodo->stopRunning();
     QDialog::accept();
 }
 
 
 class KOTodoViewWhatsThis :public QWhatsThis
 {
 public:
   KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index d062492..62b74f1 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -86,50 +86,56 @@ void Todo::setRunning( bool run )
         mRunSaveTimer = new QTimer ( this );
         connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) );
     }
     mRunning = run;
     if ( mRunning ) {
         mRunSaveTimer->start( 1000  * 60 * 5 ); // 5 min
         mRunStart = QDateTime::currentDateTime();
     } else {
         mRunSaveTimer->stop();
         saveRunningInfoToFile();
     }
 }
-
+void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end )
+{
+    mRunStart = start;
+    mRunEnd = end;
+    saveRunningInfoToFile( comment );
+}
 void Todo::saveRunningInfoToFile()
 {
+    mRunEnd = QDateTime::currentDateTime();
     saveRunningInfoToFile( QString::null );
 }
 void Todo::saveRunningInfoToFile( QString comment )
 {
     //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
     if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10   ) {
         qDebug("Running time < 30 seconds. Skipped. ");
         return;
     }
     QString dir = KGlobalSettings::timeTrackerDir();
     //qDebug("%s ", dir.latin1());
     QString file = "%1%2%3-%4%5%6-";
     file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2  ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 );
     file.replace ( QRegExp (" "), "0" ); 
     file += uid();
     //qDebug("File %s ",file.latin1() );
     CalendarLocal cal;
     cal.setLocalTime();
     Todo  * to = (Todo*) clone();
     to->setFloats( false );
     to->setDtStart( mRunStart );
     to->setHasStartDate( true );
-    to->setDtDue( QDateTime::currentDateTime() );
+    to->setDtDue( mRunEnd );
     to->setHasDueDate( true );
     to->setUid( file );
     if ( !comment.isEmpty() ) {
         QString des = to->description();
         if ( des.isEmpty () )
             to->setDescription( "TT-Note: " + comment );
         else
             to->setDescription( "TT-Note: " + comment +"\n" +  des );
     }
     cal.addIncidence( to );
     ICalFormat format;
     file = dir +"/" +file +".ics";
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 42db025..11f848e 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -33,24 +33,25 @@ namespace KCal {
   This class provides a Todo in the sense of RFC2445.
 */
     class Todo : public QObject,public Incidence
 {
  Q_OBJECT
   public:
     Todo();
     Todo(const Todo &);
     ~Todo();
     typedef ListBase<Todo> List;
     QCString type() const { return "Todo"; }
     IncTypeID typeID() const { return todoID; }
+    void saveRunningInfo( QString comment, QDateTime start, QDateTime end );
 
     /** Return an exact copy of this todo. */
     Incidence *clone();
     QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const;
 
     /** for setting the todo's due date/time with a QDateTime. */
     void setDtDue(const QDateTime &dtDue);
     /** returns an event's Due date/time as a QDateTime. */
     QDateTime dtDue() const;
     /** returns an event's due time as a string formatted according to the
      users locale settings */
     QString dtDueTimeStr() const;
@@ -124,24 +125,25 @@ namespace KCal {
     void setRunningFalse( QString );
     void stopRunning();
     int runTime();
     QDateTime runStart () const { return mRunStart;}
     public slots:
     void saveRunningInfoToFile( QString st );
     void saveRunningInfoToFile( );
     void saveParents();
   private:
     bool mRunning;
     QTimer * mRunSaveTimer;
     QDateTime mRunStart;
+    QDateTime mRunEnd;
     bool accept(Visitor &v) { return v.visit(this); }
 
     QDateTime mDtDue;                     // due date of todo
 
     bool mHasDueDate;                    // if todo has associated due date
 
 //    int  mStatus;                         // confirmed/delegated/tentative/etc
 
     QDateTime mCompleted;
     bool mHasCompletedDate;
 
     int mPercentComplete;