author | zecke <zecke> | 2002-05-21 14:21:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-05-21 14:21:59 (UTC) |
commit | d65dc25caec62d4c554c99fbc151bf4d07c63b72 (patch) (unidiff) | |
tree | 37485591f8cd642df0177ea77b860f8d4432e9ef /noncore/tools | |
parent | 3eb1e88e5915c9dbd521a150cc5dd7eb7dbb3663 (diff) | |
download | opie-d65dc25caec62d4c554c99fbc151bf4d07c63b72.zip opie-d65dc25caec62d4c554c99fbc151bf4d07c63b72.tar.gz opie-d65dc25caec62d4c554c99fbc151bf4d07c63b72.tar.bz2 |
usbaility updates a clock should be able to set the time
-rw-r--r-- | noncore/tools/clock/clock.cpp | 24 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 1 | ||||
-rw-r--r-- | noncore/tools/clock/clock.pro | 2 |
3 files changed, 20 insertions, 7 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 | ||
@@ -167,7 +174,7 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) | |||
167 | alarmBool=FALSE; | 174 | alarmBool=FALSE; |
168 | snoozeBtn->hide(); | 175 | snoozeBtn->hide(); |
169 | } | 176 | } |
170 | 177 | ||
171 | QTimer::singleShot( 0, this, SLOT(updateClock()) ); | 178 | QTimer::singleShot( 0, this, SLOT(updateClock()) ); |
172 | modeSelect(0); | 179 | modeSelect(0); |
173 | } | 180 | } |
@@ -184,7 +191,7 @@ void Clock::updateClock() | |||
184 | QString s; | 191 | QString s; |
185 | if ( ampm ) { | 192 | if ( ampm ) { |
186 | int hour = tm.hour(); | 193 | int hour = tm.hour(); |
187 | if (hour == 0) | 194 | if (hour == 0) |
188 | hour = 12; | 195 | hour = 12; |
189 | if (hour > 12) | 196 | if (hour > 12) |
190 | hour -= 12; | 197 | hour -= 12; |
@@ -281,7 +288,7 @@ void Clock::modeSelect( int m ) | |||
281 | } | 288 | } |
282 | 289 | ||
283 | //this sets the alarm time | 290 | //this sets the alarm time |
284 | void Clock::slotSetAlarm() | 291 | void Clock::slotSetAlarm() |
285 | { | 292 | { |
286 | if( !snoozeBtn->isHidden()) | 293 | if( !snoozeBtn->isHidden()) |
287 | slotToggleAlarm(); | 294 | slotToggleAlarm(); |
@@ -303,7 +310,7 @@ void Clock::slotSetAlarm() | |||
303 | config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10); | 310 | config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10); |
304 | config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10); | 311 | config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10); |
305 | config.write(); | 312 | config.write(); |
306 | } | 313 | } |
307 | } | 314 | } |
308 | 315 | ||
309 | void Clock::slotSnooze() | 316 | void Clock::slotSnooze() |
@@ -320,7 +327,7 @@ void Clock::slotSnooze() | |||
320 | } | 327 | } |
321 | 328 | ||
322 | //toggles alarm on/off | 329 | //toggles alarm on/off |
323 | void Clock::slotToggleAlarm() | 330 | void Clock::slotToggleAlarm() |
324 | { | 331 | { |
325 | Config config( "qpe" ); | 332 | Config config( "qpe" ); |
326 | config.setGroup("Time"); | 333 | config.setGroup("Time"); |
@@ -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 | } |
484 | void 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 | ||
80 | private: | 81 | private: |
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 |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopie |
10 | INTERFACES = | 10 | INTERFACES = |
11 | TARGET = clock | 11 | TARGET = clock |
12 | 12 | ||