attempt to fix bug 586 - new thread and sleep 15 sec for cards to mount for mp3 alarm

3 files changed, 457 insertions, 418 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 2f81c3a..0937362 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -49,2 +49,7 @@
 #include <math.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <pthread.h>
+
 
@@ -53,6 +58,16 @@ 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", "" );
+}
+
+
 static void toggleScreenSaver( bool on )
 {
-	QCopEnvelope e( "QPE/System", "setScreenSaverMode(int)" );
-	e << ( on ? QPEApplication::Enable : QPEApplication::DisableSuspend );
+  QCopEnvelope e( "QPE/System", "setScreenSaverMode(int)" );
+  e << ( on ? QPEApplication::Enable : QPEApplication::DisableSuspend );
 }
@@ -60,131 +75,131 @@ static void toggleScreenSaver( bool on )
 Clock::Clock( QWidget * parent, const char * name, WFlags f )
-		: QVBox( parent, name , f )
+    : QVBox( parent, name , f )
 {
-	setSpacing( 4 );
-	setMargin( 1 );
-
-	Config config( "qpe" );
-	config.setGroup( "Time" );
-	ampm = config.readBoolEntry( "AMPM", TRUE );
-
-
-	snoozeBtn = new QPushButton ( this );
-	snoozeBtn->setText( tr( "Snooze" ) );
-
-	aclock = new AnalogClock( this );
-	aclock->display( QTime::currentTime() );
-	aclock->setLineWidth( 2 );
-
-	QHBox *hb = new QHBox( this );
-	hb->setMargin( 0 );
-	QWidget *space = new QWidget( hb );
-	lcd = new QLCDNumber( hb );
-	lcd->setSegmentStyle( QLCDNumber::Flat );
-	lcd->setFrameStyle( QFrame::NoFrame );
-	lcd->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
-	lcd->setFixedHeight( 23 );
-
-	ampmLabel = new QLabel( tr( "PM" ), hb );
-	ampmLabel->setFont( QFont( "Helvetica", 14, QFont::Bold ) );
-	ampmLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ) );
-	ampmLabel->setAlignment( AlignLeft | AlignBottom );
-	space = new QWidget( hb );
-
-	date = new QLabel( this );
-	date->setAlignment( AlignHCenter | AlignVCenter );
-	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 );
-	//    alarmOffBtn->setMaximumSize(60,30);
-	gl->addWidget( alarmOffBtn, 0, 2 );
-
-	alarmBtn = new QPushButton ( controls );
-	//  alarmBtn->setMaximumSize(60,30);
-	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 ) ) );
-
-	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() ) );
-	modeSelect( 0 );
+  setSpacing( 4 );
+  setMargin( 1 );
+
+  Config config( "qpe" );
+  config.setGroup( "Time" );
+  ampm = config.readBoolEntry( "AMPM", TRUE );
+
+
+  snoozeBtn = new QPushButton ( this );
+  snoozeBtn->setText( tr( "Snooze" ) );
+
+  aclock = new AnalogClock( this );
+  aclock->display( QTime::currentTime() );
+  aclock->setLineWidth( 2 );
+
+  QHBox *hb = new QHBox( this );
+  hb->setMargin( 0 );
+  QWidget *space = new QWidget( hb );
+  lcd = new QLCDNumber( hb );
+  lcd->setSegmentStyle( QLCDNumber::Flat );
+  lcd->setFrameStyle( QFrame::NoFrame );
+  lcd->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
+  lcd->setFixedHeight( 23 );
+
+  ampmLabel = new QLabel( tr( "PM" ), hb );
+  ampmLabel->setFont( QFont( "Helvetica", 14, QFont::Bold ) );
+  ampmLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ) );
+  ampmLabel->setAlignment( AlignLeft | AlignBottom );
+  space = new QWidget( hb );
+
+  date = new QLabel( this );
+  date->setAlignment( AlignHCenter | AlignVCenter );
+  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 );
+  //    alarmOffBtn->setMaximumSize(60,30);
+  gl->addWidget( alarmOffBtn, 0, 2 );
+
+  alarmBtn = new QPushButton ( controls );
+  //  alarmBtn->setMaximumSize(60,30);
+  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 ) ) );
+
+  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() ) );
+  modeSelect( 0 );
 }
@@ -193,3 +208,3 @@ Clock::~Clock()
 {
-	toggleScreenSaver( true );
+  toggleScreenSaver( true );
 }
@@ -198,39 +213,39 @@ 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() ) );
-	}
+  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() ) );
+  }
 }
@@ -239,4 +254,4 @@ void Clock::changeClock( bool a )
 {
-	ampm = a;
-	updateClock();
+  ampm = a;
+  updateClock();
 }
@@ -245,4 +260,4 @@ void Clock::clearClock( void )
 {
-	lcd->display( QTime( 0, 0, 0 ).toString() );
-	aclock->display( QTime( 0, 0, 0 ) );
+  lcd->display( QTime( 0, 0, 0 ).toString() );
+  aclock->display( QTime( 0, 0, 0 ) );
 }
@@ -251,20 +266,20 @@ 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 );
-	}
+  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 );
+  }
 }
@@ -273,10 +288,10 @@ void Clock::slotReset()
 {
-	t->stop();
-	swatch_start.start();
-	swatch_totalms = 0;
+  t->stop();
+  swatch_start.start();
+  swatch_totalms = 0;
 
-	if ( swatch_running )
-		t->start( 1000 );
+  if ( swatch_running )
+    t->start( 1000 );
 
-	updateClock();
+  updateClock();
 }
@@ -285,22 +300,22 @@ 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();
+  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();
 }
@@ -310,26 +325,26 @@ 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();
-	}
+  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();
+  }
 }
@@ -338,10 +353,10 @@ 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 );
+  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 );
 
@@ -352,19 +367,19 @@ 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();
+  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();
 }
@@ -373,15 +388,15 @@ 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() );
+  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() );
 }
@@ -390,9 +405,17 @@ 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" );
+  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" );
 }
@@ -401,24 +424,42 @@ 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();
+  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();
+//          pid_t pid;
+//          switch(pid = fork())
+//            {
+//              case -1:
+//              {//failed
+//              }
+//              break;
+//              case 0:
+//              {//child
+//      QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
+//   e << config.readEntry( "mp3File", "" );
+        pthread_t thread;
+        pthread_create(&thread, NULL,  (void * (*) (void *))startPlayer, NULL/* &*/);
+//                startPlayer();    
+//              }
+//              break;
+//            };
+        
+    }
+  else
+    {
+
+      Sound::soundAlarm();
+      stopTimer = startTimer( timerStay );
+    }
+  }
+  show();
+  raise();
+  QPEApplication::setKeepRunning();
+  setActiveWindow();
 }
@@ -427,15 +468,13 @@ 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." ) );
-	}
+  static int stop = 0;
+  if ( stop < 120 && bSound ) {
+    Sound::soundAlarm();
+    stop++;
+  }
+  else {
+    stop = 0;
+    killTimer( e->timerId() );
+    clearTimer();
+    setCaption( tr( "Clock: Alarm was missed." ) );
+  }
 }
@@ -445,3 +484,3 @@ QSizePolicy AnalogClock::sizePolicy() const
 {
-	return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+  return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 }
@@ -450,35 +489,35 @@ 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;
+  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;
 }
@@ -487,37 +526,37 @@ void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, c
 {
-	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 );
-	}
+  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 );
+  }
 }
@@ -526,6 +565,6 @@ void AnalogClock::display( const QTime& t )
 {
-	currTime = t;
-	clear = false;
-	repaint( false );
-	clear = true;
+  currTime = t;
+  clear = false;
+  repaint( false );
+  clear = true;
 }
@@ -534,8 +573,8 @@ 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 );
+  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 );
 }
@@ -544,4 +583,4 @@ void Clock::slotAdjustTime()
 {
-	QCopEnvelope e( "QPE/System", "execute(QString)" );
-	e << QString( "systemtime" );
+  QCopEnvelope e( "QPE/System", "execute(QString)" );
+  e << QString( "systemtime" );
 }
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 092d84f..23cc143 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -82,3 +82,3 @@ private:
     void clearClock();
-
+    void clearTimer();
     bool alarmBool;
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 29dd52b..8b92118 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopie -lpthread
 INTERFACES  =
@@ -13,17 +13,17 @@ TARGET    = clock
 TRANSLATIONS = ../../../i18n/de/clock.ts \
-	 ../../../i18n/xx/clock.ts \
-	 ../../../i18n/en/clock.ts \
-	 ../../../i18n/es/clock.ts \
-	 ../../../i18n/fr/clock.ts \
-	 ../../../i18n/hu/clock.ts \
-	 ../../../i18n/ja/clock.ts \
-	 ../../../i18n/ko/clock.ts \
-	 ../../../i18n/no/clock.ts \
-	 ../../../i18n/pl/clock.ts \
-	 ../../../i18n/pt/clock.ts \
-	 ../../../i18n/pt_BR/clock.ts \
-	 ../../../i18n/sl/clock.ts \
-	 ../../../i18n/zh_CN/clock.ts \
-	 ../../../i18n/zh_TW/clock.ts \
-	 ../../../i18n/da/clock.ts
+   ../../../i18n/xx/clock.ts \
+   ../../../i18n/en/clock.ts \
+   ../../../i18n/es/clock.ts \
+   ../../../i18n/fr/clock.ts \
+   ../../../i18n/hu/clock.ts \
+   ../../../i18n/ja/clock.ts \
+   ../../../i18n/ko/clock.ts \
+   ../../../i18n/no/clock.ts \
+   ../../../i18n/pl/clock.ts \
+   ../../../i18n/pt/clock.ts \
+   ../../../i18n/pt_BR/clock.ts \
+   ../../../i18n/sl/clock.ts \
+   ../../../i18n/zh_CN/clock.ts \
+   ../../../i18n/zh_TW/clock.ts \
+   ../../../i18n/da/clock.ts