Added option to show date as well as time in the clockapplet in the taskbar

2 files changed, 23 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
@@ -42,14 +42,20 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
     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" );
@@ -84,14 +90,23 @@ void LauncherClock::changeTime( void )
             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();
 }
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
@@ -38,8 +38,10 @@ protected:
     void mouseReleaseEvent( QMouseEvent * );
     void timerEvent( QTimerEvent * );
     void changeTime( void );
+    void readConfig();
     bool ampmFormat;
     int timerId;
+    int format;
 };