summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-16 23:45:21 (UTC)
committer llornkcor <llornkcor>2002-04-16 23:45:21 (UTC)
commit2d9c872bd5ae7eb5c42a7e9954cec793db0ea729 (patch) (side-by-side diff)
tree24a1c56832114e8289baf1906060862ab45a2f1d
parentf27ad352830a751937dc427f2677753545f38b16 (diff)
downloadopie-2d9c872bd5ae7eb5c42a7e9954cec793db0ea729.zip
opie-2d9c872bd5ae7eb5c42a7e9954cec793db0ea729.tar.gz
opie-2d9c872bd5ae7eb5c42a7e9954cec793db0ea729.tar.bz2
added gringo month/day style
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index fa76eb0..c186fb3 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -55,58 +55,63 @@ void LauncherClock::readConfig() {
config.setGroup( "Date" );
format = config.readNumEntry("ClockApplet",0);
}
void LauncherClock::mouseReleaseEvent( QMouseEvent * )
{
Global::execute( "systemtime" );
}
void LauncherClock::timerEvent( QTimerEvent *e )
{
if ( !e || e->timerId() == timerId ) {
killTimer( timerId );
changeTime();
QTime t = QTime::currentTime();
int ms = (60 - t.second())*1000 - t.msec();
timerId = startTimer( ms );
} else {
QLabel::timerEvent( e );
}
}
void LauncherClock::updateTime( void )
{
changeTime();
}
void LauncherClock::changeTime( void )
{
QTime tm = QDateTime::currentDateTime().time();
QString s;
if( ampmFormat ) {
int hour = tm.hour();
if (hour == 0)
hour = 12;
if (hour > 12)
hour -= 12;
s.sprintf( "%2d:%02d %s", hour, tm.minute(),
(tm.hour() >= 12) ? "PM" : "AM" );
} else
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 if (format==2) {
+ QDate dm = QDate::currentDate();
+ QString d;
+ d.sprintf("%d/%d ", dm.month(), dm.day());
+ setText( d+s );
} else {
setText( s );
}
}
void LauncherClock::slotClockChanged( bool pm )
{
readConfig();
updateTime();
}