summaryrefslogtreecommitdiff
path: root/core
authorhakan <hakan>2002-03-10 18:31:30 (UTC)
committer hakan <hakan>2002-03-10 18:31:30 (UTC)
commitaeb745907f05b7d0729d273f72b5641e890a4c27 (patch) (side-by-side diff)
treea1ebe151c5112e56c1caabcbb9e6b92d320ef8e3 /core
parent1800f044e7d123247cd05a4fd934675b5fcdd97b (diff)
downloadopie-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') (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
@@ -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() );
- 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 );
+ }
}
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;
};