summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp29
-rw-r--r--core/applets/clockapplet/clock.h2
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 )
44 this, SLOT( slotClockChanged( bool ) ) ); 44 this, SLOT( slotClockChanged( bool ) ) );
45 Config config( "qpe" ); 45 readConfig();
46 config.setGroup( "Time" );
47 ampmFormat = config.readBoolEntry( "AMPM", TRUE );
48 timerId = 0; 46 timerId = 0;
@@ -52,2 +50,10 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
52 50
51void LauncherClock::readConfig() {
52 Config config( "qpe" );
53 config.setGroup( "Time" );
54 ampmFormat = config.readBoolEntry( "AMPM", TRUE );
55 config.setGroup( "Date" );
56 format = config.readNumEntry("ClockApplet",0);
57}
58
53void LauncherClock::mouseReleaseEvent( QMouseEvent * ) 59void LauncherClock::mouseReleaseEvent( QMouseEvent * )
@@ -86,6 +92,15 @@ void LauncherClock::changeTime( void )
86 hour -= 12; 92 hour -= 12;
87 s.sprintf( "%2d%c%02d %s", hour, ':', tm.minute(), (tm.hour() >= 12) ? "PM" : "AM" ); 93 s.sprintf( "%2d:%02d %s", hour, tm.minute(),
94 (tm.hour() >= 12) ? "PM" : "AM" );
88 } else 95 } else
89 s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() ); 96 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
90 setText( s ); 97
98 if (format==1) {
99 QDate dm = QDate::currentDate();
100 QString d;
101 d.sprintf("%d/%d ", dm.day(), dm.month());
102 setText( d+s );
103 } else {
104 setText( s );
105 }
91} 106}
@@ -94,3 +109,3 @@ void LauncherClock::slotClockChanged( bool pm )
94{ 109{
95 ampmFormat = pm; 110 readConfig();
96 updateTime(); 111 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:
40 void changeTime( void ); 40 void changeTime( void );
41 void readConfig();
41 bool ampmFormat; 42 bool ampmFormat;
42 int timerId; 43 int timerId;
44 int format;
43}; 45};