fixes

1 files changed, 16 insertions, 15 deletions

diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 794c8ae..d6feedc 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -79,11 +79,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   fo.setPointSize( fs );
   mMessage->setFont(fo );
   mMessage->setAlignment( AlignCenter);
-  l = new QLabel("Missed Alarms:",this);
-  l->setAlignment( AlignCenter);
   layout->addWidget ( mMessage );
-  layout->addWidget ( l );
-  mMissedAlarms= new QLabel ( "", this );
+  mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
   mMissedAlarms->setAlignment( AlignCenter);
 
   playSoundTimer = new QTimer( this );
@@ -92,6 +89,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   playSoundTimer->stop();
   
   layout->addWidget ( mMissedAlarms );
+  mMissedAlarmsCombo =  new QComboBox ( this );
+  layout->addWidget ( mMissedAlarmsCombo );
   QVBox *suspendBox = new QVBox( this );
   suspendBox->setSpacing(3);
   layout->addWidget ( suspendBox );
@@ -112,14 +111,15 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   QVBox * bbox  = new QVBox ( this );
   layout->addWidget ( bbox );
   bbox->layout()->setSpacing( 2 );
-  QPushButton* suspend = new QPushButton( "Suspend", bbox);
+  mSuspendButton = new QPushButton( "Suspend", bbox);
   QPushButton* silen = new QPushButton( " Stop sound ", bbox);
   QPushButton* okbut = new QPushButton( "Ok", bbox); 
-  suspend->setFont( fo );
+  mSuspendButton->setFont( fo );
   silen->setFont( fo );
   okbut->setFont( fo );
+  okbut->setDefault( true );
   connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) ); 
-  connect (suspend , SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
+  connect (mSuspendButton, SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
   connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) );
 #ifndef _WIN32_
   if ( QFile::exists ( "/dev/sharp_led" ) )
@@ -160,8 +160,9 @@ void AlarmDialog::suspend()
 void AlarmDialog::slotOk()
 {
     mStopAlarm = true;
-    mMissedAlarms->setText("");
+    mMissedAlarms->setText("(No missed Alarms)");
     mMessage->setText("");
+    mMissedAlarmsCombo->clear();
 #ifndef _WIN32_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_OFF ;
@@ -214,12 +215,12 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
     maxAlarmReplay = replay ;
     mStopAlarm = false;
     mSilent = false;
-    if ( mMissedAlarms->text() == "" )
-        mMissedAlarms->setText( mMessage->text());
-    else
-        mMissedAlarms->setText( mMessage->text()+ "\n" + mMissedAlarms->text() );
-    if ( mMissedAlarms->text().length() > 180 )
-        mMissedAlarms->setText(mMissedAlarms->text().left ( 180 ));
+    if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
+        mMissedAlarmsCombo->show();
+        mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() );
+        mMissedAlarms->setText( "Missed alarms:");
+    } else
+        mMissedAlarmsCombo->hide();
     mMessage->setText(mess);
     int w =sizeHint().width() ;
     int h = sizeHint().height() ;
@@ -250,7 +251,7 @@ void  AlarmDialog::playSound ()
         return;
     showNormal();
     setActiveWindow();
-    setFocus();
+    mSuspendSpin->setFocus();
     raise();
     
     qApp->processEvents();