author | hakan <hakan> | 2002-03-10 18:31:30 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-03-10 18:31:30 (UTC) |
commit | aeb745907f05b7d0729d273f72b5641e890a4c27 (patch) (side-by-side diff) | |
tree | a1ebe151c5112e56c1caabcbb9e6b92d320ef8e3 /core/applets/clockapplet/clock.cpp | |
parent | 1800f044e7d123247cd05a4fd934675b5fcdd97b (diff) | |
download | opie-aeb745907f05b7d0729d273f72b5641e890a4c27.zip opie-aeb745907f05b7d0729d273f72b5641e890a4c27.tar.gz opie-aeb745907f05b7d0729d273f72b5641e890a4c27.tar.bz2 |
Added option to show date as well as time in the clockapplet in the taskbar
Diffstat (limited to 'core/applets/clockapplet/clock.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 29 |
1 files changed, 22 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(); |