Diffstat (limited to 'core/applets/clockapplet/clock.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index 178dcbe..fa76eb0 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp @@ -21,77 +21,92 @@ #include "clock.h" #include <qpe/global.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qmainwindow.h> #include <qlayout.h> #include <qpushbutton.h> #include <qmessagebox.h> #include <qdatetime.h> #include <qtimer.h> #include <qpopupmenu.h> #include <stdlib.h> LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) { // If you want a sunken border around the clock do this: // setFrameStyle( QFrame::Panel | QFrame::Sunken ); setFont( QFont( "Helvetica", 10, QFont::Normal ) ); connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) ); connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotClockChanged( bool ) ) ); - Config config( "qpe" ); - config.setGroup( "Time" ); - ampmFormat = config.readBoolEntry( "AMPM", TRUE ); + readConfig(); timerId = 0; timerEvent( 0 ); show(); } +void LauncherClock::readConfig() { + Config config( "qpe" ); + config.setGroup( "Time" ); + ampmFormat = config.readBoolEntry( "AMPM", TRUE ); + config.setGroup( "Date" ); + format = config.readNumEntry("ClockApplet",0); +} + void LauncherClock::mouseReleaseEvent( QMouseEvent * ) { Global::execute( "systemtime" ); } void LauncherClock::timerEvent( QTimerEvent *e ) { if ( !e || e->timerId() == timerId ) { killTimer( timerId ); changeTime(); QTime t = QTime::currentTime(); int ms = (60 - t.second())*1000 - t.msec(); timerId = startTimer( ms ); } else { QLabel::timerEvent( e ); } } void LauncherClock::updateTime( void ) { changeTime(); } void LauncherClock::changeTime( void ) { QTime tm = QDateTime::currentDateTime().time(); QString s; if( ampmFormat ) { int hour = tm.hour(); if (hour == 0) hour = 12; if (hour > 12) hour -= 12; - s.sprintf( "%2d%c%02d %s", hour, ':', tm.minute(), (tm.hour() >= 12) ? "PM" : "AM" ); + s.sprintf( "%2d:%02d %s", hour, tm.minute(), + (tm.hour() >= 12) ? "PM" : "AM" ); } else - s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() ); + s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); + + if (format==1) { + QDate dm = QDate::currentDate(); + QString d; + d.sprintf("%d/%d ", dm.day(), dm.month()); + setText( d+s ); + } else { setText( s ); } +} void LauncherClock::slotClockChanged( bool pm ) { - ampmFormat = pm; + readConfig(); updateTime(); } |