author | llornkcor <llornkcor> | 2002-05-31 00:54:13 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-31 00:54:13 (UTC) |
commit | 460454a3a117afafde6094da6a4e12625f880908 (patch) (side-by-side diff) | |
tree | 3a362f6eb5dbeec3f92e9a5e1c65e0c0ea94b012 | |
parent | 294fecd1c15c4940bdab8566e5afaee9f305abb6 (diff) | |
download | opie-460454a3a117afafde6094da6a4e12625f880908.zip opie-460454a3a117afafde6094da6a4e12625f880908.tar.gz opie-460454a3a117afafde6094da6a4e12625f880908.tar.bz2 |
lengthened time of alarm sounding, removed nag screen and put alarm info into caption
-rw-r--r-- | noncore/tools/clock/clock.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index ea8e8ca..a85cc19 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp @@ -18,4 +18,5 @@ ** **********************************************************************/ +// code added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002 #include "clock.h" @@ -32,6 +33,4 @@ #include <qtimer.h> -#include <opie/oclickablelabel.h> - #include <qlcdnumber.h> #include <qslider.h> @@ -95,5 +94,5 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) QWidget *controls = new QWidget( this ); - QGridLayout *gl = new QGridLayout( controls, 3, 2, 6, 4 ); + QGridLayout *gl = new QGridLayout( controls, 2, 2, 6, 4 ); QButtonGroup *grp = new QButtonGroup( controls ); @@ -134,9 +133,4 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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() ) ); @@ -362,5 +356,5 @@ void Clock::alarmOn() "QPE/Application/clock", "alarm(QDateTime,int)", warn ); - QMessageBox::message("Note","Alarm is set for:\n"+ whenl.toString()); + setCaption("Alarm set: "+ whenl.toString()); } @@ -373,5 +367,5 @@ void Clock::alarmOff() "alarm(QDateTime,int)", warn ); qDebug("Alarm Off "+ when.toString()); - + setCaption("Clock"); } @@ -390,5 +384,5 @@ void Clock::timerEvent( QTimerEvent *e ) { static int stop = 0; - if ( stop < 10 && bSound) { + if ( stop < 120 && bSound) { Sound::soundAlarm(); stop++; @@ -396,4 +390,8 @@ void Clock::timerEvent( QTimerEvent *e ) stop = 0; killTimer( e->timerId() ); + alarmOffBtn->setText( tr( "Alarm Is Off" ) ); + alarmBool=FALSE; + snoozeBtn->hide(); + setCaption("Clock: Alarm was missed."); } } @@ -482,7 +480,2 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a ) return QPoint( nx, ny ); } -void Clock::slotAdjustTime() -{ - QCopEnvelope e("QPE/System", "execute(QString)"); - e << QString("systemtime"); -} |