fix goofiness with s watch

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
@@ -106,318 +106,332 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
   date->setFont( QFont( "Helvetica", 14, QFont::Bold ) );
   date->setText( TimeString::longDateString( QDate::currentDate() ) );
 
   QWidget *controls = new QWidget( this );
   QGridLayout *gl = new QGridLayout( controls, 3, 2, 6, 4 );
 
   QButtonGroup *grp = new QButtonGroup( controls );
   grp->setRadioButtonExclusive( true );
   grp->hide();
 
   clockRB = new QRadioButton ( tr( "Clock" ), controls );
   gl->addWidget( clockRB, 0, 0 );
   grp->insert( clockRB );
 
   swatchRB = new QRadioButton ( tr( "Stopwatch" ), controls );
   gl->addWidget( swatchRB, 1, 0 );
   grp->insert( swatchRB );
 
   connect( grp, SIGNAL( clicked( int ) ), this, SLOT( modeSelect( int ) ) );
   grp->setButton( 0 );
 
   set = new QPushButton ( controls );
   set->setMaximumSize( 50, 30 );
   gl->addWidget( set , 0, 1 );
   set->setText( tr( "Start" ) );
   set->setEnabled( FALSE );
   grp->insert( set );
 
   reset = new QPushButton ( controls );
   gl->addWidget( reset, 1, 1 );
   reset->setText( tr( "Reset" ) );
   reset->setEnabled( FALSE );
   grp->insert( reset );
 
   alarmOffBtn = new QPushButton ( controls );
   gl->addWidget( alarmOffBtn, 0, 2 );
 
   alarmBtn = new QPushButton ( controls );
   gl->addWidget( alarmBtn, 1, 2 );
 
   alarmBtn->setText( tr( "Set Alarm" ) );
 
   OClickableLabel *click = new OClickableLabel( controls, "label" );
   click->setText( tr( "Set date and time." ) );
   gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter );
   connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) );
 
   connect( set , SIGNAL( pressed() ), SLOT( slotSet() ) );
   connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) );
 
   connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) );
   connect( snoozeBtn, SIGNAL( clicked() ), SLOT( slotSnooze() ) );
   connect( alarmOffBtn, SIGNAL( clicked() ), SLOT( slotToggleAlarm() ) );
 
   connect( qApp, SIGNAL( appMessage( const QCString&, const QByteArray& ) ),
            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
 
   t = new QTimer( this );
   connect( t, SIGNAL( timeout() ), SLOT( updateClock() ) );
   t->start( 1000 );
 
   connect( qApp, SIGNAL( timeChanged() ), SLOT( updateClock() ) );
 
   swatch_running = FALSE;
   swatch_totalms = 0;
 
   connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( changeClock( bool ) ) );
 
 
   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();
 		}
   else
 		{
 			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);
+  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() ) );
 		}
   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() ) );
 		}
 }
 
 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()
 {
+   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()
 {
+   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();
 		}
   else
 		{
 				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 )
+  if ( m != 0 )
 		{
 			lcd->setNumDigits( 8 + 1 + sw_prec );
 			lcd->setMinimumWidth( lcd->sizeHint().width() );
 			set->setEnabled( TRUE );
 			reset->setEnabled( TRUE );
 			ampmLabel->hide();
 
-			if ( !swatch_running )
-				t->stop();
+//      if(m == 2) {
+         if ( !swatch_running ) {
+          t->start( 1000 );
 		}
-  else
+//          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 ) {
     Config config( "qpe" );
     config.setGroup( "Time" );
     QString tmp;
     hour = setAlarmDlg->Hour_Slider->value();
     minute = setAlarmDlg->Minute_Slider->value();
     snoozeTime = setAlarmDlg->SnoozeSlider->value();
     if ( ampm ) {
       if ( hour == 12 )
         hour = 0;
 
       if ( setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 )
         hour += 12;
     }
     config.writeEntry( "clockAlarmHour", tmp.setNum( hour ), 10 );
     config.writeEntry( "clockAlarmMinute", tmp.setNum( minute ), 10 );
     config.writeEntry( "clockAlarmSnooze", tmp.setNum( snoozeTime ), 10 );
     config.write();
   }
 }
 
 void Clock::slotSnooze()
 {
   bSound = FALSE;
   int warn = 0;
   QTime t = QTime::currentTime();
   QDateTime whenl( when.date(), t.addSecs( snoozeTime * 60 ) );
   when = whenl;
   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();
 		}
   else
 		{
 			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;
   QDateTime whenl( d, tm );
   when = whenl;
   AlarmServer::addAlarm( when,
                          "QPE/Application/clock",
                          "alarm(QDateTime,int)", warn );
   setCaption( "Alarm set: " + whenl.toString() );
 }