commit

1 files changed, 14 insertions, 1 deletions

diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 141a9ce..15eff28 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -545,190 +545,203 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
     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 );
             lay.addWidget( &lEdit);
             QLabel lab2 (("Countdown time (1 min - 24 h):"), &dia );
             lay.addWidget( &lab2); 
             QHBox hbox1 ( &dia  );
             lay.addWidget( &hbox1);
             QLabel lab3 (("Hours"), &hbox1 );
             QLabel lab4 (("Minutes"), &hbox1 );
             QHBox hbox ( &dia  );
             QSpinBox spinh( 0, 24, 1,& hbox );
             QFont fo = dia.font();
             fo.setPointSize( 36 );
             QSpinBox spinm( 0, 59, 1,&hbox );
             spinm.setFont( fo );
             spinh.setFont( fo );
             spinh.setButtonSymbols( QSpinBox::PlusMinus );
             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.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);
             KODateLabel dl (  &dia );
             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();
             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;
+    QString timerDuration ;
+    if ( minutes < 60 ) {
+        timerDuration = QString::number( minutes ) + " min";
+    } else {
+        if ( minutes % 60 ) {
+            timerDuration = QString::number( minutes/60 ) +":";
+                minutes = minutes%60;
+            if ( minutes < 10 ) timerDuration += "0";
+               timerDuration += QString::number( minutes ) + " h";
+        }
+        else
+            timerDuration = QString::number( minutes / 60 )+ " hours";
+    }
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8());
-    mTimerStartLabel->setText( disp + "\n\nTimer started!" );  
+    mTimerStartLabel->setText( disp + "\n\n" + timerDuration +"\n\nTimer started!" );  
     int w = mTimerStartLabel->sizeHint().width()+20;
     int h = mTimerStartLabel->sizeHint().height()+40 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     mTimerStartLabel->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     mTimerStartLabel->show();
     QTimer::singleShot( 4000, mTimerStartLabel, SLOT ( hide() )  );
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::confFontSize( int size )
 {
     
     mFontsizePopup->setItemChecked( mPopupFontSize, false );
     mPopupFontSize = size;
     mFontsizePopup->setItemChecked( mPopupFontSize, true );
     QFont fon = mTimerPopUp->font();
     fon.setPointSize(  mPopupFontSize );
     mTimerPopUp->setFont( fon );
     mPopUp->setFont( fon );
     fon.setBold( true );
     fon.setPointSize( mPopupFontSize * 2 );
     mTimerStartLabel->setFont( fon );
 }
 void SimpleAlarmDaemonImpl::writeFile()
 { 
     QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
     //QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showWN");
 }
 void SimpleAlarmDaemonImpl::newTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newTodo");
 }
 
 void SimpleAlarmDaemonImpl::newEvent()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newEvent");
 
 }
 void SimpleAlarmDaemonImpl::newMail()
 {
  QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
  QCopEnvelope e("QPE/Application/kapi", "raise()");
 }
 void SimpleAlarmDaemonImpl::ringSync()
 {
     QCopEnvelope e("QPE/Application/kopi", "-ringSync");
 
 }
 void SimpleAlarmDaemonImpl::newCountdown()
 {
     //recieve("cal_alarm", 10 );
 }
 void SimpleAlarmDaemonImpl::simulate()
 {
     QTimer::singleShot( 2000, this, SLOT ( writeFile() ) );
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     startAlarm("Alarm simulation", filename );
 }
 void SimpleAlarmDaemonImpl::showKO()
 {
      QCopEnvelope e("QPE/Application/kopi", "-showKO");
     // testing only
     //QCopEnvelope e("QPE/Application/kopi", "nextView()");
 
 }
 void SimpleAlarmDaemonImpl::showTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showTodo");
 
 }
 void SimpleAlarmDaemonImpl::writeJournal()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showJournal");
 
 }
 
 void SimpleAlarmDaemonImpl::mousePressEvent( QMouseEvent * )
 {
 
     mPopUp->popup(mapToGlobal(QPoint (0, -mPopUp->height() )));
 
 }