if postinst works, clicking on clockapplet should work too

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
@@ -24,9 +24,8 @@
 
 Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
     : SetDateTime( parent, name, fl )
 {
- 	qDebug("%s", 	         QPEApplication::qpeDir().latin1());
 	Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ntpSrvs.readNumEntry("count", 0 );
   for (int i = 0; i < srvCount; i++)
@@ -198,10 +197,11 @@ void Ntp::readLookups()
   TableLookups->setNumRows( lookupCount);
   TableLookups->horizontalHeader()->setLabel(1,tr("last [h]"));
   TableLookups->horizontalHeader()->setLabel(2,tr("offset [s]"));
   TableLookups->horizontalHeader()->setLabel(0,tr("shift [s/h]"));
-  int cw = 50;//TableLookups->width()/4;
+  int cw = TableLookups->width()/4;
   qDebug("column width %i",cw);
+  cw = 50;
   TableLookups->setColumnWidth( 0, cw+30 );
   TableLookups->setColumnWidth( 1, cw );
   TableLookups->setColumnWidth( 2, cw );
   TableLookups->sortColumn(0, false, true );
@@ -214,14 +214,14 @@ void Ntp::readLookups()
 //   	qDebug("%i last %f",i,last);
 //   	qDebug("%i shift %f",i,shift);
     shiftPerSec =  shift / last;
     _shiftPerSec += shiftPerSec;
-		TableLookups->setText( i,0,QString::number(shiftPerSec*60));
+		TableLookups->setText( i,0,QString::number(shiftPerSec*60*60));
 		TableLookups->setText( i,2,QString::number(shift));
-	  TableLookups->setText( i,1,QString::number(last/60));
+	  TableLookups->setText( i,1,QString::number(last/(60*60)));
   }
-  _shiftPerSec /= lookupCount+1;
-  TextLabelShift->setText(QString::number(_shiftPerSec)+tr(" seconds"));
+  _shiftPerSec /= lookupCount;
+  TextLabelShift->setText(QString::number(_shiftPerSec*60*60)+tr(" s/h"));
 }
 
 void Ntp::preditctTime()
 {
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,4 +1,5 @@
+Packagename: opie-netsystemtime
 Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers
 Priority: optional
 Section: opie/settings
 Depends: ntpdate
@@ -6,6 +7,6 @@ Conflicts: opie-systemtime
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), ntpdate
-Description: ntp ( Network  Time  Protocol) gui
+Description: ntp (Network  Time  Protocol) gui
 This 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 @@
+#!/bin/sh -v
+
+systime=`ipkg status | grep Package | grep -i systemtime | sed  "s/Package://"`
+ipkg remove $pack
+
+cd $QPEDIR/bin/
+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 @@
+#!/bin/sh -v
+
+cd $QPEDIR/bin/
+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
@@ -230,14 +230,8 @@ void SetDateTime::writeSettings()
 
 void  SetDateTime::commitTime()
 {
     tz->setFocus();
-    // really turn off the screensaver before doing anything
-    {
-  // Needs to be encased in { } so that it deconstructs and sends
-  QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
-  disableScreenSaver << 0 << 0 << 0;
-    }
     // Need to process the QCOP event generated above before proceeding
     qApp->processEvents();
 
     // before we progress further, set our TZ!
@@ -249,8 +243,14 @@ void  SetDateTime::commitTime()
 }
 
 void  SetDateTime::setTime(QDateTime dt)
 {
+    // really turn off the screensaver before doing anything
+    {
+  // Needs to be encased in { } so that it deconstructs and sends
+  QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
+  disableScreenSaver << 0 << 0 << 0;
+    }
 	Config cfg("ntp",Config::User);
   cfg.setGroup("correction");
     int t = TimeConversion::toUTC(dt);
 	  struct timeval myTv;
@@ -264,12 +264,21 @@ void  SetDateTime::setTime(QDateTime dt)
   // since time has changed quickly load in the datebookdb
   // to allow the alarm server to get a better grip on itself
   // (example re-trigger alarms for when we travel back in time)
   DateBookDB db;
+    // Restore screensaver
+    QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
+    enableScreenSaver << -1 << -1 << -1;
 }
 
 void SetDateTime::updateSystem(int i)
 {
+    // really turn off the screensaver before doing anything
+    {
+  // Needs to be encased in { } so that it deconstructs and sends
+  QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
+  disableScreenSaver << 0 << 0 << 0;
+    }
 	qDebug("SetDateTime::updateSystem(int %i)",i);
  	writeSettings();
 
     // set the timezone for everyone else...