-rw-r--r-- | korganizer/kotodoview.cpp | 9 | ||||
-rw-r--r-- | libkcal/todo.cpp | 10 | ||||
-rw-r--r-- | libkcal/todo.h | 2 |
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 | |||
@@ -88,11 +88,18 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name | |||
88 | void KOStopTodoPrefs::accept() | 88 | void KOStopTodoPrefs::accept() |
89 | { | 89 | { |
90 | qDebug("KOStopTodoPrefs::accept() "); | 90 | qDebug("KOStopTodoPrefs::accept() "); |
91 | |||
92 | |||
93 | #if 0 | ||
94 | t->setRunningFalse( comment ); | ||
95 | |||
96 | t->setRunning( false ); | ||
97 | #endif | ||
98 | |||
91 | QDialog::accept(); | 99 | QDialog::accept(); |
92 | } | 100 | } |
93 | void KOStopTodoPrefs::doNotSave() | 101 | void KOStopTodoPrefs::doNotSave() |
94 | { | 102 | { |
95 | |||
96 | int result = KMessageBox::warningContinueCancel(this, | 103 | int result = KMessageBox::warningContinueCancel(this, |
97 | i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary() ); | 104 | i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary() ); |
98 | if (result != KMessageBox::Continue) return; | 105 | if (result != KMessageBox::Continue) return; |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index d062492..62b74f1 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -95,9 +95,15 @@ void Todo::setRunning( bool run ) | |||
95 | saveRunningInfoToFile(); | 95 | saveRunningInfoToFile(); |
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) | |
99 | { | ||
100 | mRunStart = start; | ||
101 | mRunEnd = end; | ||
102 | saveRunningInfoToFile( comment ); | ||
103 | } | ||
99 | void Todo::saveRunningInfoToFile() | 104 | void Todo::saveRunningInfoToFile() |
100 | { | 105 | { |
106 | mRunEnd = QDateTime::currentDateTime(); | ||
101 | saveRunningInfoToFile( QString::null ); | 107 | saveRunningInfoToFile( QString::null ); |
102 | } | 108 | } |
103 | void Todo::saveRunningInfoToFile( QString comment ) | 109 | void Todo::saveRunningInfoToFile( QString comment ) |
@@ -120,7 +126,7 @@ void Todo::saveRunningInfoToFile( QString comment ) | |||
120 | to->setFloats( false ); | 126 | to->setFloats( false ); |
121 | to->setDtStart( mRunStart ); | 127 | to->setDtStart( mRunStart ); |
122 | to->setHasStartDate( true ); | 128 | to->setHasStartDate( true ); |
123 | to->setDtDue( QDateTime::currentDateTime() ); | 129 | to->setDtDue( mRunEnd ); |
124 | to->setHasDueDate( true ); | 130 | to->setHasDueDate( true ); |
125 | to->setUid( file ); | 131 | to->setUid( file ); |
126 | if ( !comment.isEmpty() ) { | 132 | if ( !comment.isEmpty() ) { |
diff --git a/libkcal/todo.h b/libkcal/todo.h index 42db025..11f848e 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -42,6 +42,7 @@ namespace KCal { | |||
42 | typedef ListBase<Todo> List; | 42 | typedef ListBase<Todo> List; |
43 | QCString type() const { return "Todo"; } | 43 | QCString type() const { return "Todo"; } |
44 | IncTypeID typeID() const { return todoID; } | 44 | IncTypeID typeID() const { return todoID; } |
45 | void saveRunningInfo( QString comment, QDateTime start, QDateTime end ); | ||
45 | 46 | ||
46 | /** Return an exact copy of this todo. */ | 47 | /** Return an exact copy of this todo. */ |
47 | Incidence *clone(); | 48 | Incidence *clone(); |
@@ -133,6 +134,7 @@ namespace KCal { | |||
133 | bool mRunning; | 134 | bool mRunning; |
134 | QTimer * mRunSaveTimer; | 135 | QTimer * mRunSaveTimer; |
135 | QDateTime mRunStart; | 136 | QDateTime mRunStart; |
137 | QDateTime mRunEnd; | ||
136 | bool accept(Visitor &v) { return v.visit(this); } | 138 | bool accept(Visitor &v) { return v.visit(this); } |
137 | 139 | ||
138 | QDateTime mDtDue; // due date of todo | 140 | QDateTime mDtDue; // due date of todo |