summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-03-26 13:18:35 (UTC)
committer llornkcor <llornkcor>2003-03-26 13:18:35 (UTC)
commit2b040bc1d3fafccfcb1d7773f005f038e1032277 (patch) (side-by-side diff)
tree4636b63e5e1562bc41ef47426d0ed38b27b68a3e
parenta651ef38fbd5a712261f8a40d0417e2ddb91b530 (diff)
downloadopie-2b040bc1d3fafccfcb1d7773f005f038e1032277.zip
opie-2b040bc1d3fafccfcb1d7773f005f038e1032277.tar.gz
opie-2b040bc1d3fafccfcb1d7773f005f038e1032277.tar.bz2
fix goofiness with s watch
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp24
1 files changed, 19 insertions, 5 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 0eb2b83..74b7147 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -201,3 +201,4 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
cfg.setGroup( "Mode" );
- int mode = cfg.readBoolEntry( "clockMode");setSwatchMode( mode);
+ int mode = cfg.readBoolEntry( "clockMode");
+ setSwatchMode( mode);
modeSelect( mode);
@@ -269,2 +270,7 @@ void Clock::startSWatch()
{
+ if(swatch_running) {
+ stopSWatch();
+ return;
+ }
+ qDebug("startSWatch()");
swatch_start.start();
@@ -279,2 +285,3 @@ void Clock::stopSWatch()
{
+ qDebug("stopSWatch()");
swatch_totalms += swatch_start.elapsed();
@@ -315,3 +322,3 @@ void Clock::modeSelect( int m )
qDebug("Clock::modeSelect( %d) ", m);
- if ( m )
+ if ( m != 0 )
{
@@ -323,6 +330,13 @@ void Clock::modeSelect( int m )
- if ( !swatch_running )
- t->stop();
+// if(m == 2) {
+ if ( !swatch_running ) {
+ t->start( 1000 );
}
- else
+// else
+// {
+// stopSWatch();
+// }
+// }
+ }
+ else //clock mode
{