small fix

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index d69c56f..2f81c3a 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -232,316 +232,316 @@ void Clock::updateClock()
 		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::slotSet()
 {
 	if ( t->isActive() ) {
 		swatch_totalms += swatch_start.elapsed();
 		set
 			->setText( tr( "Start" ) );
 		t->stop();
 		swatch_running = FALSE;
 		toggleScreenSaver( TRUE );
 		updateClock();
 	}
 	else {
 		swatch_start.start();
 		set
 			->setText( tr( "Stop" ) );
 		t->start( 1000 );
 		swatch_running = TRUE;
 		// disable screensaver while stop watch is running
 		toggleScreenSaver( FALSE );
 	}
 }
 
 void Clock::slotReset()
 {
 	t->stop();
 	swatch_start.start();
 	swatch_totalms = 0;
 
 	if ( swatch_running )
 		t->start( 1000 );
 
 	updateClock();
 }
 
 void Clock::modeSelect( int 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 );
 	}
 	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() );
 }
 
 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::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 ) ) {
 
 			QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
 			e << config.readEntry( "mp3File", "" );
 		}
 		else {
 
 			Sound::soundAlarm();
 			stopTimer = startTimer( timerStay );
 		}
 	}
 	show();
 	raise();
 	QPEApplication::setKeepRunning();
 	setActiveWindow();
 }
 
 void Clock::timerEvent( QTimerEvent *e )
 {
 	static int stop = 0;
 	if ( stop < 120 && bSound ) {
 		Sound::soundAlarm();
 		stop++;
 	}
 	else {
 		stop = 0;
 		killTimer( e->timerId() );
 		alarmOffBtn->setText( tr( "Alarm Is Off" ) );
 		alarmBool = FALSE;
 		snoozeBtn->hide();
 		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;
 
 	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 ) );
 	}
 	else {
 		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.x() + r.width() / 2, r.y() + r.height() / 2 );
+	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
 		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
 		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
 		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 );
 	clear = true;
 }
 
 QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
 {
 	double angle = deg2rad * ( - a + 180 );
 	double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) -
 	            ( p.y() - c.y() ) * sin( angle );
 	double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) +
 	            ( p.x() - c.x() ) * sin( angle );
 	return QPoint( nx, ny );
 }
 
 void Clock::slotAdjustTime()
 {
 	QCopEnvelope e( "QPE/System", "execute(QString)" );
 	e << QString( "systemtime" );
 }