-rw-r--r-- | kalarmd/alarmdialog.cpp | 12 | ||||
-rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 11 |
2 files changed, 16 insertions, 7 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index ddb125a..18ce9da 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp | |||
@@ -248,14 +248,20 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
248 | mMissedAlarmsCombo->hide(); | 248 | mMissedAlarmsCombo->hide(); |
249 | mMessage->setText(mess); | 249 | mMessage->setText(mess); |
250 | int w = minimumSizeHint().width() ; | 250 | int w = minimumSizeHint().width() ; |
251 | int h = minimumSizeHint().height() ; | 251 | int h = minimumSizeHint().height() ; |
252 | int dw = QApplication::desktop()->width(); | 252 | int dw = QApplication::desktop()->width(); |
253 | int dh = QApplication::desktop()->height(); | 253 | int dh = QApplication::desktop()->height(); |
254 | if ( w < 220 ) w = 220; | ||
255 | if ( h < 220 ) h = 220; | ||
254 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 256 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
255 | hide(); | 257 | showNormal(); |
258 | setActiveWindow(); | ||
259 | raise(); | ||
260 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | ||
261 | //hide(); | ||
256 | 262 | ||
257 | #ifndef _WIN32_ | 263 | #ifndef _WIN32_ |
258 | if ( fd_led > 0 ) { | 264 | if ( fd_led > 0 ) { |
259 | statusLED.status = LED_SALARM_ON ; | 265 | statusLED.status = LED_SALARM_ON ; |
260 | ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); | 266 | ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); |
261 | } | 267 | } |
@@ -266,16 +272,14 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
266 | return true; | 272 | return true; |
267 | 273 | ||
268 | } | 274 | } |
269 | 275 | ||
270 | void AlarmDialog::forceRepaint() | 276 | void AlarmDialog::forceRepaint() |
271 | { | 277 | { |
272 | |||
273 | showNormal(); | ||
274 | setActiveWindow(); | 278 | setActiveWindow(); |
275 | raise(); | 279 | repaint(); |
276 | mSuspendSpin->setFocus(); | 280 | mSuspendSpin->setFocus(); |
277 | playSoundTimer->start( 1000, true ); | 281 | playSoundTimer->start( 1000, true ); |
278 | 282 | ||
279 | } | 283 | } |
280 | void AlarmDialog::spinBoxChanged( int v ) | 284 | void AlarmDialog::spinBoxChanged( int v ) |
281 | { | 285 | { |
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index a0ac232..8ea8a73 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp | |||
@@ -64,12 +64,17 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) | |||
64 | mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) ); | 64 | mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) ); |
65 | mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) ); | 65 | mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) ); |
66 | mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) ); | 66 | mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) ); |
67 | mPopUp->insertSeparator(); | 67 | mPopUp->insertSeparator(); |
68 | mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); | 68 | mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); |
69 | mTimerPopUp = new QPopupMenu( this ); | 69 | mTimerPopUp = new QPopupMenu( this ); |
70 | QFont fon = mTimerPopUp->font(); | ||
71 | int points = (fon.pointSize()*4)/3; | ||
72 | fon.setPointSize( points ); | ||
73 | mTimerPopUp->setFont( fon ); | ||
74 | mPopUp->setFont( fon ); | ||
70 | mBeepPopUp = new QPopupMenu( this ); | 75 | mBeepPopUp = new QPopupMenu( this ); |
71 | mSoundPopUp = new QPopupMenu( this ); | 76 | mSoundPopUp = new QPopupMenu( this ); |
72 | mPausePopUp = new QPopupMenu( this ); | 77 | mPausePopUp = new QPopupMenu( this ); |
73 | QPopupMenu* savePopUp = new QPopupMenu( this ); | 78 | QPopupMenu* savePopUp = new QPopupMenu( this ); |
74 | savePopUp->insertItem( "Save", 0 ); | 79 | savePopUp->insertItem( "Save", 0 ); |
75 | savePopUp->insertItem( "Load", 1 ); | 80 | savePopUp->insertItem( "Load", 1 ); |
@@ -310,13 +315,13 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& ) | |||
310 | } else { | 315 | } else { |
311 | //qDebug("-----system command %s ",tempfilename.latin1() ); | 316 | //qDebug("-----system command %s ",tempfilename.latin1() ); |
312 | if ( vfork () == 0 ) { | 317 | if ( vfork () == 0 ) { |
313 | execl ( tempfilename.latin1(), 0 ); | 318 | execl ( tempfilename.latin1(), 0 ); |
314 | return; | 319 | return; |
315 | } | 320 | } |
316 | QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); | 321 | QTimer::singleShot( 5000, this, SLOT ( writeFile() ) ); |
317 | return; | 322 | return; |
318 | } | 323 | } |
319 | 324 | ||
320 | //qDebug("+++++++system command %s ",tempfilename.latin1() ); | 325 | //qDebug("+++++++system command %s ",tempfilename.latin1() ); |
321 | } | 326 | } |
322 | if ( mess.left( 11 ) == "audio_alarm") { | 327 | if ( mess.left( 11 ) == "audio_alarm") { |
@@ -336,13 +341,13 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& ) | |||
336 | //qDebug("audio file command %s ",tempfilename.latin1() ); | 341 | //qDebug("audio file command %s ",tempfilename.latin1() ); |
337 | } | 342 | } |
338 | if ( mess.left( 9 ) == "cal_alarm") { | 343 | if ( mess.left( 9 ) == "cal_alarm") { |
339 | mAlarmMessage = mess.mid( 9 ) ; | 344 | mAlarmMessage = mess.mid( 9 ) ; |
340 | } | 345 | } |
341 | 346 | ||
342 | QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); | 347 | QTimer::singleShot( 5000, this, SLOT ( writeFile() ) ); |
343 | startAlarm( mAlarmMessage, filename ); | 348 | startAlarm( mAlarmMessage, filename ); |
344 | 349 | ||
345 | } | 350 | } |
346 | 351 | ||
347 | int SimpleAlarmDaemonImpl::getFileNameLen( QString mess ) | 352 | int SimpleAlarmDaemonImpl::getFileNameLen( QString mess ) |
348 | { | 353 | { |
@@ -639,13 +644,13 @@ void SimpleAlarmDaemonImpl::ringSync() | |||
639 | void SimpleAlarmDaemonImpl::newCountdown() | 644 | void SimpleAlarmDaemonImpl::newCountdown() |
640 | { | 645 | { |
641 | //recieve("cal_alarm", 10 ); | 646 | //recieve("cal_alarm", 10 ); |
642 | } | 647 | } |
643 | void SimpleAlarmDaemonImpl::simulate() | 648 | void SimpleAlarmDaemonImpl::simulate() |
644 | { | 649 | { |
645 | QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); | 650 | QTimer::singleShot( 5000, this, SLOT ( writeFile() ) ); |
646 | QString filename = getenv("QPEDIR") ; | 651 | QString filename = getenv("QPEDIR") ; |
647 | filename += "/pics/kdepim/korganizer/koalarm.wav"; | 652 | filename += "/pics/kdepim/korganizer/koalarm.wav"; |
648 | startAlarm("Alarm simulation", filename ); | 653 | startAlarm("Alarm simulation", filename ); |
649 | } | 654 | } |
650 | void SimpleAlarmDaemonImpl::showKO() | 655 | void SimpleAlarmDaemonImpl::showKO() |
651 | { | 656 | { |