Diffstat (limited to 'core/applets/clockapplet/clock.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 29 |
1 files changed, 22 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 | |||
@@ -29,40 +29,46 @@ | |||
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
30 | #include <qmessagebox.h> | 30 | #include <qmessagebox.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | #include <qpopupmenu.h> | 33 | #include <qpopupmenu.h> |
34 | #include <stdlib.h> | 34 | #include <stdlib.h> |
35 | 35 | ||
36 | 36 | ||
37 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | 37 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) |
38 | { | 38 | { |
39 | // If you want a sunken border around the clock do this: | 39 | // If you want a sunken border around the clock do this: |
40 | // setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 40 | // setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
41 | setFont( QFont( "Helvetica", 10, QFont::Normal ) ); | 41 | setFont( QFont( "Helvetica", 10, QFont::Normal ) ); |
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 | Config config( "qpe" ); | 45 | readConfig(); |
46 | config.setGroup( "Time" ); | ||
47 | ampmFormat = config.readBoolEntry( "AMPM", TRUE ); | ||
48 | timerId = 0; | 46 | timerId = 0; |
49 | timerEvent( 0 ); | 47 | timerEvent( 0 ); |
50 | show(); | 48 | show(); |
51 | } | 49 | } |
52 | 50 | ||
51 | void LauncherClock::readConfig() { | ||
52 | Config config( "qpe" ); | ||
53 | config.setGroup( "Time" ); | ||
54 | ampmFormat = config.readBoolEntry( "AMPM", TRUE ); | ||
55 | config.setGroup( "Date" ); | ||
56 | format = config.readNumEntry("ClockApplet",0); | ||
57 | } | ||
58 | |||
53 | void LauncherClock::mouseReleaseEvent( QMouseEvent * ) | 59 | void LauncherClock::mouseReleaseEvent( QMouseEvent * ) |
54 | { | 60 | { |
55 | Global::execute( "systemtime" ); | 61 | Global::execute( "systemtime" ); |
56 | } | 62 | } |
57 | 63 | ||
58 | 64 | ||
59 | void LauncherClock::timerEvent( QTimerEvent *e ) | 65 | void LauncherClock::timerEvent( QTimerEvent *e ) |
60 | { | 66 | { |
61 | if ( !e || e->timerId() == timerId ) { | 67 | if ( !e || e->timerId() == timerId ) { |
62 | killTimer( timerId ); | 68 | killTimer( timerId ); |
63 | changeTime(); | 69 | changeTime(); |
64 | QTime t = QTime::currentTime(); | 70 | QTime t = QTime::currentTime(); |
65 | int ms = (60 - t.second())*1000 - t.msec(); | 71 | int ms = (60 - t.second())*1000 - t.msec(); |
66 | timerId = startTimer( ms ); | 72 | timerId = startTimer( ms ); |
67 | } else { | 73 | } else { |
68 | QLabel::timerEvent( e ); | 74 | QLabel::timerEvent( e ); |
@@ -71,27 +77,36 @@ void LauncherClock::timerEvent( QTimerEvent *e ) | |||
71 | 77 | ||
72 | void LauncherClock::updateTime( void ) | 78 | void LauncherClock::updateTime( void ) |
73 | { | 79 | { |
74 | changeTime(); | 80 | changeTime(); |
75 | } | 81 | } |
76 | 82 | ||
77 | void LauncherClock::changeTime( void ) | 83 | void LauncherClock::changeTime( void ) |
78 | { | 84 | { |
79 | QTime tm = QDateTime::currentDateTime().time(); | 85 | QTime tm = QDateTime::currentDateTime().time(); |
80 | QString s; | 86 | QString s; |
81 | if( ampmFormat ) { | 87 | if( ampmFormat ) { |
82 | int hour = tm.hour(); | 88 | int hour = tm.hour(); |
83 | if (hour == 0) | 89 | if (hour == 0) |
84 | hour = 12; | 90 | hour = 12; |
85 | if (hour > 12) | 91 | if (hour > 12) |
86 | hour -= 12; | 92 | hour -= 12; |
87 | s.sprintf( "%2d%c%02d %s", hour, ':', tm.minute(), (tm.hour() >= 12) ? "PM" : "AM" ); | 93 | s.sprintf( "%2d:%02d %s", hour, tm.minute(), |
94 | (tm.hour() >= 12) ? "PM" : "AM" ); | ||
88 | } else | 95 | } else |
89 | s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() ); | 96 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); |
90 | setText( s ); | 97 | |
98 | if (format==1) { | ||
99 | QDate dm = QDate::currentDate(); | ||
100 | QString d; | ||
101 | d.sprintf("%d/%d ", dm.day(), dm.month()); | ||
102 | setText( d+s ); | ||
103 | } else { | ||
104 | setText( s ); | ||
105 | } | ||
91 | } | 106 | } |
92 | 107 | ||
93 | void LauncherClock::slotClockChanged( bool pm ) | 108 | void LauncherClock::slotClockChanged( bool pm ) |
94 | { | 109 | { |
95 | ampmFormat = pm; | 110 | readConfig(); |
96 | updateTime(); | 111 | updateTime(); |
97 | } | 112 | } |