summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index 19d3f6c..bcecab4 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -40,7 +40,7 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
40{ 40{
41 // If you want a sunken border around the clock do this: 41 // If you want a sunken border around the clock do this:
42 // setFrameStyle( QFrame::Panel | QFrame::Sunken ); 42 // setFrameStyle( QFrame::Panel | QFrame::Sunken );
43 setFont( QFont( "Helvetica", 10, QFont::Normal ) ); 43 //setFont( QFont( "Helvetica", , QFont::Normal ) );
44 connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) ); 44 connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) );
45 connect( qApp, SIGNAL( clockChanged( bool ) ), 45 connect( qApp, SIGNAL( clockChanged( bool ) ),
46 this, SLOT( slotClockChanged( bool ) ) ); 46 this, SLOT( slotClockChanged( bool ) ) );
@@ -92,12 +92,12 @@ void LauncherClock::changeTime( void )
92 QTime tm = QDateTime::currentDateTime().time(); 92 QTime tm = QDateTime::currentDateTime().time();
93 QString s; 93 QString s;
94 if( ampmFormat ) { 94 if( ampmFormat ) {
95 int hour = tm.hour(); 95 int hour = tm.hour();
96 if (hour == 0) 96 if (hour == 0)
97 hour = 12; 97 hour = 12;
98 if (hour > 12) 98 if (hour > 12)
99 hour -= 12; 99 hour -= 12;
100 s.sprintf( "%2d:%02d %s", hour, tm.minute(), 100 s.sprintf( "%2d:%02d %s", hour, tm.minute(),
101 (tm.hour() >= 12) ? "PM" : "AM" ); 101 (tm.hour() >= 12) ? "PM" : "AM" );
102 } else 102 } else
103 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); 103 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );