5 files changed, 81 insertions, 6 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index b2ff33b..99e6a3a 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1,92 +1,135 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qheader.h>
 #include <qcursor.h>
 #include <qwhatsthis.h>
+#include <qdialog.h>
+#include <qlabel.h>
+#include <qpushbutton.h>
 
 #include <qinputdialog.h>
 
 #include <qvbox.h>
 #include <kdebug.h>
 #include "koprefs.h"
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/calfilter.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 #include <libkcal/kincidenceformatter.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "docprefs.h"
 
 #include "kotodoview.h"
 using namespace KOrg;
 
 
+KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) :
+    QDialog( parent, name, true ) 
+{
+    mTodo = todo;
+    setCaption( i18n("Stop todo") );
+    QVBoxLayout* lay = new QVBoxLayout( this );
+    lay->setSpacing( 3 );
+    lay->setMargin( 3 );
+    QLabel * lab = new QLabel( i18n("%1\nis running!").arg( todo->summary() ), this );
+    lay->addWidget( lab ); 
+    lab->setAlignment( AlignHCenter );
+       
+    QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
+    lay->addWidget( ok );
+    QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
+    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() ");
+    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) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _view->getWhatsThisText(p) ;
   }
 private:
   QWidget* _wid;
   KOTodoView * _view;
 };
 
 KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
                                const char *name) :
   KListView(parent,name)
 {
   mName = QString ( name );
   mCalendar = calendar;
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
   mOldCurrent = 0;
   mMousePressed = false;
 
   setAcceptDrops(true);
   viewport()->setAcceptDrops(true);
   int size = 16;
   if (qApp->desktop()->width() < 300 )
       size = 12;
@@ -1098,79 +1141,84 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     }
     pendingSubtodo = 0;
     //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
     int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
     //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
         if ( row == 2 || row == 1 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
         }
         if ( row == 5 || row == 6 ) {
             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() ) {
-#if 0
-        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( 25 ) ),i18n("Todo is started"),i18n("Stop todo"),i18n("Cancel"), true);
-#endif
 
+
+        KOStopTodoPrefs tp ( t, this );
+        tp.exec();
+
+
+#if 0
         int result = KMessageBox::warningYesNoCancel(this,
                                                         i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop"),i18n("Stop+note"));
         if (result == KMessageBox::Cancel) return;
         if ( result == KMessageBox::No ) {
             QString comment = QInputDialog::getText(mActiveItem->text(0).left( 25 ),i18n("Comment for todo:") );
             t->setRunningFalse( comment );
         } else {
             t->setRunning( false );
         }
         mActiveItem->construct();
+
+
+#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);
         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!"));
       }
       pendingSubtodo = 0;
       return;
   }
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
   if ( pendingSubtodo != 0 ) {
       bool allowReparent = true;
       QListViewItem *par = item;
       while ( par ) {
           if ( par ==  pendingSubtodo ) {
               allowReparent = false;
               break;
           }
           par = par->parent();
       }
       if ( !allowReparent  ) {
           topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 1ffc34a..ceabdba 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -3,85 +3,103 @@
     Copyright (c) 2000, 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOTODOVIEW_H
 #define KOTODOVIEW_H
 
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qlineedit.h>
 #include <qptrlist.h>
 #include <qstrlist.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
+#include <qdialog.h>
+#include <qlabel.h>
 #include <qlistview.h>
 #include <klistview.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/todo.h>
 
 #include <korganizer/baseview.h>
 
 #include "kotodoviewitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 #include "datenavigator.h"
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 class KOTodoViewWhatsThis;
 
 class DocPrefs;
 
+
+class KOStopTodoPrefs : public QDialog
+{
+    Q_OBJECT
+  public:
+    KOStopTodoPrefs( Todo* todo, QWidget *parent=0, const char *name=0 ) ;
+   
+       
+private slots:
+    void doNotSave();
+    void accept();
+private:
+    Todo* mTodo;
+
+};
+
 class KOTodoListView : public KListView
 {
     Q_OBJECT
   public:
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
     void paintNeeded();
     void todoDropped(Todo *, int);  
     void double_Clicked(QListViewItem *item);
     void reparentTodoSignal( Todo *,Todo * );
     void unparentTodoSignal(Todo *);
     void deleteTodo( Todo * );
   protected:
     void wheelEvent (QWheelEvent *e);
     void contentsDragEnterEvent(QDragEnterEvent *);
     void contentsDragMoveEvent(QDragMoveEvent *);
     void contentsDragLeaveEvent(QDragLeaveEvent *);
     void contentsDropEvent(QDropEvent *);
 
     void contentsMousePressEvent(QMouseEvent *);
     void contentsMouseMoveEvent(QMouseEvent *);
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
     void paintEvent(QPaintEvent * pevent);
     bool internalDrop;
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index f62aab8..0cf6e4c 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -331,65 +331,65 @@ bool KOTodoViewItem::isAlternate()
     else
     {
        KOTodoViewItem *item;
        bool previous = true;
        if (QListViewItem::parent())
        {
           item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
           if (item)
              previous = item->m_odd;
           item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
        }
        else
        {
           item = static_cast<KOTodoViewItem *>(lv->firstChild());
        }
 
        while(item)
        {
           item->m_odd = previous = !previous;
           item->m_known = true;
           item = static_cast<KOTodoViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
   }
   return false;
 }
 
 void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
   QColorGroup _cg = cg;
   QColorGroup::ColorRole role; 
-  if ( KOPrefs::instance()->mTodoViewUsesForegroundColor )
+  if ( KOPrefs::instance()->mTodoViewUsesForegroundColor && !mTodo->isRunning())
       role = QColorGroup::Text;
   else
       role = QColorGroup::Base;
   //#ifndef KORG_NOLVALTERNATION
   if (isAlternate())
       _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors;
   QColor colorToSet;
   if (  column == 0 &&  mTodo->calID() > 1 ) {
       setColor = true;
       colorToSet = KOPrefs::instance()->defaultColor( mTodo->calID() );
   } else  if ( setColor ) {
       QStringList categories = mTodo->categories();
       QString cat = categories.first();
       if ( !cat.isEmpty()) {
           colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
       } else
           setColor = false;  
   }
    bool openMode = !isOpen();
    // maybe we are in flat-display-mode
    if ( !firstChild() )
        openMode = false;
    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) {
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index e98af3c..d062492 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -40,91 +40,99 @@ Todo::Todo():  QObject(), Incidence()
   mCompleted = getEvenTime(QDateTime::currentDateTime());
   mHasCompletedDate = false;
   mPercentComplete = 0;
   mRunning = false;
   mRunSaveTimer = 0;
 }
 
 Todo::Todo(const Todo &t) : QObject(),Incidence(t)
 {
   mDtDue = t.mDtDue;
   mHasDueDate = t.mHasDueDate;
   mCompleted = t.mCompleted;
   mHasCompletedDate = t.mHasCompletedDate;
   mPercentComplete = t.mPercentComplete;
   mRunning = false;
   mRunSaveTimer = 0;
 }
 
 Todo::~Todo()
 {
     setRunning( false );
     //qDebug("Todo::~Todo() ");
 }
 
 void Todo::setRunningFalse( QString s )
 {
     if ( ! mRunning )
         return;
     mRunning = false;
     mRunSaveTimer->stop();
     saveRunningInfoToFile( s );
 }
+void Todo::stopRunning()
+{
+    if ( !mRunning )
+        return;
+    if ( mRunSaveTimer )
+        mRunSaveTimer->stop();
+    mRunning = false;
+}
 void Todo::setRunning( bool run )
 {
     if ( run == mRunning )
         return;
     //qDebug("Todo::setRunning %d ", run);
     if ( !mRunSaveTimer ) {
         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::saveRunningInfoToFile()
 {
     saveRunningInfoToFile( QString::null );
 }
 void Todo::saveRunningInfoToFile( QString comment )
 {
     //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
-    if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 30   ) {
+    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->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";
     format.save( &cal, file );
     saveParents();
     
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 6fc4d4b..42db025 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -93,60 +93,61 @@ namespace KCal {
 
     /** return, if this todo is completed */
     bool isCompleted() const;
     /** set completed state of this todo */
     void setCompleted(bool);
     
     /**
       Return how many percent of the task are completed. Returns a value
       between 0 and 100.
     */
     int percentComplete() const;
     /**
       Set how many percent of the task are completed. Valid values are in the
       range from 0 to 100.
     */
     void setPercentComplete(int);
 
     /** return date and time when todo was completed */
     QDateTime completed() const;
     QString completedStr(bool shortF = true) const;
     /** set date and time of completion */
     void setCompleted(const QDateTime &completed);
 
     /** Return true, if todo has a date associated with completion */
     bool hasCompletedDate() const;
     bool contains ( Todo*);
     void checkSetCompletedFalse();
     bool setRecurDates();
     bool isRunning() {return mRunning;}
     bool hasRunningSub();
     void setRunning( bool );
     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;
     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;
 };
 
     bool operator==( const Todo&, const Todo& );
 }
 
 #endif