-rw-r--r-- | libkcal/alarm.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp index 0afa0a7..79e0464 100644 --- a/libkcal/alarm.cpp +++ b/libkcal/alarm.cpp | |||
@@ -326,96 +326,98 @@ void Alarm::setText(const QString &text) | |||
326 | QString Alarm::text() const | 326 | QString Alarm::text() const |
327 | { | 327 | { |
328 | return (mType == Display) ? mDescription : QString::null; | 328 | return (mType == Display) ? mDescription : QString::null; |
329 | } | 329 | } |
330 | 330 | ||
331 | void Alarm::setTime(const QDateTime &alarmTime) | 331 | void Alarm::setTime(const QDateTime &alarmTime) |
332 | { | 332 | { |
333 | mAlarmTime = alarmTime; | 333 | mAlarmTime = alarmTime; |
334 | mHasTime = true; | 334 | mHasTime = true; |
335 | 335 | ||
336 | mParent->updated(); | 336 | mParent->updated(); |
337 | } | 337 | } |
338 | int Alarm::offset() | 338 | int Alarm::offset() |
339 | { | 339 | { |
340 | if ( hasTime() ) { | 340 | if ( hasTime() ) { |
341 | if (mParent->typeID() == todoID ) { | 341 | if (mParent->typeID() == todoID ) { |
342 | Todo *t = static_cast<Todo*>(mParent); | 342 | Todo *t = static_cast<Todo*>(mParent); |
343 | return t->dtDue().secsTo( mAlarmTime ) ; | 343 | return t->dtDue().secsTo( mAlarmTime ) ; |
344 | } else | 344 | } else |
345 | return mParent->dtStart().secsTo( mAlarmTime ) ; | 345 | return mParent->dtStart().secsTo( mAlarmTime ) ; |
346 | } | 346 | } |
347 | else | 347 | else |
348 | { | 348 | { |
349 | return mOffset.asSeconds(); | 349 | return mOffset.asSeconds(); |
350 | } | 350 | } |
351 | 351 | ||
352 | } | 352 | } |
353 | QString Alarm::offsetText() | 353 | QString Alarm::offsetText() |
354 | { | 354 | { |
355 | int min = -offset()/60; | 355 | int min = -offset()/60; |
356 | int hours = min /60; | 356 | int hours = min /60; |
357 | min = min % 60; | 357 | min = min % 60; |
358 | int days = hours /24; | 358 | int days = hours /24; |
359 | hours = hours % 24; | 359 | hours = hours % 24; |
360 | QString message; | 360 | QString message; |
361 | //qDebug("%d %d %d ", days, hours, min ); | 361 | //qDebug("%d %d %d ", days, hours, min ); |
362 | if ( days > 0 ) | 362 | if ( days > 0 ) |
363 | message += i18n("%1d").arg( days ); | 363 | message += i18n("%1d").arg( days ); |
364 | if ( hours > 0 ) { | 364 | if ( hours > 0 ) { |
365 | if ( !message.isEmpty() ) message += "/"; | 365 | if ( !message.isEmpty() ) message += "/"; |
366 | message += i18n("%1h").arg( hours ); | 366 | message += i18n("%1h").arg( hours ); |
367 | } | 367 | } |
368 | if ( min > 0 ) { | 368 | if ( min > 0 ) { |
369 | if ( !message.isEmpty() ) message += "/"; | 369 | if ( !message.isEmpty() ) message += "/"; |
370 | message += i18n("%1min").arg( min ); | 370 | message += i18n("%1min").arg( min ); |
371 | } | 371 | } |
372 | if ( message.isEmpty() ) | 372 | if ( message.isEmpty() ) |
373 | message = i18n("%1min").arg( 0 ); | 373 | message = i18n("%1min").arg( 0 ); |
374 | if ( !mParent->alarmEnabled() ) | ||
375 | return "!"+message + i18n("(disabled)"); | ||
374 | return message; | 376 | return message; |
375 | } | 377 | } |
376 | 378 | ||
377 | 379 | ||
378 | QDateTime Alarm::time() const | 380 | QDateTime Alarm::time() const |
379 | { | 381 | { |
380 | if ( hasTime() ) | 382 | if ( hasTime() ) |
381 | return mAlarmTime; | 383 | return mAlarmTime; |
382 | else | 384 | else |
383 | { | 385 | { |
384 | if (mParent->typeID() == todoID ) { | 386 | if (mParent->typeID() == todoID ) { |
385 | Todo *t = static_cast<Todo*>(mParent); | 387 | Todo *t = static_cast<Todo*>(mParent); |
386 | return mOffset.end( t->dtDue() ); | 388 | return mOffset.end( t->dtDue() ); |
387 | } else if (mEndOffset) { | 389 | } else if (mEndOffset) { |
388 | return mOffset.end( mParent->dtEnd() ); | 390 | return mOffset.end( mParent->dtEnd() ); |
389 | } else { | 391 | } else { |
390 | return mOffset.end( mParent->dtStart() ); | 392 | return mOffset.end( mParent->dtStart() ); |
391 | } | 393 | } |
392 | } | 394 | } |
393 | } | 395 | } |
394 | 396 | ||
395 | bool Alarm::hasTime() const | 397 | bool Alarm::hasTime() const |
396 | { | 398 | { |
397 | return mHasTime; | 399 | return mHasTime; |
398 | } | 400 | } |
399 | 401 | ||
400 | void Alarm::setSnoozeTime(int alarmSnoozeTime) | 402 | void Alarm::setSnoozeTime(int alarmSnoozeTime) |
401 | { | 403 | { |
402 | mAlarmSnoozeTime = alarmSnoozeTime; | 404 | mAlarmSnoozeTime = alarmSnoozeTime; |
403 | mParent->updated(); | 405 | mParent->updated(); |
404 | } | 406 | } |
405 | 407 | ||
406 | int Alarm::snoozeTime() const | 408 | int Alarm::snoozeTime() const |
407 | { | 409 | { |
408 | return mAlarmSnoozeTime; | 410 | return mAlarmSnoozeTime; |
409 | } | 411 | } |
410 | 412 | ||
411 | void Alarm::setRepeatCount(int alarmRepeatCount) | 413 | void Alarm::setRepeatCount(int alarmRepeatCount) |
412 | { | 414 | { |
413 | kdDebug(5800) << "Alarm::setRepeatCount(): " << alarmRepeatCount << endl; | 415 | kdDebug(5800) << "Alarm::setRepeatCount(): " << alarmRepeatCount << endl; |
414 | 416 | ||
415 | mAlarmRepeatCount = alarmRepeatCount; | 417 | mAlarmRepeatCount = alarmRepeatCount; |
416 | mParent->updated(); | 418 | mParent->updated(); |
417 | } | 419 | } |
418 | 420 | ||
419 | int Alarm::repeatCount() const | 421 | int Alarm::repeatCount() const |
420 | { | 422 | { |
421 | kdDebug(5800) << "Alarm::repeatCount(): " << mAlarmRepeatCount << endl; | 423 | kdDebug(5800) << "Alarm::repeatCount(): " << mAlarmRepeatCount << endl; |