summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp45
1 files changed, 25 insertions, 20 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
@@ -42,5 +42,5 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
42 connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) ); 42 connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) );
43 connect( qApp, SIGNAL( clockChanged( bool ) ), 43 connect( qApp, SIGNAL( clockChanged( bool ) ),
44 this, SLOT( slotClockChanged( bool ) ) ); 44 this, SLOT( slotClockChanged( bool ) ) );
45 readConfig(); 45 readConfig();
46 timerId = 0; 46 timerId = 0;
@@ -66,11 +66,11 @@ void LauncherClock::timerEvent( QTimerEvent *e )
66{ 66{
67 if ( !e || e->timerId() == timerId ) { 67 if ( !e || e->timerId() == timerId ) {
68 killTimer( timerId ); 68 killTimer( timerId );
69 changeTime(); 69 changeTime();
70 QTime t = QTime::currentTime(); 70 QTime t = QTime::currentTime();
71 int ms = (60 - t.second())*1000 - t.msec(); 71 int ms = (60 - t.second())*1000 - t.msec();
72 timerId = startTimer( ms ); 72 timerId = startTimer( ms );
73 } else { 73 } else {
74 QLabel::timerEvent( e ); 74 QLabel::timerEvent( e );
75 } 75 }
76} 76}
@@ -86,21 +86,26 @@ void LauncherClock::changeTime( void )
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}