-rw-r--r-- | noncore/tools/clock/clock.cpp | 39 |
1 files changed, 22 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 | |||
@@ -262,31 +262,42 @@ void Clock::changeClock( bool a ) | |||
262 | void Clock::clearClock( void ) | 262 | void Clock::clearClock( void ) |
263 | { | 263 | { |
264 | lcd->display( QTime( 0, 0, 0 ).toString() ); | 264 | lcd->display( QTime( 0, 0, 0 ).toString() ); |
265 | aclock->display( QTime( 0, 0, 0 ) ); | 265 | aclock->display( QTime( 0, 0, 0 ) ); |
266 | } | 266 | } |
267 | 267 | ||
268 | void Clock::slotSet() | 268 | void Clock::startSWatch() |
269 | { | 269 | { |
270 | if ( t->isActive() ) | 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() | ||
271 | { | 279 | { |
272 | swatch_totalms += swatch_start.elapsed(); | 280 | swatch_totalms += swatch_start.elapsed(); |
273 | set->setText( tr( "Start" ) ); | 281 | set->setText( tr( "Start" ) ); |
274 | t->stop(); | 282 | t->stop(); |
275 | swatch_running = FALSE; | 283 | swatch_running = FALSE; |
276 | toggleScreenSaver( TRUE ); | 284 | toggleScreenSaver( TRUE ); |
277 | updateClock(); | 285 | updateClock(); |
278 | } | 286 | } |
287 | |||
288 | |||
289 | void Clock::slotSet() | ||
290 | { | ||
291 | if ( t->isActive() ) | ||
292 | { | ||
293 | startSWatch(); | ||
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 | ||
290 | void Clock::slotReset() | 301 | void Clock::slotReset() |
291 | { | 302 | { |
292 | t->stop(); | 303 | t->stop(); |
@@ -598,38 +609,32 @@ void Clock::slotAdjustTime() | |||
598 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 609 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
599 | e << QString( "systemtime" ); | 610 | e << QString( "systemtime" ); |
600 | } | 611 | } |
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() |
623 | { | 628 | { |
624 | if ( clockRB->isChecked() ) | 629 | if ( clockRB->isChecked() ) |
625 | setSwatchMode( 1); | 630 | setSwatchMode( 1); |
626 | slotReset(); | 631 | slotReset(); |
627 | } | 632 | } |
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 ); |
635 | } | 640 | } |