author | llornkcor <llornkcor> | 2003-03-04 17:22:54 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-03-04 17:22:54 (UTC) |
commit | 55e5d2c95f70d296c541e4f2564713a593c3851c (patch) (side-by-side diff) | |
tree | 63e2a6b4c8429baac265826e3695bd3e185afc07 | |
parent | ca913d1f2035b6ddb77be497516e4dfc2371e5b3 (diff) | |
download | opie-55e5d2c95f70d296c541e4f2564713a593c3851c.zip opie-55e5d2c95f70d296c541e4f2564713a593c3851c.tar.gz opie-55e5d2c95f70d296c541e4f2564713a593c3851c.tar.bz2 |
make timerStart called twice just reset, instead of stop
-rw-r--r-- | noncore/tools/clock/clock.cpp | 39 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 2 |
2 files changed, 24 insertions, 17 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index 9898332..0eb2b83 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp @@ -267,5 +267,13 @@ void Clock::clearClock( void ) -void Clock::slotSet() +void Clock::startSWatch() { - if ( t->isActive() ) + swatch_start.start(); + set->setText( tr( "Stop" ) ); + t->start( 1000 ); + swatch_running = TRUE; + // disable screensaver while stop watch is running + toggleScreenSaver( FALSE ); +} + +void Clock::stopSWatch() { @@ -278,10 +286,13 @@ void Clock::slotSet() } + + +void Clock::slotSet() +{ + if ( t->isActive() ) + { + startSWatch(); + } else { - swatch_start.start(); - set->setText( tr( "Stop" ) ); - t->start( 1000 ); - swatch_running = TRUE; - // disable screensaver while stop watch is running - toggleScreenSaver( FALSE ); + stopSWatch(); } @@ -603,8 +614,5 @@ void Clock::slotStartTimer() { - Config cfg( "Clock" ); - cfg.setGroup( "Mode" ); - int mode = cfg.readBoolEntry( "clockMode"); if ( clockRB->isChecked() ) setSwatchMode( 1); - slotSet(); + startSWatch(); } @@ -613,8 +621,5 @@ void Clock::slotStopTimer() { - Config cfg( "Clock" ); - cfg.setGroup( "Mode" ); - int mode = cfg.readBoolEntry( "clockMode"); if ( clockRB->isChecked() ) setSwatchMode( 1); -slotSet(); + stopSWatch(); } @@ -630,3 +635,3 @@ void Clock::setSwatchMode(int mode) { - qDebug("Clock::setSwatchMode( %d)"), mode; + qDebug("Clock::setSwatchMode( %d)", mode); swatchRB->setChecked( mode); diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h index 9b00e28..1e5aa2c 100644 --- a/noncore/tools/clock/clock.h +++ b/noncore/tools/clock/clock.h @@ -102,2 +102,4 @@ private: void clearTimer(); + void startSWatch(); + void stopSWatch(); }; |