summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp14
-rw-r--r--noncore/tools/clock/clock.h1
-rw-r--r--noncore/tools/clock/clock.pro2
3 files changed, 15 insertions, 2 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index a21a061..ea8e8ca 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -31,6 +31,8 @@
31#include <qsound.h> 31#include <qsound.h>
32#include <qtimer.h> 32#include <qtimer.h>
33 33
34#include <opie/oclickablelabel.h>
35
34#include <qlcdnumber.h> 36#include <qlcdnumber.h>
35#include <qslider.h> 37#include <qslider.h>
36#include <qlabel.h> 38#include <qlabel.h>
@@ -92,7 +94,7 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
92 date->setText( TimeString::longDateString( QDate::currentDate() ) ); 94 date->setText( TimeString::longDateString( QDate::currentDate() ) );
93 95
94 QWidget *controls = new QWidget( this ); 96 QWidget *controls = new QWidget( this );
95 QGridLayout *gl = new QGridLayout( controls, 2, 2, 6, 4 ); 97 QGridLayout *gl = new QGridLayout( controls, 3, 2, 6, 4 );
96 98
97 QButtonGroup *grp = new QButtonGroup( controls ); 99 QButtonGroup *grp = new QButtonGroup( controls );
98 grp->setRadioButtonExclusive( true ); 100 grp->setRadioButtonExclusive( true );
@@ -131,6 +133,11 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
131 gl->addWidget( alarmBtn, 1, 2 ); 133 gl->addWidget( alarmBtn, 1, 2 );
132 alarmBtn->setText( tr( "Set Alarm" ) ); 134 alarmBtn->setText( tr( "Set Alarm" ) );
133 135
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
134 connect( set, SIGNAL( pressed() ), SLOT( slotSet() ) ); 141 connect( set, SIGNAL( pressed() ), SLOT( slotSet() ) );
135 connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) ); 142 connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) );
136 143
@@ -474,3 +481,8 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
474 ( p.x() - c.x() ) * sin( angle ); 481 ( p.x() - c.x() ) * sin( angle );
475 return QPoint( nx, ny ); 482 return QPoint( nx, ny );
476} 483}
484void Clock::slotAdjustTime()
485{
486 QCopEnvelope e("QPE/System", "execute(QString)");
487 e << QString("systemtime");
488}
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 9b756b5..024dd28 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -76,6 +76,7 @@ private slots:
76 void alarmOff(); 76 void alarmOff();
77 void appMessage(const QCString& msg, const QByteArray& data); 77 void appMessage(const QCString& msg, const QByteArray& data);
78 void timerEvent( QTimerEvent *e ); 78 void timerEvent( QTimerEvent *e );
79 void slotAdjustTime();
79 80
80private: 81private:
81 void clearClock(); 82 void clearClock();
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 5373515..7eecce1 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -6,7 +6,7 @@ SOURCES = clock.cpp setAlarm.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopie
10INTERFACES = 10INTERFACES =
11TARGET = clock 11TARGET = clock
12 12