author | zautrix <zautrix> | 2005-09-18 23:40:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-09-18 23:40:38 (UTC) |
commit | 2d346e4052fd726e657daee4ac3f2bcc7103f5fb (patch) (unidiff) | |
tree | 9952b888e0790bc032ba4e0c3c4165ec283a4139 /kalarmd | |
parent | 06ebec95579816144ee65981835e6e3482e20a28 (diff) | |
download | kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.zip kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.tar.gz kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.tar.bz2 |
wn
-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 | |||
@@ -252,6 +252,12 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
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_ |
@@ -270,8 +276,6 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
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 ); |
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index a0ac232..8ea8a73 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp | |||
@@ -68,4 +68,9 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) | |||
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 ); |
@@ -314,5 +319,5 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& ) | |||
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 | } |
@@ -340,5 +345,5 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& ) | |||
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 | ||
@@ -643,5 +648,5 @@ void SimpleAlarmDaemonImpl::newCountdown() | |||
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"; |