-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 @@ -262,31 +262,42 @@ void Clock::changeClock( bool a ) void Clock::clearClock( void ) { lcd->display( QTime( 0, 0, 0 ).toString() ); aclock->display( QTime( 0, 0, 0 ) ); } +void Clock::startSWatch() +{ + 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() +{ + swatch_totalms += swatch_start.elapsed(); + set->setText( tr( "Start" ) ); + t->stop(); + swatch_running = FALSE; + toggleScreenSaver( TRUE ); + updateClock(); +} + + void Clock::slotSet() { if ( t->isActive() ) { - swatch_totalms += swatch_start.elapsed(); - set->setText( tr( "Start" ) ); - t->stop(); - swatch_running = FALSE; - toggleScreenSaver( TRUE ); - updateClock(); + 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(); } } void Clock::slotReset() { t->stop(); @@ -598,38 +609,32 @@ void Clock::slotAdjustTime() QCopEnvelope e( "QPE/System", "execute(QString)" ); e << QString( "systemtime" ); } void Clock::slotStartTimer() { - Config cfg( "Clock" ); - cfg.setGroup( "Mode" ); - int mode = cfg.readBoolEntry( "clockMode"); if ( clockRB->isChecked() ) setSwatchMode( 1); - slotSet(); + startSWatch(); } void Clock::slotStopTimer() { - Config cfg( "Clock" ); - cfg.setGroup( "Mode" ); - int mode = cfg.readBoolEntry( "clockMode"); if ( clockRB->isChecked() ) setSwatchMode( 1); -slotSet(); + stopSWatch(); } void Clock::slotResetTimer() { if ( clockRB->isChecked() ) setSwatchMode( 1); slotReset(); } void Clock::setSwatchMode(int mode) { - qDebug("Clock::setSwatchMode( %d)"), mode; + qDebug("Clock::setSwatchMode( %d)", mode); swatchRB->setChecked( mode); clearClock( ); 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 @@ -97,10 +97,12 @@ private: QTime swatch_start; int swatch_totalms; bool swatch_running; bool ampm; void clearClock(); void clearTimer(); + void startSWatch(); + void stopSWatch(); }; #endif |