author | llornkcor <llornkcor> | 2002-05-31 00:54:13 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-31 00:54:13 (UTC) |
commit | 460454a3a117afafde6094da6a4e12625f880908 (patch) (unidiff) | |
tree | 3a362f6eb5dbeec3f92e9a5e1c65e0c0ea94b012 /noncore/tools/clock/clock.cpp | |
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 | |||
@@ -14,12 +14,13 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // code added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002 | ||
20 | 21 | ||
21 | #include "clock.h" | 22 | #include "clock.h" |
22 | #include "setAlarm.h" | 23 | #include "setAlarm.h" |
23 | 24 | ||
24 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 26 | #include <qpe/qcopenvelope_qws.h> |
@@ -28,14 +29,12 @@ | |||
28 | #include <qpe/alarmserver.h> | 29 | #include <qpe/alarmserver.h> |
29 | #include <qpe/sound.h> | 30 | #include <qpe/sound.h> |
30 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
31 | #include <qsound.h> | 32 | #include <qsound.h> |
32 | #include <qtimer.h> | 33 | #include <qtimer.h> |
33 | 34 | ||
34 | #include <opie/oclickablelabel.h> | ||
35 | |||
36 | #include <qlcdnumber.h> | 35 | #include <qlcdnumber.h> |
37 | #include <qslider.h> | 36 | #include <qslider.h> |
38 | #include <qlabel.h> | 37 | #include <qlabel.h> |
39 | #include <qlayout.h> | 38 | #include <qlayout.h> |
40 | #include <qtimer.h> | 39 | #include <qtimer.h> |
41 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
@@ -91,13 +90,13 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) | |||
91 | date = new QLabel( this ); | 90 | date = new QLabel( this ); |
92 | date->setAlignment( AlignHCenter | AlignVCenter ); | 91 | date->setAlignment( AlignHCenter | AlignVCenter ); |
93 | date->setFont( QFont( "Helvetica", 14, QFont::Bold ) ); | 92 | date->setFont( QFont( "Helvetica", 14, QFont::Bold ) ); |
94 | date->setText( TimeString::longDateString( QDate::currentDate() ) ); | 93 | date->setText( TimeString::longDateString( QDate::currentDate() ) ); |
95 | 94 | ||
96 | QWidget *controls = new QWidget( this ); | 95 | QWidget *controls = new QWidget( this ); |
97 | QGridLayout *gl = new QGridLayout( controls, 3, 2, 6, 4 ); | 96 | QGridLayout *gl = new QGridLayout( controls, 2, 2, 6, 4 ); |
98 | 97 | ||
99 | QButtonGroup *grp = new QButtonGroup( controls ); | 98 | QButtonGroup *grp = new QButtonGroup( controls ); |
100 | grp->setRadioButtonExclusive( true ); | 99 | grp->setRadioButtonExclusive( true ); |
101 | grp->hide(); | 100 | grp->hide(); |
102 | 101 | ||
103 | clockRB = new QRadioButton ( tr( "Clock" ), controls ); | 102 | clockRB = new QRadioButton ( tr( "Clock" ), controls ); |
@@ -130,17 +129,12 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) | |||
130 | 129 | ||
131 | alarmBtn = new QPushButton ( controls ); | 130 | alarmBtn = new QPushButton ( controls ); |
132 | // alarmBtn->setMaximumSize(60,30); | 131 | // alarmBtn->setMaximumSize(60,30); |
133 | gl->addWidget( alarmBtn, 1, 2 ); | 132 | gl->addWidget( alarmBtn, 1, 2 ); |
134 | alarmBtn->setText( tr( "Set Alarm" ) ); | 133 | alarmBtn->setText( tr( "Set Alarm" ) ); |
135 | 134 | ||
136 | OClickableLabel *click = new OClickableLabel(controls, "label" ); | ||
137 | click->setText(tr("Set date and time." ) ); | ||
138 | gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter); | ||
139 | connect( click, SIGNAL(clicked() ), this, SLOT(slotAdjustTime() ) ); | ||
140 | |||
141 | connect( set, SIGNAL( pressed() ), SLOT( slotSet() ) ); | 135 | connect( set, SIGNAL( pressed() ), SLOT( slotSet() ) ); |
142 | connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) ); | 136 | connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) ); |
143 | 137 | ||
144 | connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) ); | 138 | connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) ); |
145 | connect( snoozeBtn, SIGNAL( clicked() ), SLOT( slotSnooze() ) ); | 139 | connect( snoozeBtn, SIGNAL( clicked() ), SLOT( slotSnooze() ) ); |
146 | connect( alarmOffBtn, SIGNAL( clicked() ), SLOT( slotToggleAlarm() ) ); | 140 | connect( alarmOffBtn, SIGNAL( clicked() ), SLOT( slotToggleAlarm() ) ); |
@@ -358,24 +352,24 @@ void Clock::alarmOn() | |||
358 | int warn; | 352 | int warn; |
359 | QDateTime whenl(d,tm); | 353 | QDateTime whenl(d,tm); |
360 | when=whenl; | 354 | when=whenl; |
361 | AlarmServer::addAlarm( when, | 355 | AlarmServer::addAlarm( when, |
362 | "QPE/Application/clock", | 356 | "QPE/Application/clock", |
363 | "alarm(QDateTime,int)", warn ); | 357 | "alarm(QDateTime,int)", warn ); |
364 | QMessageBox::message("Note","Alarm is set for:\n"+ whenl.toString()); | 358 | setCaption("Alarm set: "+ whenl.toString()); |
365 | } | 359 | } |
366 | 360 | ||
367 | void Clock::alarmOff() | 361 | void Clock::alarmOff() |
368 | { | 362 | { |
369 | int warn; | 363 | int warn; |
370 | bSound=FALSE; | 364 | bSound=FALSE; |
371 | AlarmServer::deleteAlarm( when, | 365 | AlarmServer::deleteAlarm( when, |
372 | "QPE/Application/clock", | 366 | "QPE/Application/clock", |
373 | "alarm(QDateTime,int)", warn ); | 367 | "alarm(QDateTime,int)", warn ); |
374 | qDebug("Alarm Off "+ when.toString()); | 368 | qDebug("Alarm Off "+ when.toString()); |
375 | 369 | setCaption("Clock"); | |
376 | } | 370 | } |
377 | 371 | ||
378 | void Clock::appMessage(const QCString& msg, const QByteArray& data) | 372 | void Clock::appMessage(const QCString& msg, const QByteArray& data) |
379 | { | 373 | { |
380 | int stopTimer = 0; | 374 | int stopTimer = 0; |
381 | int timerStay = 5000; | 375 | int timerStay = 5000; |
@@ -386,18 +380,22 @@ void Clock::appMessage(const QCString& msg, const QByteArray& data) | |||
386 | } | 380 | } |
387 | } | 381 | } |
388 | 382 | ||
389 | void Clock::timerEvent( QTimerEvent *e ) | 383 | void Clock::timerEvent( QTimerEvent *e ) |
390 | { | 384 | { |
391 | static int stop = 0; | 385 | static int stop = 0; |
392 | if ( stop < 10 && bSound) { | 386 | if ( stop < 120 && bSound) { |
393 | Sound::soundAlarm(); | 387 | Sound::soundAlarm(); |
394 | stop++; | 388 | stop++; |
395 | } else { | 389 | } else { |
396 | stop = 0; | 390 | stop = 0; |
397 | killTimer( e->timerId() ); | 391 | killTimer( e->timerId() ); |
392 | alarmOffBtn->setText( tr( "Alarm Is Off" ) ); | ||
393 | alarmBool=FALSE; | ||
394 | snoozeBtn->hide(); | ||
395 | setCaption("Clock: Alarm was missed."); | ||
398 | } | 396 | } |
399 | } | 397 | } |
400 | 398 | ||
401 | 399 | ||
402 | QSizePolicy AnalogClock::sizePolicy() const | 400 | QSizePolicy AnalogClock::sizePolicy() const |
403 | { | 401 | { |
@@ -478,11 +476,6 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a ) | |||
478 | double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) - | 476 | double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) - |
479 | ( p.y() - c.y() ) * sin( angle ); | 477 | ( p.y() - c.y() ) * sin( angle ); |
480 | double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) + | 478 | double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) + |
481 | ( p.x() - c.x() ) * sin( angle ); | 479 | ( p.x() - c.x() ) * sin( angle ); |
482 | return QPoint( nx, ny ); | 480 | return QPoint( nx, ny ); |
483 | } | 481 | } |
484 | void Clock::slotAdjustTime() | ||
485 | { | ||
486 | QCopEnvelope e("QPE/System", "execute(QString)"); | ||
487 | e << QString("systemtime"); | ||
488 | } | ||