summaryrefslogtreecommitdiffabout
Side-by-side diff
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,33 +1,34 @@
Info about the changes in new versions of KDE-Pim/Pi
********** VERSION 2.0.26 ************
-And again fixed some bugs.
Added two more fields to the KA/Pi view config:
A "Mobile (home)" and a "Mobile (work)" field.
Fixed utf8 import (e.g. for Japaneese text) in KA/Pi.
+Some alarm applet enhancements, e.g. sound stops automatically if value of suspend spinbox changes.
+And again fixed some more small bugs.
********** VERSION 2.0.25 ************
And again fixed some bugs.
********** VERSION 2.0.24 ************
Fixed again a lot of small bugs.
Some performance optimizations in date navigator.
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.
********** VERSION 2.0.23 ************
Fixed again a lot of small and strange bugs, e.g. the missing toolbar of KA/Pi after a new installation.
Fixed the (agenda) layout of KO/Pi on 5500er.
Some usebility enhancements (e.g. reselection the current item of the todo view after some changes).
********** VERSION 2.0.22 ************
KO/Pi:
Fix for creating events/todos via the abgenda context menu.
Added option to split toolbar to 3 toolbars.
(Toolbar moving s disabled for this option due to a bug in Qt somewhere).
Added option to show one small filter-view-toolbar.
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index d72a8c2..1cda534 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -247,67 +247,68 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
int dw = QApplication::desktop()->width();
int dh = QApplication::desktop()->height();
setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
hide();
#ifndef _WIN32_
if ( fd_led > 0 ) {
statusLED.status = LED_SALARM_ON ;
ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
}
#endif
okbut->setDefault( true );
QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) );
// playSoundTimer->start( 1000, true );
return true;
}
void AlarmDialog::forceRepaint()
{
showNormal();
setActiveWindow();
raise();
+ mSuspendSpin->setFocus();
playSoundTimer->start( 1000, true );
}
void AlarmDialog::spinBoxChanged( int v )
{
okbut->setDefault( false );
mSilent = true;
}
void AlarmDialog::playSound ()
{
if (mStopAlarm )
return;
if ( mSilent )
return;
- showNormal();
+ //showNormal();
setActiveWindow();
- raise();
+ //raise();
mSuspendSpin->setFocus();
if ( alarmCounter < maxAlarmReplay && ! mSilent) {
++alarmCounter;
#ifdef DESKTOP_VERSION
mPlayWav = true;
#endif
if ( !mPlayWav || mFileName.length() < 2 ) {
#ifdef DESKTOP_VERSION
qDebug("Sound play not possible - file not found");
#else
Sound::soundAlarm ();
#endif
} else
{
#ifdef DESKTOP_VERSION
#ifdef _WIN32_
QSound::play ( mFileName );
#else
QString command = "playwave -r 22050 " + mFileName;
qDebug("KO: Playing file %s with 22kHz",mFileName.latin1() );
int ret = system ( command.latin1() );