-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 @@ | |||
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" |
@@ -32,6 +33,4 @@ | |||
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> |
@@ -95,5 +94,5 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) | |||
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 ); |
@@ -134,9 +133,4 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) | |||
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() ) ); |
@@ -362,5 +356,5 @@ void Clock::alarmOn() | |||
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 | ||
@@ -373,5 +367,5 @@ void Clock::alarmOff() | |||
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 | ||
@@ -390,5 +384,5 @@ 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++; |
@@ -396,4 +390,8 @@ void Clock::timerEvent( QTimerEvent *e ) | |||
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 | } |
@@ -482,7 +480,2 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a ) | |||
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 | } | ||