author | hakan <hakan> | 2002-03-10 18:31:30 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-03-10 18:31:30 (UTC) |
commit | aeb745907f05b7d0729d273f72b5641e890a4c27 (patch) (unidiff) | |
tree | a1ebe151c5112e56c1caabcbb9e6b92d320ef8e3 | |
parent | 1800f044e7d123247cd05a4fd934675b5fcdd97b (diff) | |
download | opie-aeb745907f05b7d0729d273f72b5641e890a4c27.zip opie-aeb745907f05b7d0729d273f72b5641e890a4c27.tar.gz opie-aeb745907f05b7d0729d273f72b5641e890a4c27.tar.bz2 |
Added option to show date as well as time in the clockapplet in the taskbar
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 29 | ||||
-rw-r--r-- | core/applets/clockapplet/clock.h | 2 |
2 files changed, 24 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 | |||
@@ -37,24 +37,30 @@ | |||
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 | { |
@@ -79,19 +85,28 @@ void LauncherClock::changeTime( void ) | |||
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 | } |
diff --git a/core/applets/clockapplet/clock.h b/core/applets/clockapplet/clock.h index 9670d90..caa0c5f 100644 --- a/core/applets/clockapplet/clock.h +++ b/core/applets/clockapplet/clock.h | |||
@@ -33,14 +33,16 @@ public: | |||
33 | protected slots: | 33 | protected slots: |
34 | void updateTime( void ); | 34 | void updateTime( void ); |
35 | void slotClockChanged( bool pm ); | 35 | void slotClockChanged( bool pm ); |
36 | 36 | ||
37 | protected: | 37 | protected: |
38 | void mouseReleaseEvent( QMouseEvent * ); | 38 | void mouseReleaseEvent( QMouseEvent * ); |
39 | void timerEvent( QTimerEvent * ); | 39 | void timerEvent( QTimerEvent * ); |
40 | void changeTime( void ); | 40 | void changeTime( void ); |
41 | void readConfig(); | ||
41 | bool ampmFormat; | 42 | bool ampmFormat; |
42 | int timerId; | 43 | int timerId; |
44 | int format; | ||
43 | }; | 45 | }; |
44 | 46 | ||
45 | 47 | ||
46 | #endif // __LAUNCHER_CLOCK_H__ | 48 | #endif // __LAUNCHER_CLOCK_H__ |