author | llornkcor <llornkcor> | 2003-03-04 17:22:54 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-03-04 17:22:54 (UTC) |
commit | 55e5d2c95f70d296c541e4f2564713a593c3851c (patch) (unidiff) | |
tree | 63e2a6b4c8429baac265826e3695bd3e185afc07 /noncore/tools | |
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 | 47 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 2 |
2 files changed, 28 insertions, 21 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 | |||
@@ -265,25 +265,36 @@ void Clock::clearClock( void ) | |||
265 | aclock->display( QTime( 0, 0, 0 ) ); | 265 | aclock->display( QTime( 0, 0, 0 ) ); |
266 | } | 266 | } |
267 | 267 | ||
268 | void Clock::startSWatch() | ||
269 | { | ||
270 | swatch_start.start(); | ||
271 | set->setText( tr( "Stop" ) ); | ||
272 | t->start( 1000 ); | ||
273 | swatch_running = TRUE; | ||
274 | // disable screensaver while stop watch is running | ||
275 | toggleScreenSaver( FALSE ); | ||
276 | } | ||
277 | |||
278 | void Clock::stopSWatch() | ||
279 | { | ||
280 | swatch_totalms += swatch_start.elapsed(); | ||
281 | set->setText( tr( "Start" ) ); | ||
282 | t->stop(); | ||
283 | swatch_running = FALSE; | ||
284 | toggleScreenSaver( TRUE ); | ||
285 | updateClock(); | ||
286 | } | ||
287 | |||
288 | |||
268 | void Clock::slotSet() | 289 | void Clock::slotSet() |
269 | { | 290 | { |
270 | if ( t->isActive() ) | 291 | if ( t->isActive() ) |
271 | { | 292 | { |
272 | swatch_totalms += swatch_start.elapsed(); | 293 | startSWatch(); |
273 | set->setText( tr( "Start" ) ); | ||
274 | t->stop(); | ||
275 | swatch_running = FALSE; | ||
276 | toggleScreenSaver( TRUE ); | ||
277 | updateClock(); | ||
278 | } | 294 | } |
279 | else | 295 | else |
280 | { | 296 | { |
281 | swatch_start.start(); | 297 | stopSWatch(); |
282 | set->setText( tr( "Stop" ) ); | ||
283 | t->start( 1000 ); | ||
284 | swatch_running = TRUE; | ||
285 | // disable screensaver while stop watch is running | ||
286 | toggleScreenSaver( FALSE ); | ||
287 | } | 298 | } |
288 | } | 299 | } |
289 | 300 | ||
@@ -601,22 +612,16 @@ void Clock::slotAdjustTime() | |||
601 | 612 | ||
602 | void Clock::slotStartTimer() | 613 | void Clock::slotStartTimer() |
603 | { | 614 | { |
604 | Config cfg( "Clock" ); | ||
605 | cfg.setGroup( "Mode" ); | ||
606 | int mode = cfg.readBoolEntry( "clockMode"); | ||
607 | if ( clockRB->isChecked() ) | 615 | if ( clockRB->isChecked() ) |
608 | setSwatchMode( 1); | 616 | setSwatchMode( 1); |
609 | slotSet(); | 617 | startSWatch(); |
610 | } | 618 | } |
611 | 619 | ||
612 | void Clock::slotStopTimer() | 620 | void Clock::slotStopTimer() |
613 | { | 621 | { |
614 | Config cfg( "Clock" ); | ||
615 | cfg.setGroup( "Mode" ); | ||
616 | int mode = cfg.readBoolEntry( "clockMode"); | ||
617 | if ( clockRB->isChecked() ) | 622 | if ( clockRB->isChecked() ) |
618 | setSwatchMode( 1); | 623 | setSwatchMode( 1); |
619 | slotSet(); | 624 | stopSWatch(); |
620 | } | 625 | } |
621 | 626 | ||
622 | void Clock::slotResetTimer() | 627 | void Clock::slotResetTimer() |
@@ -628,7 +633,7 @@ slotReset(); | |||
628 | 633 | ||
629 | void Clock::setSwatchMode(int mode) | 634 | void Clock::setSwatchMode(int mode) |
630 | { | 635 | { |
631 | qDebug("Clock::setSwatchMode( %d)"), mode; | 636 | qDebug("Clock::setSwatchMode( %d)", mode); |
632 | swatchRB->setChecked( mode); | 637 | swatchRB->setChecked( mode); |
633 | clearClock( ); | 638 | clearClock( ); |
634 | modeSelect( mode ); | 639 | modeSelect( 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 | |||
@@ -100,6 +100,8 @@ private: | |||
100 | bool ampm; | 100 | bool ampm; |
101 | void clearClock(); | 101 | void clearClock(); |
102 | void clearTimer(); | 102 | void clearTimer(); |
103 | void startSWatch(); | ||
104 | void stopSWatch(); | ||
103 | }; | 105 | }; |
104 | 106 | ||
105 | #endif | 107 | #endif |