Diffstat (limited to 'noncore/settings/netsystemtime') (more/less context) (show whitespace changes)
5 files changed, 33 insertions, 12 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index 083b50f..830c0c3 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp | |||
@@ -22,13 +22,12 @@ | |||
22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
23 | 23 | ||
24 | 24 | ||
25 | Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) | 25 | Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) |
26 | : SetDateTime( parent, name, fl ) | 26 | : SetDateTime( parent, name, fl ) |
27 | { | 27 | { |
28 | qDebug("%s", QPEApplication::qpeDir().latin1()); | ||
29 | Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File); | 28 | Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File); |
30 | ntpSrvs.setGroup("servers"); | 29 | ntpSrvs.setGroup("servers"); |
31 | int srvCount = ntpSrvs.readNumEntry("count", 0 ); | 30 | int srvCount = ntpSrvs.readNumEntry("count", 0 ); |
32 | for (int i = 0; i < srvCount; i++) | 31 | for (int i = 0; i < srvCount; i++) |
33 | { | 32 | { |
34 | ntpSrvs.setGroup(QString::number(i)); | 33 | ntpSrvs.setGroup(QString::number(i)); |
@@ -196,14 +195,15 @@ void Ntp::readLookups() | |||
196 | qDebug("lookupCount = %i",lookupCount); | 195 | qDebug("lookupCount = %i",lookupCount); |
197 | TableLookups->setNumCols( 3 ); | 196 | TableLookups->setNumCols( 3 ); |
198 | TableLookups->setNumRows( lookupCount); | 197 | TableLookups->setNumRows( lookupCount); |
199 | TableLookups->horizontalHeader()->setLabel(1,tr("last [h]")); | 198 | TableLookups->horizontalHeader()->setLabel(1,tr("last [h]")); |
200 | TableLookups->horizontalHeader()->setLabel(2,tr("offset [s]")); | 199 | TableLookups->horizontalHeader()->setLabel(2,tr("offset [s]")); |
201 | TableLookups->horizontalHeader()->setLabel(0,tr("shift [s/h]")); | 200 | TableLookups->horizontalHeader()->setLabel(0,tr("shift [s/h]")); |
202 | int cw = 50;//TableLookups->width()/4; | 201 | int cw = TableLookups->width()/4; |
203 | qDebug("column width %i",cw); | 202 | qDebug("column width %i",cw); |
203 | cw = 50; | ||
204 | TableLookups->setColumnWidth( 0, cw+30 ); | 204 | TableLookups->setColumnWidth( 0, cw+30 ); |
205 | TableLookups->setColumnWidth( 1, cw ); | 205 | TableLookups->setColumnWidth( 1, cw ); |
206 | TableLookups->setColumnWidth( 2, cw ); | 206 | TableLookups->setColumnWidth( 2, cw ); |
207 | TableLookups->sortColumn(0, false, true ); | 207 | TableLookups->sortColumn(0, false, true ); |
208 | // TableLookups->setSorting( true ); | 208 | // TableLookups->setSorting( true ); |
209 | for (int i=0; i < lookupCount; i++) | 209 | for (int i=0; i < lookupCount; i++) |
@@ -212,18 +212,18 @@ void Ntp::readLookups() | |||
212 | last = cfg.readEntry("secsSinceLast",0).toFloat(); | 212 | last = cfg.readEntry("secsSinceLast",0).toFloat(); |
213 | shift = QString(cfg.readEntry("timeShift",0)).toFloat(); | 213 | shift = QString(cfg.readEntry("timeShift",0)).toFloat(); |
214 | // qDebug("%i last %f",i,last); | 214 | // qDebug("%i last %f",i,last); |
215 | // qDebug("%i shift %f",i,shift); | 215 | // qDebug("%i shift %f",i,shift); |
216 | shiftPerSec = shift / last; | 216 | shiftPerSec = shift / last; |
217 | _shiftPerSec += shiftPerSec; | 217 | _shiftPerSec += shiftPerSec; |
218 | TableLookups->setText( i,0,QString::number(shiftPerSec*60)); | 218 | TableLookups->setText( i,0,QString::number(shiftPerSec*60*60)); |
219 | TableLookups->setText( i,2,QString::number(shift)); | 219 | TableLookups->setText( i,2,QString::number(shift)); |
220 | TableLookups->setText( i,1,QString::number(last/60)); | 220 | TableLookups->setText( i,1,QString::number(last/(60*60))); |
221 | } | 221 | } |
222 | _shiftPerSec /= lookupCount+1; | 222 | _shiftPerSec /= lookupCount; |
223 | TextLabelShift->setText(QString::number(_shiftPerSec)+tr(" seconds")); | 223 | TextLabelShift->setText(QString::number(_shiftPerSec*60*60)+tr(" s/h")); |
224 | } | 224 | } |
225 | 225 | ||
226 | void Ntp::preditctTime() | 226 | void Ntp::preditctTime() |
227 | { | 227 | { |
228 | Config cfg("ntp",Config::User); | 228 | Config cfg("ntp",Config::User); |
229 | cfg.setGroup("lookups"); | 229 | cfg.setGroup("lookups"); |
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control index d3290e9..8fd7da5 100644 --- a/noncore/settings/netsystemtime/opie-netsystemtime.control +++ b/noncore/settings/netsystemtime/opie-netsystemtime.control | |||
@@ -1,6 +1,7 @@ | |||
1 | Packagename: opie-netsystemtime | ||
1 | Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers | 2 | Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers |
2 | Priority: optional | 3 | Priority: optional |
3 | Section: opie/settings | 4 | Section: opie/settings |
4 | Depends: ntpdate | 5 | Depends: ntpdate |
5 | Conflicts: opie-systemtime | 6 | Conflicts: opie-systemtime |
6 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 7 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.postinst b/noncore/settings/netsystemtime/opie-netsystemtime.postinst new file mode 100644 index 0000000..233cd31 --- a/dev/null +++ b/noncore/settings/netsystemtime/opie-netsystemtime.postinst | |||
@@ -0,0 +1,7 @@ | |||
1 | #!/bin/sh -v | ||
2 | |||
3 | systime=`ipkg status | grep Package | grep -i systemtime | sed "s/Package://"` | ||
4 | ipkg remove $pack | ||
5 | |||
6 | cd $QPEDIR/bin/ | ||
7 | ln -s netsystemtime systemtime | ||
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.postrm b/noncore/settings/netsystemtime/opie-netsystemtime.postrm new file mode 100644 index 0000000..4b2ab7c --- a/dev/null +++ b/noncore/settings/netsystemtime/opie-netsystemtime.postrm | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh -v | ||
2 | |||
3 | cd $QPEDIR/bin/ | ||
4 | rm systemtime | ||
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 93543cd..e7e604f 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp | |||
@@ -228,18 +228,12 @@ void SetDateTime::writeSettings() | |||
228 | 228 | ||
229 | } | 229 | } |
230 | 230 | ||
231 | void SetDateTime::commitTime() | 231 | void SetDateTime::commitTime() |
232 | { | 232 | { |
233 | tz->setFocus(); | 233 | tz->setFocus(); |
234 | // really turn off the screensaver before doing anything | ||
235 | { | ||
236 | // Needs to be encased in { } so that it deconstructs and sends | ||
237 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
238 | disableScreenSaver << 0 << 0 << 0; | ||
239 | } | ||
240 | // Need to process the QCOP event generated above before proceeding | 234 | // Need to process the QCOP event generated above before proceeding |
241 | qApp->processEvents(); | 235 | qApp->processEvents(); |
242 | 236 | ||
243 | // before we progress further, set our TZ! | 237 | // before we progress further, set our TZ! |
244 | setenv( "TZ", tz->currentZone(), 1 ); | 238 | setenv( "TZ", tz->currentZone(), 1 ); |
245 | // now set the time... | 239 | // now set the time... |
@@ -247,12 +241,18 @@ void SetDateTime::commitTime() | |||
247 | 241 | ||
248 | if ( dt.isValid() ) setTime(dt); | 242 | if ( dt.isValid() ) setTime(dt); |
249 | } | 243 | } |
250 | 244 | ||
251 | void SetDateTime::setTime(QDateTime dt) | 245 | void SetDateTime::setTime(QDateTime dt) |
252 | { | 246 | { |
247 | // really turn off the screensaver before doing anything | ||
248 | { | ||
249 | // Needs to be encased in { } so that it deconstructs and sends | ||
250 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
251 | disableScreenSaver << 0 << 0 << 0; | ||
252 | } | ||
253 | Config cfg("ntp",Config::User); | 253 | Config cfg("ntp",Config::User); |
254 | cfg.setGroup("correction"); | 254 | cfg.setGroup("correction"); |
255 | int t = TimeConversion::toUTC(dt); | 255 | int t = TimeConversion::toUTC(dt); |
256 | struct timeval myTv; | 256 | struct timeval myTv; |
257 | myTv.tv_sec = t; | 257 | myTv.tv_sec = t; |
258 | cfg.writeEntry("time", t ); | 258 | cfg.writeEntry("time", t ); |
@@ -262,16 +262,25 @@ void SetDateTime::setTime(QDateTime dt) | |||
262 | ::settimeofday( &myTv, 0 ); | 262 | ::settimeofday( &myTv, 0 ); |
263 | Global::writeHWClock(); | 263 | Global::writeHWClock(); |
264 | // since time has changed quickly load in the datebookdb | 264 | // since time has changed quickly load in the datebookdb |
265 | // to allow the alarm server to get a better grip on itself | 265 | // to allow the alarm server to get a better grip on itself |
266 | // (example re-trigger alarms for when we travel back in time) | 266 | // (example re-trigger alarms for when we travel back in time) |
267 | DateBookDB db; | 267 | DateBookDB db; |
268 | // Restore screensaver | ||
269 | QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
270 | enableScreenSaver << -1 << -1 << -1; | ||
268 | } | 271 | } |
269 | 272 | ||
270 | void SetDateTime::updateSystem(int i) | 273 | void SetDateTime::updateSystem(int i) |
271 | { | 274 | { |
275 | // really turn off the screensaver before doing anything | ||
276 | { | ||
277 | // Needs to be encased in { } so that it deconstructs and sends | ||
278 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
279 | disableScreenSaver << 0 << 0 << 0; | ||
280 | } | ||
272 | qDebug("SetDateTime::updateSystem(int %i)",i); | 281 | qDebug("SetDateTime::updateSystem(int %i)",i); |
273 | writeSettings(); | 282 | writeSettings(); |
274 | 283 | ||
275 | // set the timezone for everyone else... | 284 | // set the timezone for everyone else... |
276 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); | 285 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); |
277 | setTimeZone << tz->currentZone(); | 286 | setTimeZone << tz->currentZone(); |