1 files changed, 8 insertions, 5 deletions

diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index e8ec033..b3da428 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -356,17 +356,17 @@ void SimpleAlarmDaemonImpl::startAlarm( QString mess, QString filename )
 void SimpleAlarmDaemonImpl::fillTimerPopUp()
 {
    
     // qDebug(" timer %d %d ",mTimerPopupConf,  mTimerTime  );
     if ( mTimerPopupConf == mTimerTime ) {
         if ( mTimerTime ) {
             int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer );
             QTime t ( secs/3600, (secs/60)%60,  secs%60  ); 
-            mTimerPopUp->changeItem ( 1 , t.toString() + " (remaining time)");
+            mTimerPopUp->changeItem ( 1 , t.toString() + " (countdown)");
         }
         else { 
             QString text = mCustomText.stripWhiteSpace ();
             int in = text.find( " " );
             text = text.left ( in );
             mTimerPopUp->changeItem ( 3,  text );
         }
         return; 
@@ -374,18 +374,18 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
     mTimerPopupConf = mTimerTime;
     mTimerPopUp->clear();
     if ( mTimerTime ) {
         int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer );
         QTime t ( secs/3600, (secs/60)%60,  secs%60  ); 
        
         
         mTimerPopUp->insertItem( "Stop timer "+ mRunningTimerText , 0 ); 
-        mTimerPopUp->insertItem( t.toString() + " (remaining time)",1); 
-        mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm time)",2); 
+        mTimerPopUp->insertItem( t.toString() + " (countdown)",1); 
+        mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm)",2); 
     } else {
 
         QString fileName = QDir::homeDirPath() +"/.kopialarmtimerrc";
         QFile file( fileName );
         if( !QFile::exists(  fileName) ) {
             // write defaults
             if (!file.open( IO_WriteOnly ) ) {
                 return;
@@ -555,18 +555,18 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             spinm.setButtonSymbols( QSpinBox::PlusMinus );
             spinh.upButton ()->setFixedSize( QSize( 48, 30 ));
             spinh.downButton ()->setFixedSize( QSize( 48, 30 ));
             //spinh.editor ()->setFixedSize( QSize( 50, 100 ));
             spinh.setFixedSize( 100,62 );
             spinm.upButton ()->setFixedSize( QSize( 48, 30 ));
             spinm.downButton ()->setFixedSize( QSize( 48, 30 ));
             spinm.downButton ()->setGeometry( 50,50,50,50); 
-            spinm.setSuffix( " m" );  
-            spinh.setSuffix( " h" ); 
+            // spinm.setSuffix( " m" );  
+            //spinh.setSuffix( " h" ); 
             spinm.setWrapping ( true );
             //spinm.editor ()->setFixedSize( QSize( 50, 100 ));
             spinm.setLineStep( 1 );
             spinm.setFixedSize( 110,62 );
             lay.addWidget( &hbox);
             QLabel lab5 ("Timer fires at:", &dia );
             lab5.setAlignment( AlignCenter );
             lay.addWidget( &lab5);
@@ -574,17 +574,19 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             dl.setAlignment( AlignCenter );
             dl.setFont( fo  );
             connect ( &spinh, SIGNAL ( valueChanged (int)), &dl, SLOT ( slot_hours( int ) ) );
             connect ( &spinm, SIGNAL ( valueChanged (int)), &dl, SLOT ( slot_minutes( int ) ) );
             lay.addWidget( &dl);
             spinh.setValue( mCustomMinutes/60 );
             spinm.setValue( mCustomMinutes%60 );
             QPushButton ok ( "Start timer", &dia);
+            ok.setDefault( true );
             ok.setFont(  fo );
+            spinh.setFocus();
             lay.addWidget( &ok);
             connect ( &ok, SIGNAL (clicked()), &dia, SLOT ( accept() ) );
             dia.resize( dia.sizeHint().width(), dia.sizeHint().height() );
             
             if ( !dia.exec() )
                 return;
             mCustomText = lEdit.text();
             mCustomMinutes = spinh.value()*60+spinm.value();
@@ -603,16 +605,17 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             int min = minutes;
             if ( min % 60 == 0 )
                 mRunningTimerText = QString::number ( min/60 ) + ( " hours");
             else
                 mRunningTimerText = QString::number ( minutes ) + ( " minutes");
         }
     }
     //minutes = 1;
+
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.latin1());
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::writeFile()
 {