-rw-r--r-- | kalarmd/alarmdialog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index d72a8c2..1cda534 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp | |||
@@ -207,128 +207,129 @@ void AlarmDialog::slotSuspend() | |||
207 | slotOk(); | 207 | slotOk(); |
208 | } | 208 | } |
209 | 209 | ||
210 | void AlarmDialog::setServerNotification( bool b ) | 210 | void AlarmDialog::setServerNotification( bool b ) |
211 | { | 211 | { |
212 | mServerNotification = b; | 212 | mServerNotification = b; |
213 | } | 213 | } |
214 | int AlarmDialog::getSuspendTime( ) | 214 | int AlarmDialog::getSuspendTime( ) |
215 | { | 215 | { |
216 | return mSuspendSpin->value(); | 216 | return mSuspendSpin->value(); |
217 | 217 | ||
218 | } | 218 | } |
219 | void AlarmDialog::setSuspendTime( int val ) | 219 | void AlarmDialog::setSuspendTime( int val ) |
220 | { | 220 | { |
221 | mSuspendSpin->setValue( val ); | 221 | mSuspendSpin->setValue( val ); |
222 | } | 222 | } |
223 | bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, bool playwav, int pause , int suspendtimes) | 223 | bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, bool playwav, int pause , int suspendtimes) |
224 | { | 224 | { |
225 | if ( mess.left( 9) != "Suspended" ) | 225 | if ( mess.left( 9) != "Suspended" ) |
226 | mSuspendCounter = suspendtimes; | 226 | mSuspendCounter = suspendtimes; |
227 | mPauseCount = pause; | 227 | mPauseCount = pause; |
228 | mFileName = fn; | 228 | mFileName = fn; |
229 | mPlayWav = playwav; | 229 | mPlayWav = playwav; |
230 | if ( !QFile::exists( fn ) ) | 230 | if ( !QFile::exists( fn ) ) |
231 | mFileName = ""; | 231 | mFileName = ""; |
232 | alarmCounter = 0 ; | 232 | alarmCounter = 0 ; |
233 | maxAlarmReplay = replay ; | 233 | maxAlarmReplay = replay ; |
234 | mStopAlarm = false; | 234 | mStopAlarm = false; |
235 | mSilent = false; | 235 | mSilent = false; |
236 | if ( !mMessage->text().stripWhiteSpace().isEmpty() ) { | 236 | if ( !mMessage->text().stripWhiteSpace().isEmpty() ) { |
237 | mMissedAlarmsCombo->show(); | 237 | mMissedAlarmsCombo->show(); |
238 | QString newItem = mMessage->text().stripWhiteSpace(); | 238 | QString newItem = mMessage->text().stripWhiteSpace(); |
239 | newItem.replace( QRegExp("\n"), QString(" ") ); | 239 | newItem.replace( QRegExp("\n"), QString(" ") ); |
240 | mMissedAlarmsCombo->insertItem( newItem ); | 240 | mMissedAlarmsCombo->insertItem( newItem ); |
241 | mMissedAlarms->setText( "Missed alarms:"); | 241 | mMissedAlarms->setText( "Missed alarms:"); |
242 | } else | 242 | } else |
243 | mMissedAlarmsCombo->hide(); | 243 | mMissedAlarmsCombo->hide(); |
244 | mMessage->setText(mess); | 244 | mMessage->setText(mess); |
245 | int w = minimumSizeHint().width() ; | 245 | int w = minimumSizeHint().width() ; |
246 | int h = minimumSizeHint().height() ; | 246 | int h = minimumSizeHint().height() ; |
247 | int dw = QApplication::desktop()->width(); | 247 | int dw = QApplication::desktop()->width(); |
248 | int dh = QApplication::desktop()->height(); | 248 | int dh = QApplication::desktop()->height(); |
249 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 249 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
250 | hide(); | 250 | hide(); |
251 | 251 | ||
252 | #ifndef _WIN32_ | 252 | #ifndef _WIN32_ |
253 | if ( fd_led > 0 ) { | 253 | if ( fd_led > 0 ) { |
254 | statusLED.status = LED_SALARM_ON ; | 254 | statusLED.status = LED_SALARM_ON ; |
255 | ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); | 255 | ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); |
256 | } | 256 | } |
257 | #endif | 257 | #endif |
258 | okbut->setDefault( true ); | 258 | okbut->setDefault( true ); |
259 | QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) ); | 259 | QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) ); |
260 | // playSoundTimer->start( 1000, true ); | 260 | // playSoundTimer->start( 1000, true ); |
261 | return true; | 261 | return true; |
262 | 262 | ||
263 | } | 263 | } |
264 | 264 | ||
265 | void AlarmDialog::forceRepaint() | 265 | void AlarmDialog::forceRepaint() |
266 | { | 266 | { |
267 | 267 | ||
268 | showNormal(); | 268 | showNormal(); |
269 | setActiveWindow(); | 269 | setActiveWindow(); |
270 | raise(); | 270 | raise(); |
271 | mSuspendSpin->setFocus(); | ||
271 | playSoundTimer->start( 1000, true ); | 272 | playSoundTimer->start( 1000, true ); |
272 | 273 | ||
273 | } | 274 | } |
274 | void AlarmDialog::spinBoxChanged( int v ) | 275 | void AlarmDialog::spinBoxChanged( int v ) |
275 | { | 276 | { |
276 | okbut->setDefault( false ); | 277 | okbut->setDefault( false ); |
277 | mSilent = true; | 278 | mSilent = true; |
278 | } | 279 | } |
279 | 280 | ||
280 | void AlarmDialog::playSound () | 281 | void AlarmDialog::playSound () |
281 | { | 282 | { |
282 | 283 | ||
283 | if (mStopAlarm ) | 284 | if (mStopAlarm ) |
284 | return; | 285 | return; |
285 | if ( mSilent ) | 286 | if ( mSilent ) |
286 | return; | 287 | return; |
287 | showNormal(); | 288 | //showNormal(); |
288 | setActiveWindow(); | 289 | setActiveWindow(); |
289 | raise(); | 290 | //raise(); |
290 | mSuspendSpin->setFocus(); | 291 | mSuspendSpin->setFocus(); |
291 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { | 292 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { |
292 | ++alarmCounter; | 293 | ++alarmCounter; |
293 | #ifdef DESKTOP_VERSION | 294 | #ifdef DESKTOP_VERSION |
294 | mPlayWav = true; | 295 | mPlayWav = true; |
295 | #endif | 296 | #endif |
296 | if ( !mPlayWav || mFileName.length() < 2 ) { | 297 | if ( !mPlayWav || mFileName.length() < 2 ) { |
297 | 298 | ||
298 | #ifdef DESKTOP_VERSION | 299 | #ifdef DESKTOP_VERSION |
299 | qDebug("Sound play not possible - file not found"); | 300 | qDebug("Sound play not possible - file not found"); |
300 | #else | 301 | #else |
301 | Sound::soundAlarm (); | 302 | Sound::soundAlarm (); |
302 | #endif | 303 | #endif |
303 | } else | 304 | } else |
304 | 305 | ||
305 | { | 306 | { |
306 | #ifdef DESKTOP_VERSION | 307 | #ifdef DESKTOP_VERSION |
307 | #ifdef _WIN32_ | 308 | #ifdef _WIN32_ |
308 | QSound::play ( mFileName ); | 309 | QSound::play ( mFileName ); |
309 | #else | 310 | #else |
310 | 311 | ||
311 | QString command = "playwave -r 22050 " + mFileName; | 312 | QString command = "playwave -r 22050 " + mFileName; |
312 | qDebug("KO: Playing file %s with 22kHz",mFileName.latin1() ); | 313 | qDebug("KO: Playing file %s with 22kHz",mFileName.latin1() ); |
313 | int ret = system ( command.latin1() ); | 314 | int ret = system ( command.latin1() ); |
314 | if ( ret != 0 ) { | 315 | if ( ret != 0 ) { |
315 | qDebug("Sound play command failed: %s ",command.latin1() ); | 316 | qDebug("Sound play command failed: %s ",command.latin1() ); |
316 | } | 317 | } |
317 | 318 | ||
318 | #endif | 319 | #endif |
319 | 320 | ||
320 | #else | 321 | #else |
321 | QSound::play ( mFileName ); | 322 | QSound::play ( mFileName ); |
322 | #endif | 323 | #endif |
323 | qDebug("BEEP!"); | 324 | qDebug("BEEP!"); |
324 | } | 325 | } |
325 | } else { | 326 | } else { |
326 | if ( ! mSilent && mSuspendCounter > 0 ) { | 327 | if ( ! mSilent && mSuspendCounter > 0 ) { |
327 | --mSuspendCounter; | 328 | --mSuspendCounter; |
328 | reject (); | 329 | reject (); |
329 | hide(); | 330 | hide(); |
330 | return; | 331 | return; |
331 | } | 332 | } |
332 | } | 333 | } |
333 | playSoundTimer->start( mPauseCount * 1000, true ); | 334 | playSoundTimer->start( mPauseCount * 1000, true ); |
334 | } | 335 | } |