author | zautrix <zautrix> | 2005-01-30 12:08:19 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-30 12:08:19 (UTC) |
commit | 1bcef8b3f53419e7155e0862ad61e3e419763d70 (patch) (unidiff) | |
tree | 166b82db7bc30b7d55b042bd37bb92facea6cdf2 /libkcal | |
parent | 446ea98a9f6550c4a3e64bcfc6aab8e8b58776e8 (diff) | |
download | kdepimpi-1bcef8b3f53419e7155e0862ad61e3e419763d70.zip kdepimpi-1bcef8b3f53419e7155e0862ad61e3e419763d70.tar.gz kdepimpi-1bcef8b3f53419e7155e0862ad61e3e419763d70.tar.bz2 |
fixes
-rw-r--r-- | libkcal/todo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 7d04793..7f1de78 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -262,97 +262,101 @@ QString Todo::statusStr() const | |||
262 | case TENTATIVE: | 262 | case TENTATIVE: |
263 | return QString("TENTATIVE"); | 263 | return QString("TENTATIVE"); |
264 | break; | 264 | break; |
265 | case CONFIRMED: | 265 | case CONFIRMED: |
266 | return QString("CONFIRMED"); | 266 | return QString("CONFIRMED"); |
267 | break; | 267 | break; |
268 | case DECLINED: | 268 | case DECLINED: |
269 | return QString("DECLINED"); | 269 | return QString("DECLINED"); |
270 | break; | 270 | break; |
271 | case COMPLETED: | 271 | case COMPLETED: |
272 | return QString("COMPLETED"); | 272 | return QString("COMPLETED"); |
273 | break; | 273 | break; |
274 | case DELEGATED: | 274 | case DELEGATED: |
275 | return QString("DELEGATED"); | 275 | return QString("DELEGATED"); |
276 | break; | 276 | break; |
277 | } | 277 | } |
278 | return QString(""); | 278 | return QString(""); |
279 | } | 279 | } |
280 | #endif | 280 | #endif |
281 | 281 | ||
282 | bool Todo::isCompleted() const | 282 | bool Todo::isCompleted() const |
283 | { | 283 | { |
284 | if (mPercentComplete == 100) return true; | 284 | if (mPercentComplete == 100) return true; |
285 | else return false; | 285 | else return false; |
286 | } | 286 | } |
287 | 287 | ||
288 | void Todo::setCompleted(bool completed) | 288 | void Todo::setCompleted(bool completed) |
289 | { | 289 | { |
290 | if (completed) mPercentComplete = 100; | 290 | if (completed) mPercentComplete = 100; |
291 | else { | 291 | else { |
292 | mPercentComplete = 0; | 292 | mPercentComplete = 0; |
293 | mHasCompletedDate = false; | 293 | mHasCompletedDate = false; |
294 | } | 294 | } |
295 | updated(); | 295 | updated(); |
296 | } | 296 | } |
297 | 297 | ||
298 | QDateTime Todo::completed() const | 298 | QDateTime Todo::completed() const |
299 | { | 299 | { |
300 | return mCompleted; | 300 | return mCompleted; |
301 | } | 301 | } |
302 | 302 | ||
303 | QString Todo::completedStr( bool shortF ) const | 303 | QString Todo::completedStr( bool shortF ) const |
304 | { | 304 | { |
305 | return KGlobal::locale()->formatDateTime(mCompleted, shortF); | 305 | return KGlobal::locale()->formatDateTime(mCompleted, shortF); |
306 | } | 306 | } |
307 | 307 | ||
308 | void Todo::setCompleted(const QDateTime &completed) | 308 | void Todo::setCompleted(const QDateTime &completed) |
309 | { | 309 | { |
310 | qDebug("Todo::setCompleted "); | 310 | //qDebug("Todo::setCompleted "); |
311 | if ( mHasCompletedDate ) { | ||
312 | // qDebug("has completed data - return "); | ||
313 | return; | ||
314 | } | ||
311 | mHasCompletedDate = true; | 315 | mHasCompletedDate = true; |
312 | mPercentComplete = 100; | 316 | mPercentComplete = 100; |
313 | mCompleted = getEvenTime(completed); | 317 | mCompleted = getEvenTime(completed); |
314 | updated(); | 318 | updated(); |
315 | } | 319 | } |
316 | 320 | ||
317 | bool Todo::hasCompletedDate() const | 321 | bool Todo::hasCompletedDate() const |
318 | { | 322 | { |
319 | return mHasCompletedDate; | 323 | return mHasCompletedDate; |
320 | } | 324 | } |
321 | 325 | ||
322 | int Todo::percentComplete() const | 326 | int Todo::percentComplete() const |
323 | { | 327 | { |
324 | return mPercentComplete; | 328 | return mPercentComplete; |
325 | } | 329 | } |
326 | 330 | ||
327 | void Todo::setPercentComplete(int v) | 331 | void Todo::setPercentComplete(int v) |
328 | { | 332 | { |
329 | mPercentComplete = v; | 333 | mPercentComplete = v; |
330 | if ( v != 100 ) | 334 | if ( v != 100 ) |
331 | mHasCompletedDate = false; | 335 | mHasCompletedDate = false; |
332 | updated(); | 336 | updated(); |
333 | } | 337 | } |
334 | QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const | 338 | QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const |
335 | { | 339 | { |
336 | if ( isCompleted() || ! hasDueDate() || cancelled() ) { | 340 | if ( isCompleted() || ! hasDueDate() || cancelled() ) { |
337 | *ok = false; | 341 | *ok = false; |
338 | return QDateTime (); | 342 | return QDateTime (); |
339 | } | 343 | } |
340 | QDateTime incidenceStart; | 344 | QDateTime incidenceStart; |
341 | incidenceStart = dtDue(); | 345 | incidenceStart = dtDue(); |
342 | bool enabled = false; | 346 | bool enabled = false; |
343 | Alarm* alarm; | 347 | Alarm* alarm; |
344 | int off; | 348 | int off; |
345 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; | 349 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; |
346 | // if ( QDateTime::currentDateTime() > incidenceStart ){ | 350 | // if ( QDateTime::currentDateTime() > incidenceStart ){ |
347 | // *ok = false; | 351 | // *ok = false; |
348 | // return incidenceStart; | 352 | // return incidenceStart; |
349 | // } | 353 | // } |
350 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { | 354 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { |
351 | if (alarm->enabled()) { | 355 | if (alarm->enabled()) { |
352 | if ( alarm->hasTime () ) { | 356 | if ( alarm->hasTime () ) { |
353 | if ( alarm->time() < alarmStart ) { | 357 | if ( alarm->time() < alarmStart ) { |
354 | alarmStart = alarm->time(); | 358 | alarmStart = alarm->time(); |
355 | enabled = true; | 359 | enabled = true; |
356 | off = alarmStart.secsTo( incidenceStart ); | 360 | off = alarmStart.secsTo( incidenceStart ); |
357 | } | 361 | } |
358 | 362 | ||