summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp46
1 files changed, 15 insertions, 31 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index d6e06c8..eff96eb 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -403,9 +403,8 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
403 configString += "#config file for kopi alarm timer\n"; 403 configString += "#config file for kopi alarm timer\n";
404 configString += "#format: <Text for popup menu>;<timer countdown in minutes>\n"; 404 configString += "#format: <Text for popup menu>;<timer countdown in minutes>\n";
405 configString += "#NOTE: minimum value for timer are 3 minutes!\n"; 405 configString += "24 hours; 1440\n";
406 configString += "24 h; 1440\n"; 406 configString += "8 hours; 480\n";
407 configString += " 8 h; 480\n"; 407 configString += "5 hours; 300\n";
408 configString += " 5 h; 300\n"; 408 configString += "1 hour; 60\n";
409 configString += " 1 h; 60\n";
410 configString += "30 min; 30\n"; 409 configString += "30 min; 30\n";
411 configString += "15 min; 15\n"; 410 configString += "15 min; 15\n";
@@ -435,6 +434,6 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
435 if ( li.count() == 2 ) { 434 if ( li.count() == 2 ) {
436 int val = li[1].toInt( &ok ); 435 int val = li[1].toInt( &ok );
437 if ( ok && val > 2 ) { 436 if ( ok && val > 0 ) {
438 mTimerPopUp->insertItem( li[0], val); 437 mTimerPopUp->insertItem( li[0], val+10);
439 } 438 }
440 } 439 }
@@ -444,10 +443,10 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
444 file.close(); 443 file.close();
445#if 0 444#if 0
446 mTimerPopUp->insertItem( "24 h", 1440 ); 445 mTimerPopUp->insertItem( "24 hours", 1440 );
447 // mTimerPopUp->insertItem( i18n("12 h"), 720 ); 446 // mTimerPopUp->insertItem( i18n("12 h"), 720 );
448 mTimerPopUp->insertItem( " 8 h", 480 ); 447 mTimerPopUp->insertItem( " 8 hours", 480 );
449 mTimerPopUp->insertItem( " 5 h", 300 ); 448 mTimerPopUp->insertItem( " 5 hours", 300 );
450 // mTimerPopUp->insertItem( i18n(" 2 h"), 120 ); 449 // mTimerPopUp->insertItem( i18n(" 2 h"), 120 );
451 mTimerPopUp->insertItem( " 1 h", 60 ); 450 mTimerPopUp->insertItem( " 1 hour", 60 );
452 mTimerPopUp->insertItem( "30 min", 30 ); 451 mTimerPopUp->insertItem( "30 min", 30 );
453 mTimerPopUp->insertItem( "15 min", 15 ); 452 mTimerPopUp->insertItem( "15 min", 15 );
@@ -506,5 +505,5 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
506 return; 505 return;
507 506
508 AlarmServer::deleteAlarm ( mRunningTimer,"koalarm" , timerMesssage.latin1() ); 507 AlarmServer::deleteAlarm ( mRunningTimer,"koalarm" , timerMesssage.utf8() );
509 mTimerTime = 0; 508 mTimerTime = 0;
510 return; 509 return;
@@ -517,17 +516,5 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
517 QString mess = "timer_alarm"; 516 QString mess = "timer_alarm";
518 mess += ("Timer Alarm!\n"); 517 mess += ("Timer Alarm!\n");
519 if ( minutes == 22 ) { 518 if ( minutes == 3 ) {
520 mess += ( "Pizza is ready");
521 mRunningTimerText = "Pizza";
522 }
523 else if ( minutes == 45 ) {
524 mess += ( "Please wake up!");
525 mRunningTimerText = "Nap";
526 }
527 else if ( minutes == 5 ) {
528 mess += ( "Tea is ready");
529 mRunningTimerText = "Tea";
530 }
531 else if ( minutes == 3 ) {
532 mess += mCustomText; 519 mess += mCustomText;
533 minutes = mCustomMinutes ; 520 minutes = mCustomMinutes ;
@@ -611,10 +598,7 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
611 } 598 }
612 else { 599 else {
613 mess+= QString::number ( minutes ) + ( " minutes are past!"); 600 mess += mTimerPopUp->text( minutes );
614 int min = minutes; 601 mRunningTimerText = mTimerPopUp->text( minutes );
615 if ( min % 60 == 0 ) 602 minutes -= 10;
616 mRunningTimerText = QString::number ( min/60 ) + ( " hours");
617 else
618 mRunningTimerText = QString::number ( minutes ) + ( " minutes");
619 } 603 }
620 } 604 }