-rw-r--r-- | core/applets/clockapplet/clock.cpp | 29 | ||||
-rw-r--r-- | core/applets/clockapplet/clock.h | 2 |
2 files changed, 24 insertions, 7 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 @@ -44,5 +44,3 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) this, SLOT( slotClockChanged( bool ) ) ); - Config config( "qpe" ); - config.setGroup( "Time" ); - ampmFormat = config.readBoolEntry( "AMPM", TRUE ); + readConfig(); timerId = 0; @@ -52,2 +50,10 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) +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 * ) @@ -86,6 +92,15 @@ void LauncherClock::changeTime( void ) 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() ); - setText( s ); + 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 ); + } } @@ -94,3 +109,3 @@ void LauncherClock::slotClockChanged( bool pm ) { - ampmFormat = pm; + readConfig(); updateTime(); diff --git a/core/applets/clockapplet/clock.h b/core/applets/clockapplet/clock.h index 9670d90..caa0c5f 100644 --- a/core/applets/clockapplet/clock.h +++ b/core/applets/clockapplet/clock.h @@ -40,4 +40,6 @@ protected: void changeTime( void ); + void readConfig(); bool ampmFormat; int timerId; + int format; }; |