-rw-r--r-- | noncore/tools/clock/clock.cpp | 171 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 15 |
2 files changed, 121 insertions, 65 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index 0937362..9898332 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp @@ -79,8 +79,4 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) setMargin( 1 ); - Config config( "qpe" ); - config.setGroup( "Time" ); - ampm = config.readBoolEntry( "AMPM", TRUE ); - snoozeBtn = new QPushButton ( this ); @@ -129,16 +125,10 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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 - ); + 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 ); @@ -149,10 +139,9 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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" ) ); @@ -162,6 +151,5 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) ); - connect( set - , SIGNAL( pressed() ), SLOT( slotSet() ) ); + connect( set , SIGNAL( pressed() ), SLOT( slotSet() ) ); connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) ); @@ -184,4 +172,9 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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; @@ -190,10 +183,12 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) minute = tmp.toInt( &ok, 10 ); - if ( config.readEntry( "clockAlarmSet", "FALSE" ) == "TRUE" ) { + if ( config.readEntry( "clockAlarmSet", "FALSE" ) == "TRUE" ) + { alarmOffBtn->setText( tr( "Alarm Is On" ) ); alarmBool = TRUE; snoozeBtn->show(); } - else { + else + { alarmOffBtn->setText( tr( "Alarm Is Off" ) ); alarmBool = FALSE; @@ -202,5 +197,9 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) QTimer::singleShot( 0, this, SLOT( updateClock() ) ); - modeSelect( 0 ); + + Config cfg( "Clock" ); + cfg.setGroup( "Mode" ); + int mode = cfg.readBoolEntry( "clockMode");setSwatchMode( mode); + modeSelect( mode); } @@ -212,8 +211,10 @@ Clock::~Clock() void Clock::updateClock() { - if ( clockRB->isChecked() ) { + if ( clockRB->isChecked() ) + { QTime tm = QDateTime::currentDateTime().time(); QString s; - if ( ampm ) { + if ( ampm ) + { int hour = tm.hour(); if ( hour == 0 ) @@ -225,5 +226,6 @@ void Clock::updateClock() ampmLabel->show(); } - else { + else + { s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() ); ampmLabel->hide(); @@ -234,5 +236,6 @@ void Clock::updateClock() date->setText( TimeString::longDateString( QDate::currentDate() ) ); } - else { + else + { QTime swatch_time; QString lcdtext; @@ -265,8 +268,8 @@ void Clock::clearClock( void ) void Clock::slotSet() { - if ( t->isActive() ) { + if ( t->isActive() ) + { swatch_totalms += swatch_start.elapsed(); - set - ->setText( tr( "Start" ) ); + set->setText( tr( "Start" ) ); t->stop(); swatch_running = FALSE; @@ -274,8 +277,8 @@ void Clock::slotSet() updateClock(); } - else { + else + { swatch_start.start(); - set - ->setText( tr( "Stop" ) ); + set->setText( tr( "Stop" ) ); t->start( 1000 ); swatch_running = TRUE; @@ -299,9 +302,10 @@ void Clock::slotReset() void Clock::modeSelect( int m ) { - if ( m ) { + qDebug("Clock::modeSelect( %d) ", m); + if ( m ) + { lcd->setNumDigits( 8 + 1 + sw_prec ); lcd->setMinimumWidth( lcd->sizeHint().width() ); - set - ->setEnabled( TRUE ); + set->setEnabled( TRUE ); reset->setEnabled( TRUE ); ampmLabel->hide(); @@ -310,12 +314,16 @@ void Clock::modeSelect( int m ) t->stop(); } - else { + else + { lcd->setNumDigits( 5 ); lcd->setMinimumWidth( lcd->sizeHint().width() ); - set - ->setEnabled( FALSE ); + set->setEnabled( FALSE ); reset->setEnabled( FALSE ); t->start( 1000 ); } + + Config config( "Clock" ); + config.setGroup( "Mode" ); + config.writeEntry( "clockMode", m ); updateClock(); } @@ -368,5 +376,6 @@ void Clock::slotToggleAlarm() Config config( "qpe" ); config.setGroup( "Time" ); - if ( alarmBool ) { + if ( alarmBool ) + { config.writeEntry( "clockAlarmSet", "FALSE" ); alarmOffBtn->setText( tr( "Alarm Is Off" ) ); @@ -375,5 +384,6 @@ void Clock::slotToggleAlarm() alarmOff(); } - else { + else + { config.writeEntry( "clockAlarmSet", "TRUE" ); alarmOffBtn->setText( tr( "Alarm Is On" ) ); @@ -427,5 +437,6 @@ void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) bSound = TRUE; qDebug( "Message received in clock" ); - if ( msg == "alarm(QDateTime,int)" ) { + if ( msg == "alarm(QDateTime,int)" ) + { Config config( "qpe" ); config.setGroup( "Time" ); @@ -433,21 +444,6 @@ void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) { 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; -// }; } @@ -459,4 +455,18 @@ void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) } } + + if ( msg == "timerStart()" ) + { + slotStartTimer(); + } + if ( msg == "timerStop()" ) + { + slotStopTimer(); + } + if ( msg == "timerReset()" ) + { + slotResetTimer(); + } + show(); raise(); @@ -468,9 +478,11 @@ void Clock::timerEvent( QTimerEvent *e ) { static int stop = 0; - if ( stop < 120 && bSound ) { + if ( stop < 120 && bSound ) + { Sound::soundAlarm(); stop++; } - else { + else + { stop = 0; killTimer( e->timerId() ); @@ -502,5 +514,6 @@ void AnalogClock::drawContents( QPainter *p ) - if ( clear ) { + if ( clear ) + { erase ( r ); p-> setPen ( NoPen ); @@ -514,5 +527,6 @@ void AnalogClock::drawContents( QPainter *p ) p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) ); } - else { + else + { drawPointers ( p, fr, colorGroup ( ). color ( QColorGroup::Base ), prevTime, &currTime ); } @@ -585,2 +599,37 @@ void Clock::slotAdjustTime() e << QString( "systemtime" ); } + +void Clock::slotStartTimer() +{ + Config cfg( "Clock" ); + cfg.setGroup( "Mode" ); + int mode = cfg.readBoolEntry( "clockMode"); + if ( clockRB->isChecked() ) + setSwatchMode( 1); + slotSet(); +} + +void Clock::slotStopTimer() +{ + Config cfg( "Clock" ); + cfg.setGroup( "Mode" ); + int mode = cfg.readBoolEntry( "clockMode"); + if ( clockRB->isChecked() ) + setSwatchMode( 1); +slotSet(); +} + +void Clock::slotResetTimer() +{ + if ( clockRB->isChecked() ) + setSwatchMode( 1); +slotReset(); +} + +void Clock::setSwatchMode(int mode) +{ + qDebug("Clock::setSwatchMode( %d)"), mode; + swatchRB->setChecked( mode); + clearClock( ); + modeSelect( mode ); +} diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h index 23cc143..9b00e28 100644 --- a/noncore/tools/clock/clock.h +++ b/noncore/tools/clock/clock.h @@ -47,10 +47,12 @@ protected: private: - QPoint rotate( QPoint center, QPoint p, int angle ); - void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 ); QTime currTime; QTime prevTime; bool clear; + + QPoint rotate( QPoint center, QPoint p, int angle ); + void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 ); + }; @@ -79,7 +81,10 @@ private slots: void timerEvent( QTimerEvent *e ); void slotAdjustTime(); + + void slotStartTimer(); + void slotStopTimer(); + void slotResetTimer(); + void setSwatchMode( int ); private: - void clearClock(); - void clearTimer(); bool alarmBool; QTimer *t; @@ -94,4 +99,6 @@ private: bool swatch_running; bool ampm; + void clearClock(); + void clearTimer(); }; |