summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp12
-rw-r--r--noncore/settings/netsystemtime/opie-netsystemtime.control3
-rw-r--r--noncore/settings/netsystemtime/opie-netsystemtime.postinst7
-rw-r--r--noncore/settings/netsystemtime/opie-netsystemtime.postrm4
-rw-r--r--noncore/settings/netsystemtime/settime.cpp21
5 files changed, 34 insertions, 13 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
@@ -26,5 +26,4 @@ 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");
@@ -200,6 +199,7 @@ void Ntp::readLookups()
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 );
@@ -216,10 +216,10 @@ void Ntp::readLookups()
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
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,2 +1,3 @@
1Packagename: opie-netsystemtime
1Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers 2Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers
2Priority: optional 3Priority: optional
@@ -8,4 +9,4 @@ Architecture: arm
8Version: $QPE_VERSION-$SUB_VERSION 9Version: $QPE_VERSION-$SUB_VERSION
9Depends: opie-base ($QPE_VERSION), ntpdate 10Depends: opie-base ($QPE_VERSION), ntpdate
10Description: ntp ( Network Time Protocol) gui 11Description: ntp (Network Time Protocol) gui
11This utility syncs system time with a atomic timerserver via internet 12This utility syncs system time with a atomic timerserver via internet
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
3systime=`ipkg status | grep Package | grep -i systemtime | sed "s/Package://"`
4ipkg remove $pack
5
6cd $QPEDIR/bin/
7ln -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
3cd $QPEDIR/bin/
4rm 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
@@ -232,10 +232,4 @@ 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();
@@ -251,4 +245,10 @@ void SetDateTime::commitTime()
251void SetDateTime::setTime(QDateTime dt) 245void 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");
@@ -266,8 +266,17 @@ void SetDateTime::setTime(QDateTime dt)
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
270void SetDateTime::updateSystem(int i) 273void 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();