From 160b471e4d254fd45dbbd161178de15a14163a0c Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 17 Jun 2005 09:29:18 +0000
Subject: fixxx

---
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index c5fae17..13e88ef 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -36,6 +36,8 @@
 #include "koprefs.h"
 #include <klocale.h>
 #include <kglobal.h>
+#include <kdateedit.h>
+#include "ktimeedit.h"
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
@@ -72,7 +74,26 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     QLabel * lab = new QLabel( i18n("%1\nis running!").arg( todo->summary() ), this );
     lay->addWidget( lab ); 
     lab->setAlignment( AlignHCenter );
-       
+    lab = new QLabel( i18n("Additional Comment:"), this );
+    lay->addWidget( lab ); 
+    mComment = new QLineEdit( this );
+    lay->addWidget( mComment );
+    QHBox * start = new QHBox ( this );
+    lay->addWidget( start ); 
+    lab = new QLabel( i18n("Start:"), start );
+    QHBox * end = new QHBox ( this );
+    lay->addWidget( end ); 
+    lab = new QLabel( i18n("End:"), end );
+    sde = new KDateEdit( start );
+    ste = new KOTimeEdit( start );
+    connect ( sde,SIGNAL(setTimeTo( QTime ) ),ste , SLOT ( setTime(QTime  ) )  );
+    ede = new KDateEdit( end );
+    ete = new KOTimeEdit(end );
+    connect ( ede,SIGNAL(setTimeTo( QTime ) ),ete , SLOT ( setTime(QTime  ) )  );
+    sde->setDate( mTodo->runStart().date() );
+    ste->setTime( mTodo->runStart().time() );
+    ede->setDate( QDate::currentDate());
+    ete->setTime( QTime::currentTime() );
     QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
     lay->addWidget( ok );
     QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
@@ -82,20 +103,24 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     ok = new QPushButton( i18n("Stop - do not save"), this );
     connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() )  );
     lay->addWidget( ok );
-    resize( 200, 200 );
+    if (QApplication::desktop()->width() < 320 )
+        resize( 240, 200 );
+    else
+        resize( 320, 200 );
+        
 }
        
 void KOStopTodoPrefs::accept()
 {
-    qDebug("KOStopTodoPrefs::accept() ");
-
-
-#if 0
-    t->setRunningFalse( comment );
-    
-    t->setRunning( false );
-#endif   
-
+    QDateTime start = QDateTime( sde->date(), ste->getTime() );
+    QDateTime stop = QDateTime( ede->date(), ete->getTime() );
+    if ( start > stop ) {
+        KMessageBox::sorry(this,
+                           i18n("The start time is\nafter the end time!"),
+                           i18n("Time mismatch!"));
+        return;
+    }
+    mTodo->saveRunningInfo( mComment->text(), start, stop );
     QDialog::accept();
 }
 void KOStopTodoPrefs::doNotSave() 
@@ -1199,7 +1224,7 @@ void KOTodoView::toggleRunningItem()
 #endif
     } 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( 25 ) ),i18n("Todo is stopped"),i18n("Start todo"),i18n("Cancel"), true);
+                                                        i18n("<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>").arg(mActiveItem->text(0).left( 25 ) ),i18n("Start todo"),i18n("Start todo"),i18n("Cancel"), true);
         if (result != KMessageBox::Continue) return;
         t->setRunning( true );
         mActiveItem->construct();
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index ceabdba..8f0c99e 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -52,6 +52,8 @@ class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 class KOTodoViewWhatsThis;
+class KDateEdit;
+class KOTimeEdit;
 
 class DocPrefs;
 
@@ -68,6 +70,9 @@ private slots:
     void accept();
 private:
     Todo* mTodo;
+    QLineEdit* mComment;
+    KDateEdit *sde, *ede;
+    KOTimeEdit *ste, *ete;
 
 };
 
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 62b74f1..9a8b6e4 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -97,6 +97,8 @@ void Todo::setRunning( bool run )
 }
 void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end )
 {
+    if ( !mRunning) return;
+    mRunning = false;
     mRunStart = start;
     mRunEnd = end;
     saveRunningInfoToFile( comment );
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 11f848e..425dfad 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -42,7 +42,6 @@ namespace KCal {
     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();
@@ -126,6 +125,7 @@ namespace KCal {
     void stopRunning();
     int runTime();
     QDateTime runStart () const { return mRunStart;}
+    void saveRunningInfo( QString comment, QDateTime start, QDateTime end );
     public slots:
     void saveRunningInfoToFile( QString st );
     void saveRunningInfoToFile( );
--
cgit v0.9.0.2