-rw-r--r-- | core/applets/clockapplet/clock.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index 52d285b..19d3f6c 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp | |||
@@ -48,40 +48,37 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | |||
48 | timerId = 0; | 48 | timerId = 0; |
49 | timerEvent( 0 ); | 49 | timerEvent( 0 ); |
50 | show(); | 50 | show(); |
51 | } | 51 | } |
52 | 52 | ||
53 | void LauncherClock::readConfig() { | 53 | void LauncherClock::readConfig() { |
54 | Config config( "qpe" ); | 54 | Config config( "qpe" ); |
55 | config.setGroup( "Time" ); | 55 | config.setGroup( "Time" ); |
56 | ampmFormat = config.readBoolEntry( "AMPM", TRUE ); | 56 | ampmFormat = config.readBoolEntry( "AMPM", TRUE ); |
57 | config.setGroup( "Date" ); | 57 | config.setGroup( "Date" ); |
58 | format = config.readNumEntry("ClockApplet",0); | 58 | format = config.readNumEntry("ClockApplet",0); |
59 | } | 59 | } |
60 | 60 | ||
61 | void LauncherClock::mouseReleaseEvent( QMouseEvent * ) | 61 | void LauncherClock::mouseReleaseEvent( QMouseEvent * ) |
62 | { | 62 | { |
63 | QCString setTimeApp; | 63 | QCString setTimeApp; |
64 | if (QFile::exists(QPEApplication::qpeDir()+"bin/netsystemtime")) | 64 | setTimeApp="systemtime"; |
65 | setTimeApp="netsystemtime"; | ||
66 | else setTimeApp="systemtime"; | ||
67 | QCopEnvelope e("QPE/Application/"+setTimeApp, "setDocument(QString)"); | 65 | QCopEnvelope e("QPE/Application/"+setTimeApp, "setDocument(QString)"); |
68 | QString lf = QString::null; | 66 | QString lf = QString::null; |
69 | 67 | ||
70 | e << lf; | 68 | e << lf; |
71 | |||
72 | } | 69 | } |
73 | 70 | ||
74 | 71 | ||
75 | void LauncherClock::timerEvent( QTimerEvent *e ) | 72 | void LauncherClock::timerEvent( QTimerEvent *e ) |
76 | { | 73 | { |
77 | if ( !e || e->timerId() == timerId ) { | 74 | if ( !e || e->timerId() == timerId ) { |
78 | killTimer( timerId ); | 75 | killTimer( timerId ); |
79 | changeTime(); | 76 | changeTime(); |
80 | QTime t = QTime::currentTime(); | 77 | QTime t = QTime::currentTime(); |
81 | int ms = (60 - t.second())*1000 - t.msec(); | 78 | int ms = (60 - t.second())*1000 - t.msec(); |
82 | timerId = startTimer( ms ); | 79 | timerId = startTimer( ms ); |
83 | } else { | 80 | } else { |
84 | QLabel::timerEvent( e ); | 81 | QLabel::timerEvent( e ); |
85 | } | 82 | } |
86 | } | 83 | } |
87 | 84 | ||