| -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 @@ -16,8 +16,9 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ +// code added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002 #include "clock.h" #include "setAlarm.h" @@ -30,10 +31,8 @@ #include <qpe/resource.h> #include <qsound.h> #include <qtimer.h> -#include <opie/oclickablelabel.h> - #include <qlcdnumber.h> #include <qslider.h> #include <qlabel.h> #include <qlayout.h> @@ -93,9 +92,9 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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 ); + QGridLayout *gl = new QGridLayout( controls, 2, 2, 6, 4 ); QButtonGroup *grp = new QButtonGroup( controls ); grp->setRadioButtonExclusive( true ); grp->hide(); @@ -132,13 +131,8 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) // 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() ) ); @@ -360,9 +354,9 @@ void Clock::alarmOn() when=whenl; AlarmServer::addAlarm( when, "QPE/Application/clock", "alarm(QDateTime,int)", warn ); - QMessageBox::message("Note","Alarm is set for:\n"+ whenl.toString()); + setCaption("Alarm set: "+ whenl.toString()); } void Clock::alarmOff() { @@ -371,9 +365,9 @@ void Clock::alarmOff() AlarmServer::deleteAlarm( when, "QPE/Application/clock", "alarm(QDateTime,int)", warn ); qDebug("Alarm Off "+ when.toString()); - + setCaption("Clock"); } void Clock::appMessage(const QCString& msg, const QByteArray& data) { @@ -388,14 +382,18 @@ void Clock::appMessage(const QCString& msg, const QByteArray& data) void Clock::timerEvent( QTimerEvent *e ) { static int stop = 0; - if ( stop < 10 && bSound) { + if ( stop < 120 && bSound) { Sound::soundAlarm(); stop++; } else { stop = 0; killTimer( e->timerId() ); + alarmOffBtn->setText( tr( "Alarm Is Off" ) ); + alarmBool=FALSE; + snoozeBtn->hide(); + setCaption("Clock: Alarm was missed."); } } @@ -480,9 +478,4 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a ) double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) + ( p.x() - c.x() ) * sin( angle ); return QPoint( nx, ny ); } -void Clock::slotAdjustTime() -{ - QCopEnvelope e("QPE/System", "execute(QString)"); - e << QString("systemtime"); -} |