author | zautrix <zautrix> | 2005-04-08 23:40:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-08 23:40:38 (UTC) |
commit | a74c23d91e80343cd1ccfd1fe712958fad1d5891 (patch) (unidiff) | |
tree | 2dc90dffe822e1425ace17cdbf9e420fa0be6ac7 /kalarmd/alarmdialog.cpp | |
parent | c4bab697d650c249cdff45b753b9e6df2a817877 (diff) | |
download | kdepimpi-a74c23d91e80343cd1ccfd1fe712958fad1d5891.zip kdepimpi-a74c23d91e80343cd1ccfd1fe712958fad1d5891.tar.gz kdepimpi-a74c23d91e80343cd1ccfd1fe712958fad1d5891.tar.bz2 |
ad fix
-rw-r--r-- | kalarmd/alarmdialog.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index 65073f6..d72a8c2 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp | |||
@@ -98,7 +98,7 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
98 | layout->addWidget ( mMissedAlarmsCombo ); | 98 | layout->addWidget ( mMissedAlarmsCombo ); |
99 | 99 | ||
100 | QLabel* labb = new QLabel("Suspend duration (minutes):",this); | 100 | QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this); |
101 | labb->setAlignment(AlignCenter); | 101 | labb->setAlignment(AlignCenter); |
102 | layout->addWidget ( labb ); | 102 | //layout->addWidget ( labb ); |
103 | fo = font(); | 103 | fo = font(); |
104 | int pointSize = 36; | 104 | int pointSize = 36; |
@@ -120,4 +120,5 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
120 | QHBoxLayout* layoutSpin = new QHBoxLayout( layout ); | 120 | QHBoxLayout* layoutSpin = new QHBoxLayout( layout ); |
121 | layoutSpin->addStretch (); | 121 | layoutSpin->addStretch (); |
122 | layoutSpin->addWidget ( labb ); | ||
122 | layoutSpin->addWidget ( mSuspendSpin ); | 123 | layoutSpin->addWidget ( mSuspendSpin ); |
123 | layoutSpin->addStretch (); | 124 | layoutSpin->addStretch (); |
@@ -130,5 +131,5 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
130 | mSuspendButton = new QPushButton( "Suspend", bbox); | 131 | mSuspendButton = new QPushButton( "Suspend", bbox); |
131 | QPushButton* silen = new QPushButton( " Stop sound ", bbox); | 132 | QPushButton* silen = new QPushButton( " Stop sound ", bbox); |
132 | QPushButton* okbut = new QPushButton( "Ok", bbox); | 133 | okbut = new QPushButton( "Ok", bbox); |
133 | mSuspendButton->setFont( fo ); | 134 | mSuspendButton->setFont( fo ); |
134 | silen->setFont( fo ); | 135 | silen->setFont( fo ); |
@@ -242,14 +243,10 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
242 | mMissedAlarmsCombo->hide(); | 243 | mMissedAlarmsCombo->hide(); |
243 | mMessage->setText(mess); | 244 | mMessage->setText(mess); |
244 | int w =sizeHint().width() ; | 245 | int w = minimumSizeHint().width() ; |
245 | int h = sizeHint().height() ; | 246 | int h = minimumSizeHint().height() ; |
246 | int dw = QApplication::desktop()->width(); | 247 | int dw = QApplication::desktop()->width(); |
247 | int dh = QApplication::desktop()->height(); | 248 | int dh = QApplication::desktop()->height(); |
248 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 249 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
249 | show(); | 250 | hide(); |
250 | raise(); | ||
251 | //qApp->processEvents(); | ||
252 | //repaint(); | ||
253 | qApp->processEvents(); | ||
254 | 251 | ||
255 | #ifndef _WIN32_ | 252 | #ifndef _WIN32_ |
@@ -259,11 +256,23 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
259 | } | 256 | } |
260 | #endif | 257 | #endif |
261 | playSoundTimer->start( 1000, true ); | 258 | okbut->setDefault( true ); |
259 | QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) ); | ||
260 | // playSoundTimer->start( 1000, true ); | ||
262 | return true; | 261 | return true; |
263 | 262 | ||
264 | } | 263 | } |
265 | 264 | ||
266 | void AlarmDialog::spinBoxChanged( int ) | 265 | void AlarmDialog::forceRepaint() |
267 | { | 266 | { |
267 | |||
268 | showNormal(); | ||
269 | setActiveWindow(); | ||
270 | raise(); | ||
271 | playSoundTimer->start( 1000, true ); | ||
272 | |||
273 | } | ||
274 | void AlarmDialog::spinBoxChanged( int v ) | ||
275 | { | ||
276 | okbut->setDefault( false ); | ||
268 | mSilent = true; | 277 | mSilent = true; |
269 | } | 278 | } |
@@ -280,7 +289,4 @@ void AlarmDialog::playSound () | |||
280 | raise(); | 289 | raise(); |
281 | mSuspendSpin->setFocus(); | 290 | mSuspendSpin->setFocus(); |
282 | |||
283 | |||
284 | qApp->processEvents(); | ||
285 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { | 291 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { |
286 | ++alarmCounter; | 292 | ++alarmCounter; |