lengthened time of alarm sounding, removed nag screen and put alarm info into caption

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
@@ -19,2 +19,3 @@
 **********************************************************************/
+// code added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002
 
@@ -33,4 +34,2 @@
 
-#include <opie/oclickablelabel.h>
-
 #include <qlcdnumber.h>
@@ -96,3 +95,3 @@ 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 );
 
@@ -135,7 +134,2 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
 
-    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() ) );
@@ -363,3 +357,3 @@ void Clock::alarmOn()
                              "alarm(QDateTime,int)", warn );
-      QMessageBox::message("Note","Alarm is set for:\n"+ whenl.toString());
+    setCaption("Alarm set: "+ whenl.toString());
 }
@@ -374,3 +368,3 @@ void Clock::alarmOff()
       qDebug("Alarm Off "+ when.toString());
-
+    setCaption("Clock");
 }
@@ -391,3 +385,3 @@ void Clock::timerEvent( QTimerEvent *e )
     static int stop = 0;
-    if ( stop < 10 && bSound) {
+    if ( stop < 120 && bSound) {
         Sound::soundAlarm();
@@ -397,2 +391,6 @@ void Clock::timerEvent( QTimerEvent *e )
         killTimer( e->timerId() );
+        alarmOffBtn->setText( tr( "Alarm Is Off" ) );
+        alarmBool=FALSE;
+        snoozeBtn->hide();
+        setCaption("Clock: Alarm was missed.");
     }
@@ -483,6 +481 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
 }
-void Clock::slotAdjustTime()
-{
-    QCopEnvelope e("QPE/System", "execute(QString)");
-    e << QString("systemtime");
-}