| -rw-r--r-- | noncore/tools/clock/clock.cpp | 380 |
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 @@ -60,7 +60,7 @@ 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", "" ); } @@ -185,13 +185,13 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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(); + } @@ -201,4 +201,5 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) cfg.setGroup( "Mode" ); - int mode = cfg.readBoolEntry( "clockMode");setSwatchMode( mode); - modeSelect( mode); + int mode = cfg.readBoolEntry( "clockMode"); + setSwatchMode( mode); + modeSelect( mode); } @@ -213,42 +214,42 @@ 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() ) ); + } } @@ -269,8 +270,13 @@ 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 ); } @@ -279,8 +285,9 @@ 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(); } @@ -291,9 +298,9 @@ void Clock::slotSet() if ( t->isActive() ) - { - startSWatch(); - } + { + startSWatch(); + } else - { - stopSWatch(); - } + { + stopSWatch(); + } } @@ -314,26 +321,33 @@ 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(); @@ -389,17 +403,17 @@ void Clock::slotToggleAlarm() 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(); @@ -437,6 +451,6 @@ 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" ); } @@ -450,32 +464,32 @@ void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) 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(); + } @@ -491,13 +505,13 @@ void Clock::timerEvent( QTimerEvent *e ) 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." ) ); + } } @@ -527,18 +541,18 @@ void AnalogClock::drawContents( QPainter *p ) 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 ); + } @@ -564,3 +578,3 @@ void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, c 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 ); @@ -572,3 +586,3 @@ void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, c if ( !t2 || ( t. minute ( ) != t2-> minute ( ))) { - // draw minute pointer + // draw minute pointer m1 = rotate( center, m1, t.minute() * 6 ); @@ -580,3 +594,3 @@ void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, c if ( !t2 || ( t. second ( ) != t2-> second ( ))) { - // draw second pointer + // draw second pointer s1 = rotate( center, s1, t.second() * 6 ); @@ -615,4 +629,4 @@ void Clock::slotStartTimer() if ( clockRB->isChecked() ) - setSwatchMode( 1); - startSWatch(); + setSwatchMode( 1); + startSWatch(); } @@ -622,4 +636,4 @@ void Clock::slotStopTimer() if ( clockRB->isChecked() ) - setSwatchMode( 1); - stopSWatch(); + setSwatchMode( 1); + stopSWatch(); } @@ -629,3 +643,3 @@ void Clock::slotResetTimer() if ( clockRB->isChecked() ) - setSwatchMode( 1); + setSwatchMode( 1); slotReset(); @@ -635,6 +649,6 @@ 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 ); } |