-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | kalarmd/alarmdialog.cpp | 5 |
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,41 +1,42 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.26 ************ | 3 | ********** VERSION 2.0.26 ************ |
4 | 4 | ||
5 | And again fixed some bugs. | ||
6 | Added two more fields to the KA/Pi view config: | 5 | Added two more fields to the KA/Pi view config: |
7 | A "Mobile (home)" and a "Mobile (work)" field. | 6 | A "Mobile (home)" and a "Mobile (work)" field. |
8 | Fixed utf8 import (e.g. for Japaneese text) in KA/Pi. | 7 | Fixed utf8 import (e.g. for Japaneese text) in KA/Pi. |
9 | 8 | ||
9 | Some alarm applet enhancements, e.g. sound stops automatically if value of suspend spinbox changes. | ||
10 | And again fixed some more small bugs. | ||
10 | 11 | ||
11 | ********** VERSION 2.0.25 ************ | 12 | ********** VERSION 2.0.25 ************ |
12 | 13 | ||
13 | And again fixed some bugs. | 14 | And again fixed some bugs. |
14 | 15 | ||
15 | ********** VERSION 2.0.24 ************ | 16 | ********** VERSION 2.0.24 ************ |
16 | 17 | ||
17 | Fixed again a lot of small bugs. | 18 | Fixed again a lot of small bugs. |
18 | Some performance optimizations in date navigator. | 19 | Some performance optimizations in date navigator. |
19 | Month 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 | Month 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 ************ |
22 | 23 | ||
23 | Fixed again a lot of small and strange bugs, e.g. the missing toolbar of KA/Pi after a new installation. | 24 | Fixed again a lot of small and strange bugs, e.g. the missing toolbar of KA/Pi after a new installation. |
24 | Fixed the (agenda) layout of KO/Pi on 5500er. | 25 | Fixed the (agenda) layout of KO/Pi on 5500er. |
25 | Some usebility enhancements (e.g. reselection the current item of the todo view after some changes). | 26 | Some usebility enhancements (e.g. reselection the current item of the todo view after some changes). |
26 | 27 | ||
27 | ********** VERSION 2.0.22 ************ | 28 | ********** VERSION 2.0.22 ************ |
28 | 29 | ||
29 | KO/Pi: | 30 | KO/Pi: |
30 | Fix for creating events/todos via the abgenda context menu. | 31 | Fix for creating events/todos via the abgenda context menu. |
31 | Added option to split toolbar to 3 toolbars. | 32 | Added option to split toolbar to 3 toolbars. |
32 | (Toolbar moving s disabled for this option due to a bug in Qt somewhere). | 33 | (Toolbar moving s disabled for this option due to a bug in Qt somewhere). |
33 | Added option to show one small filter-view-toolbar. | 34 | Added option to show one small filter-view-toolbar. |
34 | Added a print option to the desktop version: | 35 | Added a print option to the desktop version: |
35 | Now you can print out the view of the "Event Viewer". | 36 | Now you can print out the view of the "Event Viewer". |
36 | That means you can print all data of one particular event/todo. | 37 | That means you can print all data of one particular event/todo. |
37 | Added scaling options to printout of Event Viewer and What'sNext View. | 38 | Added scaling options to printout of Event Viewer and What'sNext View. |
38 | Fixed some problems in the month view in "week start sunday" mode. | 39 | Fixed some problems in the month view in "week start sunday" mode. |
39 | KA/Pi: | 40 | KA/Pi: |
40 | Added two more config options. | 41 | Added two more config options. |
41 | Fixed resizing problem of address request dialog when orientation was switched. | 42 | Fixed resizing problem of address request dialog when orientation was switched. |
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index d72a8c2..1cda534 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp | |||
@@ -239,83 +239,84 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
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 ); |