summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-16 23:45:21 (UTC)
committer llornkcor <llornkcor>2002-04-16 23:45:21 (UTC)
commit2d9c872bd5ae7eb5c42a7e9954cec793db0ea729 (patch) (unidiff)
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
@@ -79,34 +79,39 @@ void LauncherClock::updateTime( void )
79{ 79{
80 changeTime(); 80 changeTime();
81} 81}
82 82
83void LauncherClock::changeTime( void ) 83void LauncherClock::changeTime( void )
84{ 84{
85 QTime tm = QDateTime::currentDateTime().time(); 85 QTime tm = QDateTime::currentDateTime().time();
86 QString s; 86 QString s;
87 if( ampmFormat ) { 87 if( ampmFormat ) {
88 int hour = tm.hour(); 88 int hour = tm.hour();
89 if (hour == 0) 89 if (hour == 0)
90 hour = 12; 90 hour = 12;
91 if (hour > 12) 91 if (hour > 12)
92 hour -= 12; 92 hour -= 12;
93 s.sprintf( "%2d:%02d %s", hour, tm.minute(), 93 s.sprintf( "%2d:%02d %s", hour, tm.minute(),
94 (tm.hour() >= 12) ? "PM" : "AM" ); 94 (tm.hour() >= 12) ? "PM" : "AM" );
95 } else 95 } else
96 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); 96 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
97 97
98 if (format==1) { 98 if (format==1) {
99 QDate dm = QDate::currentDate(); 99 QDate dm = QDate::currentDate();
100 QString d; 100 QString d;
101 d.sprintf("%d/%d ", dm.day(), dm.month()); 101 d.sprintf("%d/%d ", dm.day(), dm.month());
102 setText( d+s ); 102 setText( d+s );
103 } else if (format==2) {
104 QDate dm = QDate::currentDate();
105 QString d;
106 d.sprintf("%d/%d ", dm.month(), dm.day());
107 setText( d+s );
103 } else { 108 } else {
104 setText( s ); 109 setText( s );
105 } 110 }
106} 111}
107 112
108void LauncherClock::slotClockChanged( bool pm ) 113void LauncherClock::slotClockChanged( bool pm )
109{ 114{
110 readConfig(); 115 readConfig();
111 updateTime(); 116 updateTime();
112} 117}