summaryrefslogtreecommitdiff
authortille <tille>2002-06-25 13:39:50 (UTC)
committer tille <tille>2002-06-25 13:39:50 (UTC)
commita3f1ec6a75ea762a54ed218f205956ca28d61599 (patch) (unidiff)
tree60d6911a808803dcfed90e7887a901c52b3443b0
parent8501705e4e50602aaabe9877e6d8821555e3a05a (diff)
downloadopie-a3f1ec6a75ea762a54ed218f205956ca28d61599.zip
opie-a3f1ec6a75ea762a54ed218f205956ca28d61599.tar.gz
opie-a3f1ec6a75ea762a54ed218f205956ca28d61599.tar.bz2
doing something ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp50
-rw-r--r--noncore/settings/netsystemtime/ntp.h4
-rw-r--r--noncore/settings/netsystemtime/settime.cpp24
-rw-r--r--noncore/settings/netsystemtime/settime.h1
4 files changed, 45 insertions, 34 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index ddb1372..87b20ec 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -32,8 +32,8 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
32 this, SLOT(ntpFinished(OProcess*))); 32 this, SLOT(ntpFinished(OProcess*)));
33 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp())); 33 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
34 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime())); 34 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
35 _nextCorrection = new QTimer( this ); 35 // _nextCorrection = new QTimer( this );
36 connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) ); 36// connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
37 slotRunNtp(); 37 slotRunNtp();
38 readLookups(); 38 readLookups();
39} 39}
@@ -83,6 +83,8 @@ void Ntp::ntpFinished(OProcess*)
83 int lookupCount = cfg.readNumEntry("count",-1); 83 int lookupCount = cfg.readNumEntry("count",-1);
84 int time = TimeConversion::toUTC( QDateTime::currentDateTime() ); 84 int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
85 cfg.writeEntry("time", time); 85 cfg.writeEntry("time", time);
86 cfg.setGroup("correction");
87 cfg.writeEntry("time", time);
86 88
87 float timeShift = getTimeShift(); 89 float timeShift = getTimeShift();
88 if (timeShift == 0.0) return; 90 if (timeShift == 0.0) return;
@@ -101,24 +103,28 @@ void Ntp::ntpFinished(OProcess*)
101 } 103 }
102} 104}
103 105
104void Ntp::correctClock() 106//void Ntp::correctClock()
105{ 107//{
106 qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1()); 108 //qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
107 Config cfg("ntp",Config::User); 109 //Config cfg("ntp",Config::User);
108 cfg.setGroup("correction"); 110// cfg.setGroup("correction");
109 int lastTime = cfg.readNumEntry("time",0); 111 // int lastTime = cfg.readNumEntry("time",0);
110 int now = TimeConversion::toUTC( QDateTime::currentDateTime() ); 112// if ( lastTime == 0 )
111 int corr = int((now - lastTime) * _shiftPerSec); 113// {
112 struct timeval myTv; 114 // return;
113 myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) ); 115// }
114 myTv.tv_usec = 0; 116// int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
115 117// int corr = int((now - lastTime) * _shiftPerSec);
116 if ( myTv.tv_sec != -1 ) 118// struct timeval myTv;
117 ::settimeofday( &myTv, 0 ); 119// myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) );
118 Global::writeHWClock(); 120// myTv.tv_usec = 0;
119 cfg.writeEntry("time",now); 121//
120 qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1()); 122// if ( myTv.tv_sec != -1 )
121} 123// ::settimeofday( &myTv, 0 );
124// Global::writeHWClock();
125// cfg.writeEntry("time",now);
126 //qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
127//}
122 128
123float Ntp::getTimeShift() 129float Ntp::getTimeShift()
124{ 130{
@@ -179,5 +185,7 @@ void Ntp::preditctTime()
179 setenv( "TZ", tz->currentZone(), 1 ); 185 setenv( "TZ", tz->currentZone(), 1 );
180 int now = TimeConversion::toUTC( QDateTime::currentDateTime() ); 186 int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
181 int corr = int((now - lastTime) * _shiftPerSec); 187 int corr = int((now - lastTime) * _shiftPerSec);
182 TextLabelPredTime->setText(QDateTime::currentDateTime().addSecs(corr).toString()); 188 QDateTime dt = QDateTime::currentDateTime().addSecs(corr);
189 setTime(dt);
190 TextLabelPredTime->setText(dt.toString());
183} 191}
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index fc233bf..d2e238d 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -25,7 +25,7 @@ private:
25 QString _ntpOutput; 25 QString _ntpOutput;
26 int _maxOffset; 26 int _maxOffset;
27 float _shiftPerSec; 27 float _shiftPerSec;
28 QTimer *_nextCorrection; 28 // QTimer *_nextCorrection;
29 int _minLookupDiff; 29 int _minLookupDiff;
30 30
31 float getTimeShift(); 31 float getTimeShift();
@@ -34,7 +34,7 @@ private slots:
34 void slotRunNtp(); 34 void slotRunNtp();
35 void getNtpOutput(OProcess *proc, char *buffer, int buflen); 35 void getNtpOutput(OProcess *proc, char *buffer, int buflen);
36 void ntpFinished(OProcess*); 36 void ntpFinished(OProcess*);
37 void correctClock(); 37// void correctClock();
38 void preditctTime(); 38 void preditctTime();
39}; 39};
40 40
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index dac5bd4..01268c9 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -208,10 +208,6 @@ void SetDateTime::accept()
208 208
209void SetDateTime::commitTime() 209void SetDateTime::commitTime()
210{ 210{
211 Config cfg("ntp",Config::User);
212 cfg.setGroup("lookups");
213 int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
214 cfg.writeEntry("time", time);
215 tz->setFocus(); 211 tz->setFocus();
216 // really turn off the screensaver before doing anything 212 // really turn off the screensaver before doing anything
217 { 213 {
@@ -227,10 +223,18 @@ void SetDateTime::commitTime()
227 // now set the time... 223 // now set the time...
228 QDateTime dt( dateButton->date(), timeButton->time() ); 224 QDateTime dt( dateButton->date(), timeButton->time() );
229 225
230 if ( dt.isValid() ) { 226 if ( dt.isValid() ) setTime(dt);
231 struct timeval myTv; 227}
232 myTv.tv_sec = TimeConversion::toUTC( dt ); 228
233 myTv.tv_usec = 0; 229void SetDateTime::setTime(QDateTime dt)
230{
231 Config cfg("ntp",Config::User);
232 cfg.setGroup("correction");
233 int t = TimeConversion::toUTC(dt);
234 struct timeval myTv;
235 myTv.tv_sec = t;
236 cfg.writeEntry("time", t );
237 myTv.tv_usec = 0;
234 238
235 if ( myTv.tv_sec != -1 ) 239 if ( myTv.tv_sec != -1 )
236 ::settimeofday( &myTv, 0 ); 240 ::settimeofday( &myTv, 0 );
@@ -239,9 +243,7 @@ void SetDateTime::commitTime()
239 // to allow the alarm server to get a better grip on itself 243 // to allow the alarm server to get a better grip on itself
240 // (example re-trigger alarms for when we travel back in time) 244 // (example re-trigger alarms for when we travel back in time)
241 DateBookDB db; 245 DateBookDB db;
242 } else { 246
243 qWarning( "Invalid date/time" );
244 }
245 // set the timezone for everyone else... 247 // set the timezone for everyone else...
246 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); 248 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
247 setTimeZone << tz->currentZone(); 249 setTimeZone << tz->currentZone();
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 053d17a..729bf4b 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -76,6 +76,7 @@ protected slots:
76 76
77protected: 77protected:
78 void commitTime(); 78 void commitTime();
79 void setTime(QDateTime dt);
79 virtual void accept(); 80 virtual void accept();
80 virtual void done(int); 81 virtual void done(int);
81 82