add zeckes change in again *DOH*, and initialize some silly int's to get rid of silly compiler warnings

2 files changed, 17 insertions, 6 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index a85cc19..0a21146 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -12,31 +12,32 @@
  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  **
  ** See http://www.trolltech.com/gpl/ for GPL licensing information.
  **
  ** 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"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/timestring.h>
 #include <qpe/alarmserver.h>
 #include <qpe/sound.h>
 #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>
 #include <qtimer.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
@@ -88,17 +89,17 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
     space = new QWidget( hb );
 
     date = new QLabel( this );
     date->setAlignment( AlignHCenter | AlignVCenter );
     date->setFont( QFont( "Helvetica", 14, QFont::Bold ) );
     date->setText( TimeString::longDateString( QDate::currentDate() ) );
 
     QWidget *controls = new QWidget( this );
-    QGridLayout *gl = new QGridLayout( controls, 2, 2, 6, 4 );
+    QGridLayout *gl = new QGridLayout( controls, 3, 2, 6, 4 );
 
     QButtonGroup *grp = new QButtonGroup( controls );
     grp->setRadioButtonExclusive( true );
     grp->hide();
 
     clockRB = new QRadioButton ( tr( "Clock" ), controls  );
     gl->addWidget( clockRB, 0, 0 );
     grp->insert( clockRB );
@@ -127,16 +128,21 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
 //    alarmOffBtn->setMaximumSize(60,30);
     gl->addWidget( alarmOffBtn, 0, 2 );
 
     alarmBtn = new QPushButton ( controls );
       //  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() ) );
     connect( snoozeBtn, SIGNAL( clicked() ), SLOT( slotSnooze() ) );
     connect( alarmOffBtn, SIGNAL( clicked() ), SLOT( slotToggleAlarm() ) );
 
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
@@ -305,17 +311,17 @@ void Clock::slotSetAlarm()
         config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10);
         config.write();
     } 
 }
 
 void Clock::slotSnooze()
 {
     bSound=FALSE;
-    int warn;
+    int warn = 0;
     QTime t = QTime::currentTime();
     QDateTime whenl( when.date(), t.addSecs( snoozeTime*60));
     when=whenl;
     AlarmServer::addAlarm( when,
                            "QPE/Application/clock",
                            "alarm(QDateTime,int)", warn );
 
 }
@@ -344,28 +350,28 @@ void Clock::slotToggleAlarm()
 void Clock::alarmOn()
 {
     QDate d = QDate::currentDate();
     QTime tm((int)hour,(int)minute,0);
     qDebug("Time set "+tm.toString());
     QTime t = QTime::currentTime();
     if( t > tm)
         d = d.addDays(1);
-    int warn;
+    int warn = 0;
     QDateTime whenl(d,tm);
     when=whenl;
     AlarmServer::addAlarm( when,
                            "QPE/Application/clock",
                            "alarm(QDateTime,int)", warn );
     setCaption("Alarm set: "+ whenl.toString());
 }
 
 void Clock::alarmOff()
 {
-    int warn;
+    int warn = 0;
     bSound=FALSE;
     AlarmServer::deleteAlarm( when,
                               "QPE/Application/clock",
                               "alarm(QDateTime,int)", warn );
     qDebug("Alarm Off "+ when.toString());
     setCaption("Clock");
 }
 
@@ -474,8 +480,13 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
 {
     double angle = deg2rad * ( - a + 180 );
     double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) -
         ( p.y() - c.y() ) * sin( angle );
     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");
+}
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index e5ed13c..024dd28 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -71,17 +71,17 @@ private slots:
     void changeClock( bool );
     void slotSetAlarm();
     void slotSnooze();
     void slotToggleAlarm();
     void alarmOn();
     void alarmOff();
     void appMessage(const QCString& msg, const QByteArray& data);
     void timerEvent( QTimerEvent *e );
-//    void slotAdjustTime();
+    void slotAdjustTime();
 
 private:
     void clearClock();
 
     bool alarmBool;
     QTimer *t;
     QLCDNumber *lcd;
     QLabel *date;