2 files changed, 23 insertions, 1 deletions

diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 8ea8a73..04b8b21 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -139,31 +139,40 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     confPause( 1 );
     mSuspend = 0;
     confSuspend( 0 );
     if ( QApplication::desktop()->width() < 480 ) {
         wavAlarm = false;
         mSoundPopUp->setItemChecked ( 0, true );
     }
     else {
         wavAlarm = true;
         mSoundPopUp->setItemChecked ( 1, true );
     }
     saveSlot( 1 );
+    mTimerStartLabel = new QLabel( 0 );
+    mTimerStartLabel->setCaption( "Timer started!");  
+    fon = mTimerPopUp->font();
+    fon.setBold( true );
+    points = (fon.pointSize()*2); 
+    fon.setPointSize( points );
+    mTimerStartLabel->setFont( fon );
 }
 
 SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl()
 {
     //delete mPopUp;
     delete mAlarmDialog;
+    delete mTimerStartLabel;
 }
+
 void SimpleAlarmDaemonImpl::saveSlot( int load )
 {
     QString fileName = QDir::homeDirPath() +"/.kopialarmrc";
     //qDebug("save %d ", load );
     QFile file( fileName );
     if ( load ) {
         if( !QFile::exists(  fileName) )
             return;
          if (!file.open( IO_ReadOnly ) ) {
             return ;
         } 
          QString line;
@@ -393,26 +402,26 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
 
         QString fileName = QDir::homeDirPath() +"/.kopialarmtimerrc";
         QFile file( fileName );
         if( !QFile::exists(  fileName) ) {
             // write defaults
             if (!file.open( IO_WriteOnly ) ) {
                 return;
             } 
             QString configString ;
             configString += "#config file for kopi alarm timer\n";
             configString += "#format:  <Text for popup menu>;<timer countdown in minutes>\n";
             configString += "24 hours; 1440\n";
+            configString += "9 hours; 540\n";
             configString += "8 hours; 480\n";
-            configString += "5 hours; 300\n";
             configString += "1 hour; 60\n";
             configString += "30 min; 30\n";
             configString += "15 min; 15\n";
             configString += "SEPARATOR\n";
             configString += "Pizza; 22\n";
             configString += "Nap; 45\n";
             configString += "Tea; 5\n";
             QTextStream ts( &file );
             ts << configString ;
             file.close();
         }
          
@@ -504,31 +513,33 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             return;
         
         AlarmServer::deleteAlarm ( mRunningTimer,"koalarm"  , timerMesssage.utf8() );
         mTimerTime = 0;
         return;
     }
     if ( mTimerTime )
         return;
     if ( minutes == 1 ) {
         return;
     }
     QString mess = "timer_alarm";
+    QString disp;
     mess += ("Timer Alarm!\n");
     if ( minutes ==  3 ) {
         mess += mCustomText;
         minutes  = mCustomMinutes ; 
         mRunningTimerText = mCustomText.stripWhiteSpace ();
         int in = mRunningTimerText.find( " " );
         mRunningTimerText = mRunningTimerText.left ( in );
+        disp = mCustomText;
     }
     else  { 
         if ( minutes == 2 ) {
             // ask time
             QDialog dia ( 0,  ("Customize Timer" ), true ); 
             QLabel lab (("Message Text:"), &dia ); 
             dia.setCaption(("KO/Pi Timer" )); 
             QVBoxLayout lay( &dia );
             lay.setMargin(5); 
             lay.setSpacing(5); 
             lay.addWidget( &lab);
             QLineEdit lEdit( mCustomText, &dia );
@@ -581,40 +592,50 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             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();
             if ( mCustomMinutes == 0 )
                 mCustomMinutes = 1;
             if ( mCustomMinutes > 1440 )
                 mCustomMinutes = 1440;
             mess += mCustomText;
+            disp = mCustomText;
             minutes = mCustomMinutes; 
             mRunningTimerText = mCustomText.stripWhiteSpace ();
             int in = mRunningTimerText.find( " " );
             mRunningTimerText = mRunningTimerText.left ( in );
         }
         else {
             mess += mTimerPopUp->text( minutes );
+            disp = mTimerPopUp->text( minutes );
             mRunningTimerText = mTimerPopUp->text( minutes );
             minutes -= 10;
         }
     }
     //minutes = 1;
 
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8());
+    mTimerStartLabel->setText( disp );  
+    int w = 200;
+    int h = mTimerStartLabel->sizeHint().height() ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    mTimerStartLabel->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    mTimerStartLabel->show();
+    QTimer::singleShot( 3000, mTimerStartLabel, SLOT ( hide() )  );
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::writeFile()
 { 
     QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
     //QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showWN");
 }
diff --git a/kalarmd/simplealarmdaemonimpl.h b/kalarmd/simplealarmdaemonimpl.h
index cbdba47..9b7de94 100644
--- a/kalarmd/simplealarmdaemonimpl.h
+++ b/kalarmd/simplealarmdaemonimpl.h
@@ -59,24 +59,25 @@ class SimpleAlarmDaemonImpl : public QLabel
     void confPause( int );
     void confTimer( int );
     void saveSlot( int );
     void confSuspend( int );
     void confSound( int num );
     void startAlarm(QString mess, QString fn );
 
   protected:
     void mousePressEvent( QMouseEvent * );
 
   private:
     AlarmDialog *mAlarmDialog;
+    QLabel * mTimerStartLabel;
     int mPlayBeeps;
     int mPausePlay;
     int mSuspend;
     QString mAlarmMessage;
     int mTimerTime;
     int getFileNameLen( QString );
     QPopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp;
     QDateTime mRunningTimer;
     void fillTimerPopUp();
     QString timerMesssage;
     QString mCustomText;
     QString mRunningTimerText;