-rw-r--r-- | kalarmd/alarmdialog.cpp | 31 |
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 | |||
@@ -78,21 +78,20 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
78 | l->setFont( fo ); | 78 | l->setFont( fo ); |
79 | fo.setPointSize( fs ); | 79 | fo.setPointSize( fs ); |
80 | mMessage->setFont(fo ); | 80 | mMessage->setFont(fo ); |
81 | mMessage->setAlignment( AlignCenter); | 81 | mMessage->setAlignment( AlignCenter); |
82 | l = new QLabel("Missed Alarms:",this); | ||
83 | l->setAlignment( AlignCenter); | ||
84 | layout->addWidget ( mMessage ); | 82 | layout->addWidget ( mMessage ); |
85 | layout->addWidget ( l ); | 83 | mMissedAlarms= new QLabel ( "(No missed Alarms)", this ); |
86 | mMissedAlarms= new QLabel ( "", this ); | ||
87 | mMissedAlarms->setAlignment( AlignCenter); | 84 | mMissedAlarms->setAlignment( AlignCenter); |
88 | 85 | ||
89 | playSoundTimer = new QTimer( this ); | 86 | playSoundTimer = new QTimer( this ); |
90 | connect ( playSoundTimer, SIGNAL( timeout() ), this, SLOT (playSound() ) ); | 87 | connect ( playSoundTimer, SIGNAL( timeout() ), this, SLOT (playSound() ) ); |
91 | 88 | ||
92 | playSoundTimer->stop(); | 89 | playSoundTimer->stop(); |
93 | 90 | ||
94 | layout->addWidget ( mMissedAlarms ); | 91 | layout->addWidget ( mMissedAlarms ); |
92 | mMissedAlarmsCombo = new QComboBox ( this ); | ||
93 | layout->addWidget ( mMissedAlarmsCombo ); | ||
95 | QVBox *suspendBox = new QVBox( this ); | 94 | QVBox *suspendBox = new QVBox( this ); |
96 | suspendBox->setSpacing(3); | 95 | suspendBox->setSpacing(3); |
97 | layout->addWidget ( suspendBox ); | 96 | layout->addWidget ( suspendBox ); |
98 | QLabel* labb = new QLabel("Suspend duration (minutes):",suspendBox); | 97 | QLabel* labb = new QLabel("Suspend duration (minutes):",suspendBox); |
@@ -111,16 +110,17 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
111 | 110 | ||
112 | QVBox * bbox = new QVBox ( this ); | 111 | QVBox * bbox = new QVBox ( this ); |
113 | layout->addWidget ( bbox ); | 112 | layout->addWidget ( bbox ); |
114 | bbox->layout()->setSpacing( 2 ); | 113 | bbox->layout()->setSpacing( 2 ); |
115 | QPushButton* suspend = new QPushButton( "Suspend", bbox); | 114 | mSuspendButton = new QPushButton( "Suspend", bbox); |
116 | QPushButton* silen = new QPushButton( " Stop sound ", bbox); | 115 | QPushButton* silen = new QPushButton( " Stop sound ", bbox); |
117 | QPushButton* okbut = new QPushButton( "Ok", bbox); | 116 | QPushButton* okbut = new QPushButton( "Ok", bbox); |
118 | suspend->setFont( fo ); | 117 | mSuspendButton->setFont( fo ); |
119 | silen->setFont( fo ); | 118 | silen->setFont( fo ); |
120 | okbut->setFont( fo ); | 119 | okbut->setFont( fo ); |
120 | okbut->setDefault( true ); | ||
121 | connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) ); | 121 | connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) ); |
122 | connect (suspend , SIGNAL( clicked() ), this, SLOT (slotSuspend() ) ); | 122 | connect (mSuspendButton, SIGNAL( clicked() ), this, SLOT (slotSuspend() ) ); |
123 | connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) ); | 123 | connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) ); |
124 | #ifndef _WIN32_ | 124 | #ifndef _WIN32_ |
125 | if ( QFile::exists ( "/dev/sharp_led" ) ) | 125 | if ( QFile::exists ( "/dev/sharp_led" ) ) |
126 | fd_led = open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK ); | 126 | fd_led = open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK ); |
@@ -159,10 +159,11 @@ void AlarmDialog::suspend() | |||
159 | } | 159 | } |
160 | void AlarmDialog::slotOk() | 160 | void AlarmDialog::slotOk() |
161 | { | 161 | { |
162 | mStopAlarm = true; | 162 | mStopAlarm = true; |
163 | mMissedAlarms->setText(""); | 163 | mMissedAlarms->setText("(No missed Alarms)"); |
164 | mMessage->setText(""); | 164 | mMessage->setText(""); |
165 | mMissedAlarmsCombo->clear(); | ||
165 | #ifndef _WIN32_ | 166 | #ifndef _WIN32_ |
166 | if ( fd_led > 0 ) { | 167 | if ( fd_led > 0 ) { |
167 | statusLED.status = LED_SALARM_OFF ; | 168 | statusLED.status = LED_SALARM_OFF ; |
168 | ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); | 169 | ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); |
@@ -213,14 +214,14 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
213 | alarmCounter = 0 ; | 214 | alarmCounter = 0 ; |
214 | maxAlarmReplay = replay ; | 215 | maxAlarmReplay = replay ; |
215 | mStopAlarm = false; | 216 | mStopAlarm = false; |
216 | mSilent = false; | 217 | mSilent = false; |
217 | if ( mMissedAlarms->text() == "" ) | 218 | if ( !mMessage->text().stripWhiteSpace().isEmpty() ) { |
218 | mMissedAlarms->setText( mMessage->text()); | 219 | mMissedAlarmsCombo->show(); |
219 | else | 220 | mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() ); |
220 | mMissedAlarms->setText( mMessage->text()+ "\n" + mMissedAlarms->text() ); | 221 | mMissedAlarms->setText( "Missed alarms:"); |
221 | if ( mMissedAlarms->text().length() > 180 ) | 222 | } else |
222 | mMissedAlarms->setText(mMissedAlarms->text().left ( 180 )); | 223 | mMissedAlarmsCombo->hide(); |
223 | mMessage->setText(mess); | 224 | mMessage->setText(mess); |
224 | int w =sizeHint().width() ; | 225 | int w =sizeHint().width() ; |
225 | int h = sizeHint().height() ; | 226 | int h = sizeHint().height() ; |
226 | int dw = QApplication::desktop()->width(); | 227 | int dw = QApplication::desktop()->width(); |
@@ -249,9 +250,9 @@ void AlarmDialog::playSound () | |||
249 | if (mStopAlarm ) | 250 | if (mStopAlarm ) |
250 | return; | 251 | return; |
251 | showNormal(); | 252 | showNormal(); |
252 | setActiveWindow(); | 253 | setActiveWindow(); |
253 | setFocus(); | 254 | mSuspendSpin->setFocus(); |
254 | raise(); | 255 | raise(); |
255 | 256 | ||
256 | qApp->processEvents(); | 257 | qApp->processEvents(); |
257 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { | 258 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { |