author | tille <tille> | 2002-10-31 20:23:34 (UTC) |
---|---|---|
committer | tille <tille> | 2002-10-31 20:23:34 (UTC) |
commit | 50f1091ee877020c9864ce24202951f49bec8cd7 (patch) (unidiff) | |
tree | 6d11eacb859a0024a9828210009e83173074a563 | |
parent | a491aa2ba326826b7493caa83fc6050e11d53be5 (diff) | |
download | opie-50f1091ee877020c9864ce24202951f49bec8cd7.zip opie-50f1091ee877020c9864ce24202951f49bec8cd7.tar.gz opie-50f1091ee877020c9864ce24202951f49bec8cd7.tar.bz2 |
netsystemtime does not exist anymore
-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 | |||
@@ -1,127 +1,124 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "clock.h" | 21 | #include "clock.h" |
22 | 22 | ||
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | 27 | ||
28 | #include <qmainwindow.h> | 28 | #include <qmainwindow.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | #include <qpushbutton.h> | 30 | #include <qpushbutton.h> |
31 | #include <qmessagebox.h> | 31 | #include <qmessagebox.h> |
32 | #include <qdatetime.h> | 32 | #include <qdatetime.h> |
33 | #include <qtimer.h> | 33 | #include <qtimer.h> |
34 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
35 | #include <qfile.h> | 35 | #include <qfile.h> |
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | 38 | ||
39 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | 39 | 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", 10, 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 ) ) ); |
47 | readConfig(); | 47 | readConfig(); |
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 | ||
88 | void LauncherClock::updateTime( void ) | 85 | void LauncherClock::updateTime( void ) |
89 | { | 86 | { |
90 | changeTime(); | 87 | changeTime(); |
91 | } | 88 | } |
92 | 89 | ||
93 | void LauncherClock::changeTime( void ) | 90 | void LauncherClock::changeTime( void ) |
94 | { | 91 | { |
95 | QTime tm = QDateTime::currentDateTime().time(); | 92 | QTime tm = QDateTime::currentDateTime().time(); |
96 | QString s; | 93 | QString s; |
97 | if( ampmFormat ) { | 94 | if( ampmFormat ) { |
98 | int hour = tm.hour(); | 95 | int hour = tm.hour(); |
99 | if (hour == 0) | 96 | if (hour == 0) |
100 | hour = 12; | 97 | hour = 12; |
101 | if (hour > 12) | 98 | if (hour > 12) |
102 | hour -= 12; | 99 | hour -= 12; |
103 | s.sprintf( "%2d:%02d %s", hour, tm.minute(), | 100 | s.sprintf( "%2d:%02d %s", hour, tm.minute(), |
104 | (tm.hour() >= 12) ? "PM" : "AM" ); | 101 | (tm.hour() >= 12) ? "PM" : "AM" ); |
105 | } else | 102 | } else |
106 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); | 103 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); |
107 | 104 | ||
108 | if (format==1) { | 105 | if (format==1) { |
109 | QDate dm = QDate::currentDate(); | 106 | QDate dm = QDate::currentDate(); |
110 | QString d; | 107 | QString d; |
111 | d.sprintf("%d/%d ", dm.day(), dm.month()); | 108 | d.sprintf("%d/%d ", dm.day(), dm.month()); |
112 | setText( d+s ); | 109 | setText( d+s ); |
113 | } else if (format==2) { | 110 | } else if (format==2) { |
114 | QDate dm = QDate::currentDate(); | 111 | QDate dm = QDate::currentDate(); |
115 | QString d; | 112 | QString d; |
116 | d.sprintf("%d/%d ", dm.month(), dm.day()); | 113 | d.sprintf("%d/%d ", dm.month(), dm.day()); |
117 | setText( d+s ); | 114 | setText( d+s ); |
118 | } else { | 115 | } else { |
119 | setText( s ); | 116 | setText( s ); |
120 | } | 117 | } |
121 | } | 118 | } |
122 | 119 | ||
123 | void LauncherClock::slotClockChanged( bool pm ) | 120 | void LauncherClock::slotClockChanged( bool pm ) |
124 | { | 121 | { |
125 | readConfig(); | 122 | readConfig(); |
126 | updateTime(); | 123 | updateTime(); |
127 | } | 124 | } |