author | kergoth <kergoth> | 2003-08-09 17:14:54 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:14:54 (UTC) |
commit | a7e015198a8c5ad3b6e144a9032b059086253e00 (patch) (unidiff) | |
tree | b712b6f11310d88744fe393a92b3160b741a7efe /noncore/tools/clock | |
parent | beba0e73306815337bf04dee39502233595e9739 (diff) | |
download | opie-a7e015198a8c5ad3b6e144a9032b059086253e00.zip opie-a7e015198a8c5ad3b6e144a9032b059086253e00.tar.gz opie-a7e015198a8c5ad3b6e144a9032b059086253e00.tar.bz2 |
Merge from BRANCH_1_0
-rw-r--r-- | noncore/tools/clock/clock.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index 41c99a8..ecbf12f 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp | |||
@@ -412,68 +412,69 @@ void Clock::slotToggleAlarm() | |||
412 | { | 412 | { |
413 | config.writeEntry( "clockAlarmSet", "TRUE" ); | 413 | config.writeEntry( "clockAlarmSet", "TRUE" ); |
414 | alarmOffBtn->setText( tr( "Alarm Is On" ) ); | 414 | alarmOffBtn->setText( tr( "Alarm Is On" ) ); |
415 | snoozeBtn->show(); | 415 | snoozeBtn->show(); |
416 | alarmBool = TRUE; | 416 | alarmBool = TRUE; |
417 | alarmOn(); | 417 | alarmOn(); |
418 | } | 418 | } |
419 | config.write(); | 419 | config.write(); |
420 | } | 420 | } |
421 | 421 | ||
422 | void Clock::alarmOn() | 422 | void Clock::alarmOn() |
423 | { | 423 | { |
424 | QDate d = QDate::currentDate(); | 424 | QDate d = QDate::currentDate(); |
425 | QTime tm( ( int ) hour, ( int ) minute, 0 ); | 425 | QTime tm( ( int ) hour, ( int ) minute, 0 ); |
426 | qDebug( "Time set " + tm.toString() ); | 426 | qDebug( "Time set " + tm.toString() ); |
427 | QTime t = QTime::currentTime(); | 427 | QTime t = QTime::currentTime(); |
428 | if ( t > tm ) | 428 | if ( t > tm ) |
429 | d = d.addDays( 1 ); | 429 | d = d.addDays( 1 ); |
430 | int warn = 0; | 430 | int warn = 0; |
431 | QDateTime whenl( d, tm ); | 431 | QDateTime whenl( d, tm ); |
432 | when = whenl; | 432 | when = whenl; |
433 | AlarmServer::addAlarm( when, | 433 | AlarmServer::addAlarm( when, |
434 | "QPE/Application/clock", | 434 | "QPE/Application/clock", |
435 | "alarm(QDateTime,int)", warn ); | 435 | "alarm(QDateTime,int)", warn ); |
436 | setCaption( "Alarm set: " + whenl.toString() ); | 436 | // setCaption( "Alarm set: " + whenl.toString() ); |
437 | setCaption( tr("Alarm set: %1" ).arg(whenl.toString()) ); | ||
437 | } | 438 | } |
438 | 439 | ||
439 | void Clock::alarmOff() | 440 | void Clock::alarmOff() |
440 | { | 441 | { |
441 | int warn = 0; | 442 | int warn = 0; |
442 | bSound = FALSE; | 443 | bSound = FALSE; |
443 | AlarmServer::deleteAlarm( when, | 444 | AlarmServer::deleteAlarm( when, |
444 | "QPE/Application/clock", | 445 | "QPE/Application/clock", |
445 | "alarm(QDateTime,int)", warn ); | 446 | "alarm(QDateTime,int)", warn ); |
446 | qDebug( "Alarm Off " + when.toString() ); | 447 | qDebug( "Alarm Off " + when.toString() ); |
447 | setCaption( "Clock" ); | 448 | setCaption( tr("Clock") ); |
448 | } | 449 | } |
449 | 450 | ||
450 | void Clock::clearTimer() | 451 | void Clock::clearTimer() |
451 | { | 452 | { |
452 | alarmOffBtn->setText( tr( "Alarm Is Off" ) ); | 453 | alarmOffBtn->setText( tr( "Alarm Is Off" ) ); |
453 | alarmBool = FALSE; | 454 | alarmBool = FALSE; |
454 | snoozeBtn->hide(); | 455 | snoozeBtn->hide(); |
455 | setCaption( "Clock" ); | 456 | setCaption( tr("Clock") ); |
456 | } | 457 | } |
457 | 458 | ||
458 | void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) | 459 | void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) |
459 | { | 460 | { |
460 | int stopTimer = 0; | 461 | int stopTimer = 0; |
461 | int timerStay = 5000; | 462 | int timerStay = 5000; |
462 | bSound = TRUE; | 463 | bSound = TRUE; |
463 | qDebug( "Message received in clock" ); | 464 | qDebug( "Message received in clock" ); |
464 | if ( msg == "alarm(QDateTime,int)" ) | 465 | if ( msg == "alarm(QDateTime,int)" ) |
465 | { | 466 | { |
466 | Config config( "qpe" ); | 467 | Config config( "qpe" ); |
467 | config.setGroup( "Time" ); | 468 | config.setGroup( "Time" ); |
468 | if ( config.readBoolEntry( "mp3Alarm", 0 ) ) | 469 | if ( config.readBoolEntry( "mp3Alarm", 0 ) ) |
469 | { | 470 | { |
470 | clearTimer(); | 471 | clearTimer(); |
471 | pthread_t thread; | 472 | pthread_t thread; |
472 | pthread_create(&thread, NULL, (void * (*) (void *))startPlayer, NULL/* &*/); | 473 | pthread_create(&thread, NULL, (void * (*) (void *))startPlayer, NULL/* &*/); |
473 | 474 | ||
474 | } | 475 | } |
475 | else | 476 | else |
476 | { | 477 | { |
477 | 478 | ||
478 | Sound::soundAlarm(); | 479 | Sound::soundAlarm(); |
479 | stopTimer = startTimer( timerStay ); | 480 | stopTimer = startTimer( timerStay ); |