summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--kalarmd/alarmdialog.cpp5
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 97c8154..be0d2b2 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,21 +1,22 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.26 ************ 3********** VERSION 2.0.26 ************
4 4
5And again fixed some bugs.
6Added two more fields to the KA/Pi view config: 5Added two more fields to the KA/Pi view config:
7A "Mobile (home)" and a "Mobile (work)" field. 6A "Mobile (home)" and a "Mobile (work)" field.
8Fixed utf8 import (e.g. for Japaneese text) in KA/Pi. 7Fixed utf8 import (e.g. for Japaneese text) in KA/Pi.
9 8
9Some alarm applet enhancements, e.g. sound stops automatically if value of suspend spinbox changes.
10And again fixed some more small bugs.
10 11
11********** VERSION 2.0.25 ************ 12********** VERSION 2.0.25 ************
12 13
13And again fixed some bugs. 14And again fixed some bugs.
14 15
15********** VERSION 2.0.24 ************ 16********** VERSION 2.0.24 ************
16 17
17Fixed again a lot of small bugs. 18Fixed again a lot of small bugs.
18Some performance optimizations in date navigator. 19Some performance optimizations in date navigator.
19Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row. 20Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row.
20 21
21********** VERSION 2.0.23 ************ 22********** VERSION 2.0.23 ************
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index d72a8c2..1cda534 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -259,43 +259,44 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
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
265void AlarmDialog::forceRepaint() 265void 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}
274void AlarmDialog::spinBoxChanged( int v ) 275void AlarmDialog::spinBoxChanged( int v )
275{ 276{
276 okbut->setDefault( false ); 277 okbut->setDefault( false );
277 mSilent = true; 278 mSilent = true;
278} 279}
279 280
280void AlarmDialog::playSound () 281void 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 ();