summaryrefslogtreecommitdiff
authorsandman <sandman>2002-08-30 20:51:50 (UTC)
committer sandman <sandman>2002-08-30 20:51:50 (UTC)
commit8c26b7fe6b3afc8c3de2ee48bfb50bb041dadede (patch) (side-by-side diff)
treefbfb5ee6813ddade91cfdb7ab360b7e1295b666a
parent2606de50e126ba6da310d9fbab8581c35ddd1223 (diff)
downloadopie-8c26b7fe6b3afc8c3de2ee48bfb50bb041dadede.zip
opie-8c26b7fe6b3afc8c3de2ee48bfb50bb041dadede.tar.gz
opie-8c26b7fe6b3afc8c3de2ee48bfb50bb041dadede.tar.bz2
Clock now works with liquid without drawing "interesting" patterns
(also reformated the file with astyle)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp66
1 files changed, 43 insertions, 23 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index e3621d9..5b901c1 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -113,12 +113,18 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
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 );
+ 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 );
@@ -140,7 +146,8 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter);
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() ) );
connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) );
@@ -171,7 +178,8 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
alarmOffBtn->setText( tr( "Alarm Is On" ) );
alarmBool=TRUE;
snoozeBtn->show();
- } else {
+ }
+ else {
alarmOffBtn->setText( tr( "Alarm Is Off" ) );
alarmBool=FALSE;
snoozeBtn->hide();
@@ -200,7 +208,8 @@ void Clock::updateClock()
s.sprintf( "%2d%c%02d", hour, ':', tm.minute() );
ampmLabel->setText( (tm.hour() >= 12) ? "PM" : "AM" );
ampmLabel->show();
- } else {
+ }
+ else {
s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() );
ampmLabel->hide();
}
@@ -208,7 +217,8 @@ void Clock::updateClock()
lcd->repaint( FALSE );
aclock->display( QTime::currentTime() );
date->setText( TimeString::longDateString( QDate::currentDate() ) );
- } else {
+ }
+ else {
QTime swatch_time;
QString lcdtext;
int totalms = swatch_totalms;
@@ -241,14 +251,17 @@ void Clock::slotSet()
{
if ( t->isActive() ) {
swatch_totalms += swatch_start.elapsed();
- set->setText( tr( "Start" ) );
+ set
+ ->setText( tr( "Start" ) );
t->stop();
swatch_running = FALSE;
toggleScreenSaver( TRUE );
updateClock();
- } else {
+ }
+ else {
swatch_start.start();
- set->setText( tr( "Stop" ) );
+ set
+ ->setText( tr( "Stop" ) );
t->start( 1000 );
swatch_running = TRUE;
// disable screensaver while stop watch is running
@@ -273,16 +286,19 @@ void Clock::modeSelect( int 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();
if ( !swatch_running )
t->stop();
- } else {
+ }
+ else {
lcd->setNumDigits( 5 );
lcd->setMinimumWidth( lcd->sizeHint().width() );
- set->setEnabled( FALSE );
+ set
+ ->setEnabled( FALSE );
reset->setEnabled( FALSE );
t->start(1000);
}
@@ -342,7 +358,8 @@ void Clock::slotToggleAlarm()
snoozeBtn->hide();
alarmBool=FALSE;
alarmOff();
- } else {
+ }
+ else {
config.writeEntry("clockAlarmSet","TRUE");
alarmOffBtn->setText( tr( "Alarm Is On" ) );
snoozeBtn->show();
@@ -380,7 +397,7 @@ void Clock::alarmOff()
setCaption("Clock");
}
-void Clock::appMessage(const QCString& msg, const QByteArray& data)
+void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ )
{
int stopTimer = 0;
int timerStay = 5000;
@@ -393,7 +410,8 @@ void Clock::appMessage(const QCString& msg, const QByteArray& data)
QCopEnvelope e("QPE/Application/opieplayer","setDocument(QString)");
e<<config.readEntry("mp3File","");
- } else {
+ }
+ else {
Sound::soundAlarm();
stopTimer = startTimer( timerStay);
@@ -411,7 +429,8 @@ void Clock::timerEvent( QTimerEvent *e )
if ( stop < 120 && bSound) {
Sound::soundAlarm();
stop++;
- } else {
+ }
+ else {
stop = 0;
killTimer( e->timerId() );
alarmOffBtn->setText( tr( "Alarm Is Off" ) );
@@ -447,8 +466,8 @@ void AnalogClock::drawContents( QPainter *p )
QColor color( clear ? backgroundColor() : black );
QTime time = clear ? prevTime : currTime;
- if ( clear && prevTime.secsTo(currTime) > 1 ) {
- p->eraseRect( rect() );
+ if ( clear ) {
+ erase( rect() );
return;
}
@@ -505,7 +524,8 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
return QPoint( nx, ny );
}
-void Clock::slotAdjustTime() {
+void Clock::slotAdjustTime()
+{
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("systemtime");
}