| -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 @@ -30,8 +30,10 @@ #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> @@ -91,9 +93,9 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) 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(); @@ -130,8 +132,13 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) // 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() ) ); @@ -166,9 +173,9 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) alarmOffBtn->setText( tr( "Alarm Is Off" ) ); alarmBool=FALSE; snoozeBtn->hide(); } - + QTimer::singleShot( 0, this, SLOT(updateClock()) ); modeSelect(0); } @@ -183,9 +190,9 @@ void Clock::updateClock() QTime tm = QDateTime::currentDateTime().time(); QString s; if ( ampm ) { int hour = tm.hour(); - if (hour == 0) + if (hour == 0) hour = 12; if (hour > 12) hour -= 12; s.sprintf( "%2d%c%02d", hour, ':', tm.minute() ); @@ -280,9 +287,9 @@ void Clock::modeSelect( int m ) updateClock(); } //this sets the alarm time -void Clock::slotSetAlarm() +void Clock::slotSetAlarm() { if( !snoozeBtn->isHidden()) slotToggleAlarm(); Set_Alarm *setAlarmDlg; @@ -302,9 +309,9 @@ void Clock::slotSetAlarm() config.writeEntry("clockAlarmHour", tmp.setNum( hour ),10); config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10); config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10); config.write(); - } + } } void Clock::slotSnooze() { @@ -319,9 +326,9 @@ void Clock::slotSnooze() } //toggles alarm on/off -void Clock::slotToggleAlarm() +void Clock::slotToggleAlarm() { Config config( "qpe" ); config.setGroup("Time"); if(alarmBool) { @@ -473,4 +480,9 @@ QPoint AnalogClock::rotate( QPoint c, QPoint p, int a ) 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 9b756b5..024dd28 100644 --- a/noncore/tools/clock/clock.h +++ b/noncore/tools/clock/clock.h @@ -75,8 +75,9 @@ private slots: void alarmOn(); void alarmOff(); void appMessage(const QCString& msg, const QByteArray& data); void timerEvent( QTimerEvent *e ); + void slotAdjustTime(); private: 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 @@ -5,9 +5,9 @@ HEADERS = clock.h setAlarm.h SOURCES = clock.cpp setAlarm.cpp \ main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopie INTERFACES = TARGET = clock TRANSLATIONS = ../i18n/de/clock.ts |