author | sandman <sandman> | 2002-06-09 23:42:42 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-09 23:42:42 (UTC) |
commit | 1c56ab829f04ea5b127c1c632cec330e47bca524 (patch) (side-by-side diff) | |
tree | 30f0bd7c2d124cbf2dc41f32234922d2f3be19a7 /core/pim/datebook/datebook.cpp | |
parent | 25d084dd1a4b69cefcf16a889f22feb39d60f541 (diff) | |
download | opie-1c56ab829f04ea5b127c1c632cec330e47bca524.zip opie-1c56ab829f04ea5b127c1c632cec330e47bca524.tar.gz opie-1c56ab829f04ea5b127c1c632cec330e47bca524.tar.bz2 |
Fixed a counter bug in alarm timer loop.
Diffstat (limited to 'core/pim/datebook/datebook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 8614b3f..2c2965e 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp @@ -78,13 +78,14 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) : QMainWindow( parent, "datebook", f ), aPreset( FALSE ), presetTime( -1 ), startTime( 8 ), // an acceptable default syncing(FALSE), - inSearch(FALSE) + inSearch(FALSE), + alarmCounter(0) { QTime t; t.start(); db = new DateBookDBHack; qDebug("loading db t=%d", t.elapsed() ); loadSettings(); @@ -611,12 +612,13 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data) } } } if ( found ) { if ( bSound ) { Sound::soundAlarm(); + alarmCounter = 0; stopTimer = startTimer( 5000 ); } QDialog dlg( this, 0, TRUE ); QVBoxLayout *vb = new QVBoxLayout( &dlg ); QScrollView *view = new QScrollView( &dlg, "scrollView"); @@ -680,20 +682,18 @@ void DateBook::flush() syncing = TRUE; db->save(); } void DateBook::timerEvent( QTimerEvent *e ) { - static int stop = 0; - if ( stop < 10 ) { + if ( alarmCounter < 10 ) { + alarmCounter++; Sound::soundAlarm(); - stop++; - } else { - stop = 0; + } + else killTimer( e->timerId() ); - } } void DateBook::changeClock( bool newClock ) { ampm = newClock; // repaint the affected objects... |