summaryrefslogtreecommitdiff
authortille <tille>2002-06-25 20:10:42 (UTC)
committer tille <tille>2002-06-25 20:10:42 (UTC)
commit4c671979117dc8ec75c91ce543c7039730530a63 (patch) (unidiff)
tree69995a8c917fba569814fd0475e7819a95d65ac5
parentaf4a3940dd672423da28b54e5d955cc5d33cecda (diff)
downloadopie-4c671979117dc8ec75c91ce543c7039730530a63.zip
opie-4c671979117dc8ec75c91ce543c7039730530a63.tar.gz
opie-4c671979117dc8ec75c91ce543c7039730530a63.tar.bz2
working
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp77
-rw-r--r--noncore/settings/netsystemtime/ntp.h13
-rw-r--r--noncore/settings/netsystemtime/ntpbase.ui171
-rw-r--r--noncore/settings/netsystemtime/settime.cpp27
-rw-r--r--noncore/settings/netsystemtime/settime.h10
5 files changed, 212 insertions, 86 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 87b20ec..4a7959e 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -1,117 +1,122 @@
1#include "ntp.h" 1#include "ntp.h"
2#include <qpushbutton.h> 2#include <qpushbutton.h>
3#include <qregexp.h> 3#include <qregexp.h>
4#include <qtable.h> 4#include <qtable.h>
5#include <qlabel.h> 5#include <qlabel.h>
6#include <qsocket.h>
6#include <qlineedit.h> 7#include <qlineedit.h>
8#include <qspinbox.h>
7#include <qmultilineedit.h> 9#include <qmultilineedit.h>
8#include <opie/oprocess.h> 10#include <opie/oprocess.h>
9#include <qpe/config.h> 11#include <qpe/config.h>
10#include <qpe/global.h> 12#include <qpe/global.h>
11#include <qpe/timeconversion.h> 13#include <qpe/timeconversion.h>
12#include <qpe/tzselect.h> 14#include <qpe/tzselect.h>
13#include <qpe/timestring.h> 15#include <qpe/timestring.h>
14#include <qpe/qpedialog.h> 16#include <qpe/qpedialog.h>
15#include <sys/time.h> 17#include <sys/time.h>
16#include <time.h> 18#include <time.h>
17#include <stdlib.h> 19#include <stdlib.h>
18 20
19 21
20Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) 22Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
21 : SetDateTime( parent, name, fl ) 23 : SetDateTime( parent, name, fl )
22{ 24{
23 Config cfg("ntp",Config::User); 25 Config cfg("ntp",Config::User);
24 cfg.setGroup("settings"); 26 cfg.setGroup("settings");
25 _maxOffset = cfg.readNumEntry("maxOffset",5); 27 // _maxOffset = cfg.readNumEntry("maxOffset",5);
26 _minLookupDiff = cfg.readNumEntry("minLookupDiff",10); 28// _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
27 LineEditNtpServer->setText( cfg.readEntry("ntpServer") ); 29 SpinBoxMinDelay->setValue( cfg.readNumEntry("minLookupDiff",10) );
30 SpinBoxMinDelay->setMinValue( 7 );
31 LineEditNtpSrv->setText( cfg.readEntry("ntpServer", tr("time.fu-berlin.de")) );
28 ntpProcess = new OProcess( ); 32 ntpProcess = new OProcess( );
33
34 QSocket *ntpSock = new QSocket( this );
35 ntpSock->connectToHost( LineEditNtpSrv->text() ,123);
36 connect( ntpSock, SIGNAL( error(int) ),
37 SLOT(slotCheckNtp(int)) );
38
29 connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), 39 connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
30 this, SLOT(getNtpOutput(OProcess*,char*,int))); 40 this, SLOT(getNtpOutput(OProcess*,char*,int)));
31 connect ( ntpProcess, SIGNAL(processExited(OProcess*)), 41 connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
32 this, SLOT(ntpFinished(OProcess*))); 42 this, SLOT(ntpFinished(OProcess*)));
33 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp())); 43 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
34 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime())); 44 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
35 // _nextCorrection = new QTimer( this ); 45
36// connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) ); 46// slotRunNtp();
37 slotRunNtp();
38 readLookups(); 47 readLookups();
39} 48}
40 49
41Ntp::~Ntp() 50Ntp::~Ntp()
42{ 51{
43
44}
45
46void Ntp::accept()
47{
48 Config cfg("ntp",Config::User); 52 Config cfg("ntp",Config::User);
49 cfg.setGroup("settings"); 53 cfg.setGroup("settings");
50 cfg.writeEntry("ntpServer", LineEditNtpServer->text()); 54 cfg.writeEntry("ntpServer", LineEditNtpSrv->text());
55 cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() );
51} 56}
52 57
53 58
54void Ntp::slotRunNtp() 59void Ntp::slotRunNtp()
55{ 60{
56 TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); 61 TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
57 ntpProcess->clearArguments(); 62 ntpProcess->clearArguments();
58 *ntpProcess << "ntpdate" << LineEditNtpServer->text(); 63 *ntpProcess << "ntpdate" << LineEditNtpSrv->text();
59 bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); 64 bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
60 if ( !ret ) { 65 if ( !ret ) {
61 qDebug("Error while executing ntp"); 66 qDebug("Error while executing ntp");
62 } 67 }
63} 68}
64 69
65void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) 70void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
66{ 71{
67 QString lineStr, lineStrOld; 72 QString lineStr, lineStrOld;
68 lineStr = buffer; 73 lineStr = buffer;
69 lineStr=lineStr.left(buflen); 74 lineStr=lineStr.left(buflen);
70 if (lineStr!=lineStrOld) 75 if (lineStr!=lineStrOld)
71 { 76 {
72 // outPut->append(lineStr); 77 MultiLineEditntpOutPut->append(lineStr);
73 _ntpOutput += lineStr; 78 _ntpOutput += lineStr;
74 } 79 }
75 lineStrOld = lineStr; 80 lineStrOld = lineStr;
76} 81}
77 82
78void Ntp::ntpFinished(OProcess*) 83void Ntp::ntpFinished(OProcess*)
79{ 84{
80 Config cfg("ntp",Config::User); 85 Config cfg("ntp",Config::User);
81 cfg.setGroup("lookups"); 86 cfg.setGroup("lookups");
82 int lastLookup = cfg.readNumEntry("time",0); 87 int lastLookup = cfg.readNumEntry("time",0);
83 int lookupCount = cfg.readNumEntry("count",-1); 88 int lookupCount = cfg.readNumEntry("count",-1);
84 int time = TimeConversion::toUTC( QDateTime::currentDateTime() ); 89 int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
85 cfg.writeEntry("time", time); 90 cfg.writeEntry("time", time);
86 cfg.setGroup("correction"); 91 cfg.setGroup("correction");
87 cfg.writeEntry("time", time); 92 cfg.writeEntry("time", time);
88 93
89 float timeShift = getTimeShift(); 94 float timeShift = getTimeShift();
90 if (timeShift == 0.0) return; 95 if (timeShift == 0.0) return;
91 int secsSinceLast = time - lastLookup; 96 int secsSinceLast = time - lastLookup;
92 TextLabelNewTime->setText(QDateTime::currentDateTime().toString()); 97 TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
93 if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff) 98 if ( lastLookup > 0 && secsSinceLast > 60*24* SpinBoxMinDelay->value())
94 { 99 {
95 lookupCount++; 100 lookupCount++;
96 cfg.writeEntry("count",lookupCount); 101 cfg.writeEntry("count",lookupCount);
97 cfg.setGroup("lookup_"+QString::number(lookupCount)); 102 cfg.setGroup("lookup_"+QString::number(lookupCount));
98 _shiftPerSec = timeShift / secsSinceLast; 103 _shiftPerSec = timeShift / secsSinceLast;
99// float nextCorr = _maxOffset / _shiftPerSec; 104// float nextCorr = _maxOffset / _shiftPerSec;
100 qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec); 105 qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);
101 cfg.writeEntry("secsSinceLast",secsSinceLast); 106 cfg.writeEntry("secsSinceLast",secsSinceLast);
102 cfg.writeEntry("timeShift",QString::number(timeShift)); 107 cfg.writeEntry("timeShift",QString::number(timeShift));
103 } 108 }
104} 109}
105 110
106//void Ntp::correctClock() 111//void Ntp::correctClock()
107//{ 112//{
108 //qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1()); 113 //qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
109 //Config cfg("ntp",Config::User); 114 //Config cfg("ntp",Config::User);
110// cfg.setGroup("correction"); 115// cfg.setGroup("correction");
111 // int lastTime = cfg.readNumEntry("time",0); 116 // int lastTime = cfg.readNumEntry("time",0);
112// if ( lastTime == 0 ) 117// if ( lastTime == 0 )
113// { 118// {
114 // return; 119 // return;
115// } 120// }
116// int now = TimeConversion::toUTC( QDateTime::currentDateTime() ); 121// int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
117// int corr = int((now - lastTime) * _shiftPerSec); 122// int corr = int((now - lastTime) * _shiftPerSec);
@@ -130,62 +135,82 @@ float Ntp::getTimeShift()
130{ 135{
131 QString _offset = "offset"; 136 QString _offset = "offset";
132 QString _sec = "sec"; 137 QString _sec = "sec";
133 QRegExp _reOffset = QRegExp(_offset); 138 QRegExp _reOffset = QRegExp(_offset);
134 QRegExp _reEndOffset = QRegExp(_sec); 139 QRegExp _reEndOffset = QRegExp(_sec);
135 int posOffset = _reOffset.match( _ntpOutput ); 140 int posOffset = _reOffset.match( _ntpOutput );
136 int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset ); 141 int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset );
137 posOffset += _offset.length() + 1; 142 posOffset += _offset.length() + 1;
138 QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1); 143 QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1);
139 qDebug("%s", _ntpOutput.latin1()); 144 qDebug("%s", _ntpOutput.latin1());
140 qDebug("diff = >%s<",diff.latin1()); 145 qDebug("diff = >%s<",diff.latin1());
141 TextLabelTimeShift->setText(diff); 146 TextLabelTimeShift->setText(diff);
142 return diff.toFloat(); 147 return diff.toFloat();
143} 148}
144 149
145void Ntp::readLookups() 150void Ntp::readLookups()
146{ 151{
147 Config cfg("ntp",Config::User); 152 Config cfg("ntp",Config::User);
148 cfg.setGroup("lookups"); 153 cfg.setGroup("lookups");
149 int lookupCount = cfg.readNumEntry("count",-1); 154 int lookupCount = cfg.readNumEntry("count",-1);
150 float last, shift, shiftPerSec; 155 float last, shift, shiftPerSec;
151 qDebug("lookupCount = %i",lookupCount); 156 qDebug("lookupCount = %i",lookupCount);
152 TableLookups->setNumCols( 3 ); 157 TableLookups->setNumCols( 3 );
153 TableLookups->setNumRows( lookupCount); 158 TableLookups->setNumRows( lookupCount);
154 TableLookups->horizontalHeader()->setLabel(2,"secsSinceLast"); 159 TableLookups->horizontalHeader()->setLabel(1,"secsSinceLast");
155 TableLookups->horizontalHeader()->setLabel(1,"timeShift"); 160 TableLookups->horizontalHeader()->setLabel(2,"timeShift");
156 TableLookups->horizontalHeader()->setLabel(0,"shift/s"); 161 TableLookups->horizontalHeader()->setLabel(0,"shift/s");
157 int cw = TableLookups->width()/4; 162 int cw = 50;//TableLookups->width()/4;
158 qDebug("column width %i",cw); 163 qDebug("column width %i",cw);
159 TableLookups->setColumnWidth( 0, cw ); 164 TableLookups->setColumnWidth( 0, cw+30 );
160 TableLookups->setColumnWidth( 1, cw ); 165 TableLookups->setColumnWidth( 1, cw );
161 TableLookups->setColumnWidth( 2, cw ); 166 TableLookups->setColumnWidth( 2, cw );
162 for (int i=0; i < lookupCount; i++) 167 for (int i=0; i < lookupCount; i++)
163 { 168 {
164 cfg.setGroup("lookup_"+QString::number(i)); 169 cfg.setGroup("lookup_"+QString::number(i));
165 last = cfg.readEntry("secsSinceLast",0).toFloat(); 170 last = cfg.readEntry("secsSinceLast",0).toFloat();
166 shift = QString(cfg.readEntry("timeShift",0)).toFloat(); 171 shift = QString(cfg.readEntry("timeShift",0)).toFloat();
167 qDebug("%i last %f",i,last); 172 // qDebug("%i last %f",i,last);
168 qDebug("%i shift %f",i,shift); 173 // qDebug("%i shift %f",i,shift);
169 shiftPerSec = shift / last; 174 shiftPerSec = shift / last;
170 _shiftPerSec += shiftPerSec; 175 _shiftPerSec += shiftPerSec;
171 TableLookups->setText( i,0,QString::number(shiftPerSec)); 176 TableLookups->setText( i,0,QString::number(shiftPerSec));
172 TableLookups->setText( i,1,QString::number(shift)); 177 TableLookups->setText( i,2,QString::number(shift));
173 TableLookups->setText( i,2,QString::number(last)); 178 TableLookups->setText( i,1,QString::number(last));
174 } 179 }
175 _shiftPerSec /= lookupCount+1; 180 _shiftPerSec /= lookupCount+1;
176 TextLabelShift->setText(QString::number(_shiftPerSec)); 181 TextLabelShift->setText(QString::number(_shiftPerSec));
177} 182}
178 183
179void Ntp::preditctTime() 184void Ntp::preditctTime()
180{ 185{
181 qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1()); 186 qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
182 Config cfg("ntp",Config::User); 187 Config cfg("ntp",Config::User);
183 cfg.setGroup("lookups"); 188 cfg.setGroup("lookups");
184 int lastTime = cfg.readNumEntry("time",0); 189 int lastTime = cfg.readNumEntry("time",0);
185 setenv( "TZ", tz->currentZone(), 1 ); 190 setenv( "TZ", tz->currentZone(), 1 );
186 int now = TimeConversion::toUTC( QDateTime::currentDateTime() ); 191 int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
187 int corr = int((now - lastTime) * _shiftPerSec); 192 int corr = int((now - lastTime) * _shiftPerSec);
188 QDateTime dt = QDateTime::currentDateTime().addSecs(corr); 193 predictedTime = QDateTime::currentDateTime().addSecs(corr);
189 setTime(dt); 194 TextLabelPredTime->setText(predictedTime.toString());
190 TextLabelPredTime->setText(dt.toString()); 195 TextLabelMainPredTime->setText(predictedTime.toString());
196}
197
198void Ntp::setPredictTime()
199{
200 preditctTime();
201 setTime( predictedTime );
202}
203
204void Ntp::slotCheckNtp(int i)
205{
206 if (i == 0)
207 {
208 TextLabelMainPredTime->hide();
209 ButtonSetTime->setText( tr("Get time from network") );
210 connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) );
211 }else{
212 preditctTime();
213 ButtonSetTime->setText( tr("Predict time") );
214 connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
215 };
191} 216}
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index d2e238d..284ae27 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -1,41 +1,38 @@
1#ifndef NTP_H 1#ifndef NTP_H
2#define NTP_H 2#define NTP_H
3#include "settime.h" 3#include "settime.h"
4#include <qdatetime.h> 4#include <qdatetime.h>
5#include <qtimer.h>
6 5
7class OProcess; 6class OProcess;
8class QString; 7class QString;
9 8
10 9
11class Ntp : public SetDateTime 10class Ntp : public SetDateTime
12{ 11{
13 Q_OBJECT 12 Q_OBJECT
14 13
15public: 14public:
16 Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 15 Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
17 ~Ntp(); 16 ~Ntp();
18 17
19 OProcess *ntpProcess;
20
21protected: 18protected:
22 virtual void accept(); 19 QDateTime predictedTime;
20
23 21
24private: 22private:
25 QString _ntpOutput; 23 QString _ntpOutput;
26 int _maxOffset;
27 float _shiftPerSec; 24 float _shiftPerSec;
28 // QTimer *_nextCorrection; 25 OProcess *ntpProcess;
29 int _minLookupDiff;
30 26
31 float getTimeShift(); 27 float getTimeShift();
32 void readLookups(); 28 void readLookups();
33private slots: 29private slots:
34 void slotRunNtp(); 30 void slotRunNtp();
35 void getNtpOutput(OProcess *proc, char *buffer, int buflen); 31 void getNtpOutput(OProcess *proc, char *buffer, int buflen);
36 void ntpFinished(OProcess*); 32 void ntpFinished(OProcess*);
37// void correctClock();
38 void preditctTime(); 33 void preditctTime();
34 void slotCheckNtp(int);
35 void setPredictTime();
39}; 36};
40 37
41#endif 38#endif
diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui
index ccae5bf..e444065 100644
--- a/noncore/settings/netsystemtime/ntpbase.ui
+++ b/noncore/settings/netsystemtime/ntpbase.ui
@@ -1,38 +1,38 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>NtpBase</class> 2<class>NtpBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>NtpBase</cstring> 7 <cstring>NtpBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>280</width> 14 <width>276</width>
15 <height>337</height> 15 <height>337</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Network Time</string> 20 <string>Network Time</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <grid> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>2</number> 31 <number>2</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>1</number> 35 <number>1</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="0" >
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
@@ -226,95 +226,71 @@
226 <spacer> 226 <spacer>
227 <property> 227 <property>
228 <name>name</name> 228 <name>name</name>
229 <cstring>Spacer1</cstring> 229 <cstring>Spacer1</cstring>
230 </property> 230 </property>
231 <property stdset="1"> 231 <property stdset="1">
232 <name>orientation</name> 232 <name>orientation</name>
233 <enum>Vertical</enum> 233 <enum>Vertical</enum>
234 </property> 234 </property>
235 <property stdset="1"> 235 <property stdset="1">
236 <name>sizeType</name> 236 <name>sizeType</name>
237 <enum>Expanding</enum> 237 <enum>Expanding</enum>
238 </property> 238 </property>
239 <property> 239 <property>
240 <name>sizeHint</name> 240 <name>sizeHint</name>
241 <size> 241 <size>
242 <width>20</width> 242 <width>20</width>
243 <height>20</height> 243 <height>20</height>
244 </size> 244 </size>
245 </property> 245 </property>
246 </spacer> 246 </spacer>
247 </vbox> 247 </vbox>
248 </widget> 248 </widget>
249 <widget row="1" column="0" > 249 <widget row="1" column="0" >
250 <class>QLayoutWidget</class> 250 <class>QMultiLineEdit</class>
251 <property stdset="1"> 251 <property stdset="1">
252 <name>name</name> 252 <name>name</name>
253 <cstring>Layout6</cstring> 253 <cstring>MultiLineEditntpOutPut</cstring>
254 </property>
255 <property stdset="1">
256 <name>wordWrap</name>
257 <enum>WidgetWidth</enum>
254 </property> 258 </property>
255 <hbox>
256 <property stdset="1">
257 <name>margin</name>
258 <number>0</number>
259 </property>
260 <property stdset="1">
261 <name>spacing</name>
262 <number>6</number>
263 </property>
264 <widget>
265 <class>QLabel</class>
266 <property stdset="1">
267 <name>name</name>
268 <cstring>TextLabel7</cstring>
269 </property>
270 <property stdset="1">
271 <name>text</name>
272 <string>NTP Server:</string>
273 </property>
274 </widget>
275 <widget>
276 <class>QLineEdit</class>
277 <property stdset="1">
278 <name>name</name>
279 <cstring>LineEditNtpServer</cstring>
280 </property>
281 </widget>
282 </hbox>
283 </widget> 259 </widget>
284 </grid> 260 </grid>
285 </widget> 261 </widget>
286 </grid> 262 </grid>
287 </widget> 263 </widget>
288 <widget> 264 <widget>
289 <class>QWidget</class> 265 <class>QWidget</class>
290 <property stdset="1"> 266 <property stdset="1">
291 <name>name</name> 267 <name>name</name>
292 <cstring>tab</cstring> 268 <cstring>tab</cstring>
293 </property> 269 </property>
294 <attribute> 270 <attribute>
295 <name>title</name> 271 <name>title</name>
296 <string>Auto</string> 272 <string>Predict</string>
297 </attribute> 273 </attribute>
298 <grid> 274 <grid>
299 <property stdset="1"> 275 <property stdset="1">
300 <name>margin</name> 276 <name>margin</name>
301 <number>2</number> 277 <number>2</number>
302 </property> 278 </property>
303 <property stdset="1"> 279 <property stdset="1">
304 <name>spacing</name> 280 <name>spacing</name>
305 <number>2</number> 281 <number>2</number>
306 </property> 282 </property>
307 <widget row="0" column="0" > 283 <widget row="0" column="0" >
308 <class>QTable</class> 284 <class>QTable</class>
309 <property stdset="1"> 285 <property stdset="1">
310 <name>name</name> 286 <name>name</name>
311 <cstring>TableLookups</cstring> 287 <cstring>TableLookups</cstring>
312 </property> 288 </property>
313 <property stdset="1"> 289 <property stdset="1">
314 <name>numRows</name> 290 <name>numRows</name>
315 <number>2</number> 291 <number>2</number>
316 </property> 292 </property>
317 <property stdset="1"> 293 <property stdset="1">
318 <name>numCols</name> 294 <name>numCols</name>
319 <number>2</number> 295 <number>2</number>
320 </property> 296 </property>
@@ -405,48 +381,177 @@
405 </attribute> 381 </attribute>
406 <grid> 382 <grid>
407 <property stdset="1"> 383 <property stdset="1">
408 <name>margin</name> 384 <name>margin</name>
409 <number>3</number> 385 <number>3</number>
410 </property> 386 </property>
411 <property stdset="1"> 387 <property stdset="1">
412 <name>spacing</name> 388 <name>spacing</name>
413 <number>3</number> 389 <number>3</number>
414 </property> 390 </property>
415 <widget row="0" column="0" > 391 <widget row="0" column="0" >
416 <class>QFrame</class> 392 <class>QFrame</class>
417 <property stdset="1"> 393 <property stdset="1">
418 <name>name</name> 394 <name>name</name>
419 <cstring>FrameSettings</cstring> 395 <cstring>FrameSettings</cstring>
420 </property> 396 </property>
421 <property stdset="1"> 397 <property stdset="1">
422 <name>frameShape</name> 398 <name>frameShape</name>
423 <enum>StyledPanel</enum> 399 <enum>StyledPanel</enum>
424 </property> 400 </property>
425 <property stdset="1"> 401 <property stdset="1">
426 <name>frameShadow</name> 402 <name>frameShadow</name>
427 <enum>Raised</enum> 403 <enum>Raised</enum>
428 </property> 404 </property>
405 <grid>
406 <property stdset="1">
407 <name>margin</name>
408 <number>11</number>
409 </property>
410 <property stdset="1">
411 <name>spacing</name>
412 <number>6</number>
413 </property>
414 <widget row="0" column="0" >
415 <class>QLayoutWidget</class>
416 <property stdset="1">
417 <name>name</name>
418 <cstring>Layout6</cstring>
419 </property>
420 <grid>
421 <property stdset="1">
422 <name>margin</name>
423 <number>0</number>
424 </property>
425 <property stdset="1">
426 <name>spacing</name>
427 <number>6</number>
428 </property>
429 <spacer row="2" column="0" >
430 <property>
431 <name>name</name>
432 <cstring>Spacer2</cstring>
433 </property>
434 <property stdset="1">
435 <name>orientation</name>
436 <enum>Vertical</enum>
437 </property>
438 <property stdset="1">
439 <name>sizeType</name>
440 <enum>Expanding</enum>
441 </property>
442 <property>
443 <name>sizeHint</name>
444 <size>
445 <width>20</width>
446 <height>20</height>
447 </size>
448 </property>
449 </spacer>
450 <widget row="1" column="0" >
451 <class>QLayoutWidget</class>
452 <property stdset="1">
453 <name>name</name>
454 <cstring>Layout6</cstring>
455 </property>
456 <hbox>
457 <property stdset="1">
458 <name>margin</name>
459 <number>0</number>
460 </property>
461 <property stdset="1">
462 <name>spacing</name>
463 <number>6</number>
464 </property>
465 <widget>
466 <class>QLabel</class>
467 <property stdset="1">
468 <name>name</name>
469 <cstring>TextLabel7_2</cstring>
470 </property>
471 <property stdset="1">
472 <name>text</name>
473 <string>NTP Server:</string>
474 </property>
475 </widget>
476 <widget>
477 <class>QLineEdit</class>
478 <property stdset="1">
479 <name>name</name>
480 <cstring>LineEditNtpSrv</cstring>
481 </property>
482 </widget>
483 </hbox>
484 </widget>
485 <widget row="0" column="0" >
486 <class>QLayoutWidget</class>
487 <property stdset="1">
488 <name>name</name>
489 <cstring>Layout5</cstring>
490 </property>
491 <hbox>
492 <property stdset="1">
493 <name>margin</name>
494 <number>0</number>
495 </property>
496 <property stdset="1">
497 <name>spacing</name>
498 <number>6</number>
499 </property>
500 <widget>
501 <class>QLabel</class>
502 <property stdset="1">
503 <name>name</name>
504 <cstring>TextLabel1_2</cstring>
505 </property>
506 <property stdset="1">
507 <name>text</name>
508 <string>Min. delay:</string>
509 </property>
510 </widget>
511 <widget>
512 <class>QSpinBox</class>
513 <property stdset="1">
514 <name>name</name>
515 <cstring>SpinBoxMinDelay</cstring>
516 </property>
517 </widget>
518 <widget>
519 <class>QLabel</class>
520 <property stdset="1">
521 <name>name</name>
522 <cstring>TextLabel2</cstring>
523 </property>
524 <property stdset="1">
525 <name>text</name>
526 <string>minutes</string>
527 </property>
528 </widget>
529 </hbox>
530 </widget>
531 </grid>
532 </widget>
533 </grid>
429 </widget> 534 </widget>
430 </grid> 535 </grid>
431 </widget> 536 </widget>
432 <widget> 537 <widget>
433 <class>QWidget</class> 538 <class>QWidget</class>
434 <property stdset="1"> 539 <property stdset="1">
435 <name>name</name> 540 <name>name</name>
436 <cstring>tabSetTime</cstring> 541 <cstring>tabSetTime</cstring>
437 </property> 542 </property>
438 <attribute> 543 <attribute>
439 <name>title</name> 544 <name>title</name>
440 <string>Manual</string> 545 <string>Manual</string>
441 </attribute> 546 </attribute>
442 <vbox> 547 <vbox>
443 <property stdset="1"> 548 <property stdset="1">
444 <name>margin</name> 549 <name>margin</name>
445 <number>2</number> 550 <number>2</number>
446 </property> 551 </property>
447 <property stdset="1"> 552 <property stdset="1">
448 <name>spacing</name> 553 <name>spacing</name>
449 <number>2</number> 554 <number>2</number>
450 </property> 555 </property>
451 <widget> 556 <widget>
452 <class>QFrame</class> 557 <class>QFrame</class>
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 01268c9..2cef6e8 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -39,81 +39,89 @@
39#include <qcheckbox.h> 39#include <qcheckbox.h>
40#include <qlabel.h> 40#include <qlabel.h>
41#include <qlayout.h> 41#include <qlayout.h>
42#include <qradiobutton.h> 42#include <qradiobutton.h>
43#include <qspinbox.h> 43#include <qspinbox.h>
44#include <qtoolbutton.h> 44#include <qtoolbutton.h>
45#include <qwindowsystem_qws.h> 45#include <qwindowsystem_qws.h>
46#include <qcombobox.h> 46#include <qcombobox.h>
47 47
48#include <sys/time.h> 48#include <sys/time.h>
49#include <time.h> 49#include <time.h>
50#include <stdlib.h> 50#include <stdlib.h>
51#include <stdio.h> 51#include <stdio.h>
52 52
53 53
54SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 54SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
55 : NtpBase( parent, name, f ) 55 : NtpBase( parent, name, f )
56{ 56{
57 // setCaption( tr("Set System Time") ); 57 // setCaption( tr("Set System Time") );
58 58
59// QVBoxLayout *vb = new QVBoxLayout( this, 5 ); 59// QVBoxLayout *vb = new QVBoxLayout( this, 5 );
60 QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); 60 QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 );
61 QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 ); 61 QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 );
62 62
63 TextLabelMainPredTime = new QLabel( FrameSystemTime );
64 vb->addWidget( TextLabelMainPredTime, 1, 0 );
65 ButtonSetTime = new QPushButton( FrameSystemTime );
66 vb->addWidget( ButtonSetTime, 1, 0 );
67
68 QFrame *hline = new QFrame( FrameSystemTime );
69 hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
70 vb->addWidget( hline );
71
63 QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); 72 QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" );
64 73
65 QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" ); 74 QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" );
66 lblZone->setMaximumSize( lblZone->sizeHint() ); 75 lblZone->setMaximumSize( lblZone->sizeHint() );
67 hb->addWidget( lblZone ); 76 hb->addWidget( lblZone );
68 77
69 tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" ); 78 tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" );
70 tz->setMinimumSize( tz->sizeHint() ); 79 tz->setMinimumSize( tz->sizeHint() );
71 hb->addWidget( tz ); 80 hb->addWidget( tz );
72 81
73 timeButton = new SetTime( FrameSetTime ); 82 timeButton = new SetTime( FrameSetTime );
74 vb2->addWidget( timeButton ); 83 vb2->addWidget( timeButton );
75 84
76 QHBoxLayout *db = new QHBoxLayout( vb2 ); 85 QHBoxLayout *db = new QHBoxLayout( vb2 );
77 QLabel *dateLabel = new QLabel( tr("Date"), FrameSetTime ); 86 QLabel *dateLabel = new QLabel( tr("Date"), FrameSetTime );
78 db->addWidget( dateLabel, 1 ); 87 db->addWidget( dateLabel, 1 );
79 dateButton = new DateButton( TRUE, FrameSetTime ); 88 dateButton = new DateButton( TRUE, FrameSetTime );
80 db->addWidget( dateButton, 2 ); 89 db->addWidget( dateButton, 2 );
81 90
82 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 91 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
83 vb2->addItem( spacer ); 92 vb2->addItem( spacer );
84 93
85 QFrame *hline = new QFrame( FrameSystemTime ); 94 hline = new QFrame( FrameSystemTime );
86 hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); 95 hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
87 vb->addWidget( hline ); 96 vb->addWidget( hline );
88 97
89 Config config("qpe"); 98 Config config("qpe");
90 config.setGroup( "Time" ); 99 config.setGroup( "Time" );
91 100
92 QHBoxLayout *hb1 = new QHBoxLayout( vb ); 101 QHBoxLayout *hb1 = new QHBoxLayout( vb );
93 102
94 QLabel *l = new QLabel( tr("Time format"), FrameSystemTime ); 103 QLabel *l = new QLabel( tr("Time format"), FrameSystemTime );
95 // l->setAlignment( AlignRight | AlignVCenter );
96 hb1->addWidget( l, 1 ); 104 hb1->addWidget( l, 1 );
97 105
98 106
99 ampmCombo = new QComboBox( FrameSystemTime ); 107 ampmCombo = new QComboBox( FrameSystemTime );
100 ampmCombo->insertItem( tr("24 hour"), 0 ); 108 ampmCombo->insertItem( tr("24 hour"), 0 );
101 ampmCombo->insertItem( tr("12 hour"), 1 ); 109 ampmCombo->insertItem( tr("12 hour"), 1 );
102 hb1->addWidget( ampmCombo, 2 ); 110 hb1->addWidget( ampmCombo, 2 );
103 111
104 int show12hr = config.readBoolEntry("AMPM") ? 1 : 0; 112 int show12hr = config.readBoolEntry("AMPM") ? 1 : 0;
105 ampmCombo->setCurrentItem( show12hr ); 113 ampmCombo->setCurrentItem( show12hr );
106 timeButton->show12hourTime( show12hr ); 114 timeButton->show12hourTime( show12hr );
107 115
108 connect(ampmCombo, SIGNAL(activated(int)), 116 connect(ampmCombo, SIGNAL(activated(int)),
109 timeButton, SLOT(show12hourTime(int))); 117 timeButton, SLOT(show12hourTime(int)));
110 118
111 119
112 120
113 QHBoxLayout *hb2 = new QHBoxLayout( vb ); 121 QHBoxLayout *hb2 = new QHBoxLayout( vb );
114 l = new QLabel( tr("Weeks start on" ), FrameSystemTime ); 122 l = new QLabel( tr("Weeks start on" ), FrameSystemTime );
115 //l->setAlignment( AlignRight | AlignVCenter ); 123 //l->setAlignment( AlignRight | AlignVCenter );
116 hb2->addWidget( l, 1 ); 124 hb2->addWidget( l, 1 );
117 125
118 weekStartCombo = new QComboBox( FrameSystemTime ); 126 weekStartCombo = new QComboBox( FrameSystemTime );
119 weekStartCombo->insertItem( tr("Sunday"), 0 ); 127 weekStartCombo->insertItem( tr("Sunday"), 0 );
@@ -156,58 +164,58 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
156 currentdf = 3; 164 currentdf = 3;
157 dateFormatCombo->insertItem( tr( date_formats[3].toNumberString() ) ); 165 dateFormatCombo->insertItem( tr( date_formats[3].toNumberString() ) );
158 166
159 dateFormatCombo->setCurrentItem( currentdf ); 167 dateFormatCombo->setCurrentItem( currentdf );
160 dateButton->setDateFormat( df ); 168 dateButton->setDateFormat( df );
161 169
162 connect( dateFormatCombo, SIGNAL( activated(int)), 170 connect( dateFormatCombo, SIGNAL( activated(int)),
163 SLOT(formatChanged(int))); 171 SLOT(formatChanged(int)));
164 172
165 QHBoxLayout *hb4 = new QHBoxLayout( vb ); 173 QHBoxLayout *hb4 = new QHBoxLayout( vb );
166 l = new QLabel( tr("Applet format" ), FrameSystemTime ); 174 l = new QLabel( tr("Applet format" ), FrameSystemTime );
167 hb4->addWidget( l, 1 ); 175 hb4->addWidget( l, 1 );
168 176
169 clockAppletCombo = new QComboBox( FrameSystemTime ); 177 clockAppletCombo = new QComboBox( FrameSystemTime );
170 clockAppletCombo->insertItem( tr("hh:mm"), 0 ); 178 clockAppletCombo->insertItem( tr("hh:mm"), 0 );
171 clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 ); 179 clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 );
172 clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 ); 180 clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 );
173 181
174 hb4->addWidget( clockAppletCombo, 2 ); 182 hb4->addWidget( clockAppletCombo, 2 );
175 int clockApplet = config.readNumEntry("ClockApplet",0); 183 int clockApplet = config.readNumEntry("ClockApplet",0);
176 clockAppletCombo->setCurrentItem( clockApplet ); 184 clockAppletCombo->setCurrentItem( clockApplet );
177 185
178 vb->addStretch( 0 ); 186 vb->addStretch( 0 );
179 187
188 QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()),
189 this, SLOT(commitTime()));
190
180 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), 191 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
181 timeButton, SLOT( slotTzChange( const QString& ) ) ); 192 timeButton, SLOT( slotTzChange( const QString& ) ) );
182 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), 193 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
183 SLOT( tzChange( const QString& ) ) ); 194 SLOT( tzChange( const QString& ) ) );
184 QObject::connect( PushButtonSetManualTime, SLOT(clicked()),
185 SLOT(commitTime()));
186// dl = new QPEDialogListener(this);
187} 195}
188 196
189void SetDateTime::accept() 197SetDateTime::~SetDateTime()
190{ 198{
191 199
192 Config config("qpe"); 200 Config config("qpe");
193 config.setGroup( "Time" ); 201 config.setGroup( "Time" );
194 config.writeEntry( "AMPM", ampmCombo->currentItem() ); 202 config.writeEntry( "AMPM", ampmCombo->currentItem() );
195 config.writeEntry( "MONDAY", weekStartCombo->currentItem() ); 203 config.writeEntry( "MONDAY", weekStartCombo->currentItem() );
196 config.setGroup( "Date" ); 204 config.setGroup( "Date" );
197 DateFormat df = date_formats[dateFormatCombo->currentItem()]; 205 DateFormat df = date_formats[dateFormatCombo->currentItem()];
198 config.writeEntry( "Separator", QString(df.separator())); 206 config.writeEntry( "Separator", QString(df.separator()));
199 config.writeEntry( "ShortOrder", df.shortOrder()); 207 config.writeEntry( "ShortOrder", df.shortOrder());
200 config.writeEntry( "LongOrder", df.longOrder()); 208 config.writeEntry( "LongOrder", df.longOrder());
201 config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() ); 209 config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() );
202 210
203 Config lconfig("locale"); 211 Config lconfig("locale");
204 lconfig.setGroup( "Location" ); 212 lconfig.setGroup( "Location" );
205 lconfig.writeEntry( "Timezone", tz->currentZone() ); 213 lconfig.writeEntry( "Timezone", tz->currentZone() );
206 214
207} 215}
208 216
209void SetDateTime::commitTime() 217void SetDateTime::commitTime()
210{ 218{
211 tz->setFocus(); 219 tz->setFocus();
212 // really turn off the screensaver before doing anything 220 // really turn off the screensaver before doing anything
213 { 221 {
@@ -243,55 +251,48 @@ void SetDateTime::setTime(QDateTime dt)
243 // to allow the alarm server to get a better grip on itself 251 // to allow the alarm server to get a better grip on itself
244 // (example re-trigger alarms for when we travel back in time) 252 // (example re-trigger alarms for when we travel back in time)
245 DateBookDB db; 253 DateBookDB db;
246 254
247 // set the timezone for everyone else... 255 // set the timezone for everyone else...
248 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); 256 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
249 setTimeZone << tz->currentZone(); 257 setTimeZone << tz->currentZone();
250 258
251 // AM/PM setting and notify time changed 259 // AM/PM setting and notify time changed
252 QCopEnvelope setClock( "QPE/System", "clockChange(bool)" ); 260 QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
253 setClock << ampmCombo->currentItem(); 261 setClock << ampmCombo->currentItem();
254 262
255 // Notify everyone what day we prefer to start the week on. 263 // Notify everyone what day we prefer to start the week on.
256 QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" ); 264 QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
257 setWeek << weekStartCombo->currentItem(); 265 setWeek << weekStartCombo->currentItem();
258 266
259 // Notify everyone what date format to use 267 // Notify everyone what date format to use
260 QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" ); 268 QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
261 setDateFormat << date_formats[dateFormatCombo->currentItem()]; 269 setDateFormat << date_formats[dateFormatCombo->currentItem()];
262 270
263 // Restore screensaver 271 // Restore screensaver
264 QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); 272 QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
265 enableScreenSaver << -1 << -1 << -1; 273 enableScreenSaver << -1 << -1 << -1;
266 274
267 // QDialog::accept();
268}
269
270void SetDateTime::done(int r)
271{
272// QDialog::done(r);
273 close();
274} 275}
275 276
276void SetDateTime::tzChange( const QString &tz ) 277void SetDateTime::tzChange( const QString &tz )
277{ 278{
278 // set the TZ get the time and leave gracefully... 279 // set the TZ get the time and leave gracefully...
279 QString strSave; 280 QString strSave;
280 strSave = getenv( "TZ" ); 281 strSave = getenv( "TZ" );
281 setenv( "TZ", tz, 1 ); 282 setenv( "TZ", tz, 1 );
282 283
283 QDate d = QDate::currentDate(); 284 QDate d = QDate::currentDate();
284 // reset the time. 285 // reset the time.
285 if ( !strSave.isNull() ) { 286 if ( !strSave.isNull() ) {
286 setenv( "TZ", strSave, 1 ); 287 setenv( "TZ", strSave, 1 );
287 } 288 }
288 dateButton->setDate( d ); 289 dateButton->setDate( d );
289} 290}
290 291
291void SetDateTime::formatChanged(int i) 292void SetDateTime::formatChanged(int i)
292{ 293{
293 dateButton->setDateFormat(date_formats[i]); 294 dateButton->setDateFormat(date_formats[i]);
294} 295}
295 296
296static const int ValueAM = 0; 297static const int ValueAM = 0;
297static const int ValuePM = 1; 298static const int ValuePM = 1;
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 729bf4b..60423e7 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -12,87 +12,85 @@
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#ifndef SYSTEM_TIME_H 20#ifndef SYSTEM_TIME_H
21#define SYSTEM_TIME_H 21#define SYSTEM_TIME_H
22 22
23 23
24#include <qdatetime.h> 24#include <qdatetime.h>
25#include <qdialog.h> 25#include <qdialog.h>
26 26
27#include <qpe/timestring.h> 27#include <qpe/timestring.h>
28#include "ntpbase.h" 28#include "ntpbase.h"
29 29
30class QToolButton; 30class QToolButton;
31class QSpinBox; 31class QSpinBox;
32class QLabel; 32class QLabel;
33class TimeZoneSelector; 33class TimeZoneSelector;
34class DateBookMonth; 34class DateBookMonth;
35class QComboBox; 35class QComboBox;
36//class QPEDialogListener;
37 36
38class SetTime : public QWidget 37class SetTime : public QWidget
39{ 38{
40 Q_OBJECT 39 Q_OBJECT
41public: 40public:
42 SetTime( QWidget *parent=0, const char *name=0 ); 41 SetTime( QWidget *parent=0, const char *name=0 );
43 42
44 QTime time() const; 43 QTime time() const;
45 44
46public slots: 45public slots:
47 void slotTzChange( const QString& tz ); 46 void slotTzChange( const QString& tz );
48 void show12hourTime( int ); 47 void show12hourTime( int );
49 48
50protected slots: 49protected slots:
51 void hourChanged( int value ); 50 void hourChanged( int value );
52 void minuteChanged( int value ); 51 void minuteChanged( int value );
53 52
54 void checkedPM( int ); 53 void checkedPM( int );
55 54
56protected: 55protected:
57 int hour; 56 int hour;
58 int minute; 57 int minute;
59 bool use12hourTime; 58 bool use12hourTime;
60 QComboBox *ampm; 59 QComboBox *ampm;
61 QSpinBox *sbHour; 60 QSpinBox *sbHour;
62 QSpinBox *sbMin; 61 QSpinBox *sbMin;
63}; 62};
64 63
65class DateButton; 64class DateButton;
66 65
67class SetDateTime : public NtpBase 66class SetDateTime : public NtpBase
68{ 67{
69 Q_OBJECT 68 Q_OBJECT
70public: 69public:
71 SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 ); 70 SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 );
71 ~SetDateTime();
72 72
73protected slots: 73protected slots:
74 void commitTime();
74 void tzChange( const QString &tz ); 75 void tzChange( const QString &tz );
75 void formatChanged(int); 76 void formatChanged(int);
76 77
77protected: 78protected:
78 void commitTime();
79 void setTime(QDateTime dt); 79 void setTime(QDateTime dt);
80 virtual void accept();
81 virtual void done(int);
82 80
83 SetTime *timeButton; 81 SetTime *timeButton;
84 DateButton *dateButton; 82 DateButton *dateButton;
85 TimeZoneSelector *tz; 83 TimeZoneSelector *tz;
86 QComboBox *weekStartCombo; 84 QComboBox *weekStartCombo;
87 QComboBox *ampmCombo; 85 QComboBox *ampmCombo;
88 QComboBox *dateFormatCombo; 86 QComboBox *dateFormatCombo;
89 QComboBox *clockAppletCombo; 87 QComboBox *clockAppletCombo;
90 88 QPushButton *ButtonSetTime;
91// QPEDialogListener *dl; 89 QLabel *TextLabelMainPredTime;
92 90
93 DateFormat date_formats[4]; 91 DateFormat date_formats[4];
94}; 92};
95 93
96 94
97#endif 95#endif
98 96