fix goofiness with s watch

1 files changed, 197 insertions, 183 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
@@ -49,29 +49,29 @@
 #include <math.h>
 #include <unistd.h>
 #include <sys/types.h>
 
 #include <pthread.h>
 
 
 const double deg2rad = 0.017453292519943295769; // pi/180
 const int sw_prec = 2;
 
 void startPlayer()
 {
-        Config config( "qpe" );
-        config.setGroup( "Time" );
-        sleep(15);
-        QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
-        e << config.readEntry( "mp3File", "" );
+  Config config( "qpe" );
+  config.setGroup( "Time" );
+  sleep(15);
+  QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
+  e << config.readEntry( "mp3File", "" );
 }
 
 
 static void toggleScreenSaver( bool on )
 {
   QCopEnvelope e( "QPE/System", "setScreenSaverMode(int)" );
   e << ( on ? QPEApplication::Enable : QPEApplication::DisableSuspend );
 }
 
 Clock::Clock( QWidget * parent, const char * name, WFlags f )
     : QVBox( parent, name , f )
 {
@@ -174,177 +174,191 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
 
   Config config( "qpe" );
   config.setGroup( "Time" );
   ampm = config.readBoolEntry( "AMPM", TRUE );
 
   QString tmp = config.readEntry( "clockAlarmHour", "" );
   bool ok;
   hour = tmp.toInt( &ok, 10 );
   tmp = config.readEntry( "clockAlarmMinute", "" );
   minute = tmp.toInt( &ok, 10 );
 
   if ( config.readEntry( "clockAlarmSet", "FALSE" ) == "TRUE" )
-                {
-                        alarmOffBtn->setText( tr( "Alarm Is On" ) );
-                        alarmBool = TRUE;
-                        snoozeBtn->show();
-                }
+    {
+      alarmOffBtn->setText( tr( "Alarm Is On" ) );
+      alarmBool = TRUE;
+      snoozeBtn->show();
+    }
   else
-                {
-                        alarmOffBtn->setText( tr( "Alarm Is Off" ) );
-                        alarmBool = FALSE;
-                        snoozeBtn->hide();
-                }
+    {
+      alarmOffBtn->setText( tr( "Alarm Is Off" ) );
+      alarmBool = FALSE;
+      snoozeBtn->hide();
+    }
 
   QTimer::singleShot( 0, this, SLOT( updateClock() ) );
 
   Config cfg( "Clock" );
   cfg.setGroup( "Mode" );
-        int mode = cfg.readBoolEntry( "clockMode");setSwatchMode( mode);
-        modeSelect( mode);
+  int mode = cfg.readBoolEntry( "clockMode");
+  setSwatchMode( mode);
+  modeSelect( mode);
 }
 
 Clock::~Clock()
 {
   toggleScreenSaver( true );
 }
 
 void Clock::updateClock()
 {
   if ( clockRB->isChecked() )
-                {
-                        QTime tm = QDateTime::currentDateTime().time();
-                        QString s;
-                        if ( ampm )
-                                {
-                                        int hour = tm.hour();
-                                        if ( hour == 0 )
-                                                hour = 12;
-                                        if ( hour > 12 )
-                                                hour -= 12;
-                                        s.sprintf( "%2d%c%02d", hour, ':', tm.minute() );
-                                        ampmLabel->setText( ( tm.hour() >= 12 ) ? "PM" : "AM" );
-                                        ampmLabel->show();
-                                }
-                        else
-                                {
-                                        s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() );
-                                        ampmLabel->hide();
-                                }
-                        lcd->display( s );
-                        lcd->repaint( FALSE );
-                        aclock->display( QTime::currentTime() );
-                        date->setText( TimeString::longDateString( QDate::currentDate() ) );
-                }
+    {
+      QTime tm = QDateTime::currentDateTime().time();
+      QString s;
+      if ( ampm )
+        {
+          int hour = tm.hour();
+          if ( hour == 0 )
+            hour = 12;
+          if ( hour > 12 )
+            hour -= 12;
+          s.sprintf( "%2d%c%02d", hour, ':', tm.minute() );
+          ampmLabel->setText( ( tm.hour() >= 12 ) ? "PM" : "AM" );
+          ampmLabel->show();
+        }
+      else
+        {
+          s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() );
+          ampmLabel->hide();
+        }
+      lcd->display( s );
+      lcd->repaint( FALSE );
+      aclock->display( QTime::currentTime() );
+      date->setText( TimeString::longDateString( QDate::currentDate() ) );
+    }
   else
-                {
-                        QTime swatch_time;
-                        QString lcdtext;
-                        int totalms = swatch_totalms;
-                        if ( swatch_running )
-                                totalms += swatch_start.elapsed();
-                        swatch_time = QTime( 0, 0, 0 ).addMSecs( totalms );
-                        QString d = swatch_running ? QString( "    " )
-                                                                        : QString::number( totalms % 1000 + 1000 );
-                        lcdtext = swatch_time.toString() + "." + d.right( 3 ).left( sw_prec );
-                        lcd->display( lcdtext );
-                        lcd->repaint( FALSE );
-                        aclock->display( swatch_time );
-                        date->setText( TimeString::longDateString( QDate::currentDate() ) );
-                }
+    {
+      QTime swatch_time;
+      QString lcdtext;
+      int totalms = swatch_totalms;
+      if ( swatch_running )
+        totalms += swatch_start.elapsed();
+      swatch_time = QTime( 0, 0, 0 ).addMSecs( totalms );
+      QString d = swatch_running ? QString( "    " )
+                  : QString::number( totalms % 1000 + 1000 );
+      lcdtext = swatch_time.toString() + "." + d.right( 3 ).left( sw_prec );
+      lcd->display( lcdtext );
+      lcd->repaint( FALSE );
+      aclock->display( swatch_time );
+      date->setText( TimeString::longDateString( QDate::currentDate() ) );
+    }
 }
 
 void Clock::changeClock( bool a )
 {
   ampm = a;
   updateClock();
 }
 
 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 );
+   if(swatch_running) {
+      stopSWatch();
+      return;
+   }
+   qDebug("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();
+   qDebug("stopSWatch()");
+    swatch_totalms += swatch_start.elapsed();
+    set->setText( tr( "Start" ) );
+    t->stop();
+    swatch_running = FALSE;
+    toggleScreenSaver( TRUE );
+    updateClock();
 }
 
 
 void Clock::slotSet()
 {
   if ( t->isActive() )
-                {
-                                startSWatch();
-                }
+    {
+        startSWatch();
+    }
   else
-                {
-                                stopSWatch();
-                }
+    {
+        stopSWatch();
+    }
 }
 
 void Clock::slotReset()
 {
   t->stop();
   swatch_start.start();
   swatch_totalms = 0;
 
   if ( swatch_running )
     t->start( 1000 );
 
   updateClock();
 }
 
 void Clock::modeSelect( int m )
 {
-        qDebug("Clock::modeSelect( %d) ", m);
-        if ( m )
-                {
-                        lcd->setNumDigits( 8 + 1 + sw_prec );
-                        lcd->setMinimumWidth( lcd->sizeHint().width() );
-                        set->setEnabled( TRUE );
-                        reset->setEnabled( TRUE );
-                        ampmLabel->hide();
-
-                        if ( !swatch_running )
-                                t->stop();
-                }
-  else
-                {
-                        lcd->setNumDigits( 5 );
-                        lcd->setMinimumWidth( lcd->sizeHint().width() );
-                        set->setEnabled( FALSE );
-                        reset->setEnabled( FALSE );
-                        t->start( 1000 );
-                }
-
-        Config config( "Clock" );
-        config.setGroup( "Mode" );
-        config.writeEntry( "clockMode", m );
+  qDebug("Clock::modeSelect( %d) ", m);
+  if ( m != 0 )
+    {
+      lcd->setNumDigits( 8 + 1 + sw_prec );
+      lcd->setMinimumWidth( lcd->sizeHint().width() );
+      set->setEnabled( TRUE );
+      reset->setEnabled( TRUE );
+      ampmLabel->hide();
+
+//      if(m == 2) {
+         if ( !swatch_running ) {
+          t->start( 1000 );
+         }
+//          else
+//          {
+//             stopSWatch();
+//          }
+//    }
+    }
+  else //clock mode
+    {
+      lcd->setNumDigits( 5 );
+      lcd->setMinimumWidth( lcd->sizeHint().width() );
+      set->setEnabled( FALSE );
+      reset->setEnabled( FALSE );
+      t->start( 1000 );
+    }
+
+  Config config( "Clock" );
+  config.setGroup( "Mode" );
+  config.writeEntry( "clockMode", m );
   updateClock();
 }
 
 //this sets the alarm time
 void Clock::slotSetAlarm()
 {
   if ( !snoozeBtn->isHidden() )
     slotToggleAlarm();
   Set_Alarm *setAlarmDlg;
   setAlarmDlg = new Set_Alarm( this, "SetAlarm", TRUE );
   int result = setAlarmDlg->exec();
   if ( result == 1 ) {
@@ -378,39 +392,39 @@ void Clock::slotSnooze()
   AlarmServer::addAlarm( when,
                          "QPE/Application/clock",
                          "alarm(QDateTime,int)", warn );
 
 }
 
 //toggles alarm on/off
 void Clock::slotToggleAlarm()
 {
   Config config( "qpe" );
   config.setGroup( "Time" );
   if ( alarmBool )
-                {
-                        config.writeEntry( "clockAlarmSet", "FALSE" );
-                        alarmOffBtn->setText( tr( "Alarm Is Off" ) );
-                        snoozeBtn->hide();
-                        alarmBool = FALSE;
-                        alarmOff();
-                }
+    {
+      config.writeEntry( "clockAlarmSet", "FALSE" );
+      alarmOffBtn->setText( tr( "Alarm Is Off" ) );
+      snoozeBtn->hide();
+      alarmBool = FALSE;
+      alarmOff();
+    }
   else
-                {
-                        config.writeEntry( "clockAlarmSet", "TRUE" );
-                        alarmOffBtn->setText( tr( "Alarm Is On" ) );
-                        snoozeBtn->show();
-                        alarmBool = TRUE;
-                        alarmOn();
-                }
+    {
+      config.writeEntry( "clockAlarmSet", "TRUE" );
+      alarmOffBtn->setText( tr( "Alarm Is On" ) );
+      snoozeBtn->show();
+      alarmBool = TRUE;
+      alarmOn();
+    }
   config.write();
 }
 
 void Clock::alarmOn()
 {
   QDate d = QDate::currentDate();
   QTime tm( ( int ) hour, ( int ) minute, 0 );
   qDebug( "Time set " + tm.toString() );
   QTime t = QTime::currentTime();
   if ( t > tm )
     d = d.addDays( 1 );
   int warn = 0;
@@ -426,89 +440,89 @@ void Clock::alarmOff()
 {
   int warn = 0;
   bSound = FALSE;
   AlarmServer::deleteAlarm( when,
                             "QPE/Application/clock",
                             "alarm(QDateTime,int)", warn );
   qDebug( "Alarm Off " + when.toString() );
   setCaption( "Clock" );
 }
 
 void Clock::clearTimer()
 {
-        alarmOffBtn->setText( tr( "Alarm Is Off" ) );
-        alarmBool = FALSE;
-        snoozeBtn->hide();
-        setCaption( "Clock" );
+  alarmOffBtn->setText( tr( "Alarm Is Off" ) );
+  alarmBool = FALSE;
+  snoozeBtn->hide();
+  setCaption( "Clock" );
 }
 
 void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ )
 {
   int stopTimer = 0;
   int timerStay = 5000;
   bSound = TRUE;
   qDebug( "Message received in clock" );
   if ( msg == "alarm(QDateTime,int)" )
-                {
-                        Config config( "qpe" );
-                        config.setGroup( "Time" );
-                        if ( config.readBoolEntry( "mp3Alarm", 0 ) )
-                                {
-                                        clearTimer();
-                                        pthread_t thread;
-                                        pthread_create(&thread, NULL,  (void * (*) (void *))startPlayer, NULL/* &*/);
-
-                                }
-                        else
-                                {
-
-                                        Sound::soundAlarm();
-                                        stopTimer = startTimer( timerStay );
-                                }
-                }
-
-        if ( msg == "timerStart()" )
-                {
-                        slotStartTimer();
-                }
-        if ( msg == "timerStop()" )
-                {
-                        slotStopTimer();
-                }
-        if ( msg == "timerReset()" )
-                {
-                        slotResetTimer();
-                }
+    {
+      Config config( "qpe" );
+      config.setGroup( "Time" );
+      if ( config.readBoolEntry( "mp3Alarm", 0 ) )
+        {
+          clearTimer();
+          pthread_t thread;
+          pthread_create(&thread, NULL,  (void * (*) (void *))startPlayer, NULL/* &*/);
+
+        }
+      else
+        {
+
+          Sound::soundAlarm();
+          stopTimer = startTimer( timerStay );
+        }
+    }
+
+  if ( msg == "timerStart()" )
+    {
+      slotStartTimer();
+    }
+  if ( msg == "timerStop()" )
+    {
+      slotStopTimer();
+    }
+  if ( msg == "timerReset()" )
+    {
+      slotResetTimer();
+    }
 
   show();
   raise();
   QPEApplication::setKeepRunning();
   setActiveWindow();
 }
 
 void Clock::timerEvent( QTimerEvent *e )
 {
   static int stop = 0;
   if ( stop < 120 && bSound )
-                {
-                        Sound::soundAlarm();
-                        stop++;
-                }
+    {
+      Sound::soundAlarm();
+      stop++;
+    }
   else
-                {
-                        stop = 0;
-                        killTimer( e->timerId() );
-                        clearTimer();
-                        setCaption( tr( "Clock: Alarm was missed." ) );
-                }
+    {
+      stop = 0;
+      killTimer( e->timerId() );
+      clearTimer();
+      setCaption( tr( "Clock: Alarm was missed." ) );
+    }
 }
 
 
 QSizePolicy AnalogClock::sizePolicy() const
 {
   return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 }
 
 void AnalogClock::drawContents( QPainter *p )
 {
   QRect r = contentsRect();
   QRect fr;
@@ -516,78 +530,78 @@ void AnalogClock::drawContents( QPainter *p )
   if ( r. width ( ) > r. height ( ))
     fr. setRect (( r. width ( ) - r. height ( )) / 2, r. y ( ), r. height ( ), r. height ( ));
   else
     fr. setRect ( r. x ( ), ( r. height ( ) - r. width ( )) / 2, r. width ( ), r. width ( ));
 
   QPoint center = fr. center ( ); // ( fr.x() + fr.width() / 2, fr.y() + fr.height() / 2 );
   QPoint l1 ( center. x ( ), fr. y ( ) + 2 );
   QPoint l2 ( center. x ( ), fr. y ( ) + 8 );
 
 
 
   if ( clear )
-                {
-                        erase ( r );
-                        p-> setPen ( NoPen );
-                        p-> setBrush ( colorGroup ( ). color ( QColorGroup::Base ));
-                        p-> drawEllipse ( fr );
-                        p-> setBrush ( NoBrush );
-
-                                // draw ticks
-                        p->setPen( QPen( colorGroup ( ). color ( QColorGroup::Text ), 1 ) );
-                        for ( int i = 0; i < 12; i++ )
-                                p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) );
-                }
+    {
+      erase ( r );
+      p-> setPen ( NoPen );
+      p-> setBrush ( colorGroup ( ). color ( QColorGroup::Base ));
+      p-> drawEllipse ( fr );
+      p-> setBrush ( NoBrush );
+
+        // draw ticks
+      p->setPen( QPen( colorGroup ( ). color ( QColorGroup::Text ), 1 ) );
+      for ( int i = 0; i < 12; i++ )
+        p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) );
+    }
   else
-                {
-                        drawPointers ( p, fr, colorGroup ( ). color ( QColorGroup::Base ), prevTime, &currTime );
-                }
+    {
+      drawPointers ( p, fr, colorGroup ( ). color ( QColorGroup::Base ), prevTime, &currTime );
+    }
 
   drawPointers ( p, fr, colorGroup ( ). color ( QColorGroup::Text ), currTime );
 
   prevTime = currTime;
 }
 
 void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 )
 {
   QPoint center = r. center ( );
 
   QPoint h1( center. x ( ), r. y ( ) + r. height ( ) / 4 );
   QPoint h2( center. x ( ), center. y ( ) );
 
   QPoint m1( center. x ( ), r.y() + r.height() / 8 );
   QPoint m2( center. x ( ), center. y ( ) );
 
   QPoint s1( center. x ( ), r. y ( ) + 8 );
   QPoint s2( center. x ( ), center. y ( ) );
 
 
   if ( !t2 || ( t. minute ( ) != t2-> minute ( ) || t. hour ( ) != t2-> hour ( ))) {
-                        // draw hour pointer
+      // draw hour pointer
     h1 = rotate( center, h1, 30 * ( t.hour() % 12 ) + t.minute() / 2 );
     h2 = rotate( center, h2, 30 * ( t.hour() % 12 ) + t.minute() / 2 );
     p-> setPen ( QPen ( c, 3 ));
     p-> drawLine ( h1, h2 );
   }
 
   if ( !t2 || ( t. minute ( ) != t2-> minute ( ))) {
-                        // draw minute pointer
+      // draw minute pointer
     m1 = rotate( center, m1, t.minute() * 6 );
     m2 = rotate( center, m2, t.minute() * 6 );
     p-> setPen ( QPen ( c, 2 ));
     p-> drawLine ( m1, m2 );
   }
 
   if ( !t2 || ( t. second ( ) != t2-> second ( ))) {
-                        // draw second pointer
+      // draw second pointer
     s1 = rotate( center, s1, t.second() * 6 );
     s2 = rotate( center, s2, t.second() * 6 );
     p-> setPen ( QPen ( c, 1 ));
     p-> drawLine ( s1, s2 );
   }
 }
 
 void AnalogClock::display( const QTime& t )
 {
   currTime = t;
   clear = false;
   repaint( false );
@@ -604,37 +618,37 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
   return QPoint( nx, ny );
 }
 
 void Clock::slotAdjustTime()
 {
   QCopEnvelope e( "QPE/System", "execute(QString)" );
   e << QString( "systemtime" );
 }
 
 void Clock::slotStartTimer()
 {
   if ( clockRB->isChecked() )
-                setSwatchMode( 1);
-        startSWatch();
+    setSwatchMode( 1);
+  startSWatch();
 }
 
 void Clock::slotStopTimer()
 {
   if ( clockRB->isChecked() )
-                setSwatchMode( 1);
-        stopSWatch();
+    setSwatchMode( 1);
+  stopSWatch();
 }
 
 void Clock::slotResetTimer()
 {
   if ( clockRB->isChecked() )
-                setSwatchMode( 1);
+    setSwatchMode( 1);
 slotReset();
 }
 
 void Clock::setSwatchMode(int mode)
 {
-        qDebug("Clock::setSwatchMode( %d)", mode);
-        swatchRB->setChecked( mode);
-        clearClock( );
-        modeSelect( mode );
+  qDebug("Clock::setSwatchMode( %d)", mode);
+  swatchRB->setChecked( mode);
+  clearClock( );
+  modeSelect( mode );
 }