1 files changed, 30 insertions, 30 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index b2f192a..52fc6be 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -3,12 +3,13 @@
 #include <qregexp.h>
 #include <qtable.h>
 #include <qlabel.h>
 #include <qsocket.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
+#include <qmessagebox.h>
 #include <qmultilineedit.h>
 #include <opie/oprocess.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/timeconversion.h>
 #include <qpe/tzselect.h>
@@ -23,14 +24,14 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
     : SetDateTime( parent, name, fl )
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
         // _maxOffset = cfg.readNumEntry("maxOffset",5);
 //  _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
-        SpinBoxMinDelay->setValue( cfg.readNumEntry("minLookupDiff",10) );
-        SpinBoxMinDelay->setMinValue( 7 );
+        SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",60) );
+        SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",60) );
   LineEditNtpSrv->setText( cfg.readEntry("ntpServer", tr("time.fu-berlin.de")) );
          ntpProcess = new OProcess( );
 
   QSocket *ntpSock = new QSocket( this );
   ntpSock->connectToHost( LineEditNtpSrv->text() ,123);
   connect( ntpSock, SIGNAL( error(int) ),
@@ -49,18 +50,37 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
 
 Ntp::~Ntp()
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
   cfg.writeEntry("ntpServer", LineEditNtpSrv->text());
-  cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() );
+  cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() );
+         cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() );
 }
 
 
 void Ntp::slotRunNtp()
 {
+        Config cfg("ntp",Config::User);
+  cfg.setGroup("lookups");
+  int lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
+
+  if ( lookupDiff < SpinBoxNtpDelay->value()*60 )
+  {
+          switch (
+            QMessageBox::warning(this, tr("Run ntp?"),
+     tr("You asked for a delay of ")+SpinBoxNtpDelay->text()+tr(" minutes, but only ")+
+     QString::number(lookupDiff%60)+tr(" minutes elapsed since last loopup.")+
+     "<br>"+tr("Rerun ntp?"),
+     QMessageBox::Ok,QMessageBox::Cancel)
+           ) {
+                    case QMessageBox::Ok:     break;
+                   case QMessageBox::Cancel: return;
+              default: return;
+      }
+  }
         TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
         ntpProcess->clearArguments();
         *ntpProcess << "ntpdate" << LineEditNtpSrv->text();
         bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntp");
@@ -92,47 +112,26 @@ void  Ntp::ntpFinished(OProcess*)
   cfg.writeEntry("time", time);
          
   float timeShift = getTimeShift();
   if (timeShift == 0.0) return;
          int secsSinceLast = time - lastLookup;
   TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
-  if ( lastLookup > 0 && secsSinceLast > 60*24* SpinBoxMinDelay->value())
+  TextLabelTimeShift->setText(QString::number(timeShift)+tr(" seconds"));
+  if ( lastLookup > 0 && secsSinceLast > 60* SpinBoxMinLookupDelay->value())
   {
           lookupCount++;
            cfg.writeEntry("count",lookupCount);
           cfg.setGroup("lookup_"+QString::number(lookupCount));
     _shiftPerSec =  timeShift / secsSinceLast;
 //    float nextCorr = _maxOffset / _shiftPerSec;
            qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);
                 cfg.writeEntry("secsSinceLast",secsSinceLast);
                 cfg.writeEntry("timeShift",QString::number(timeShift));
   }
 }
 
-//void Ntp::correctClock()
-//{
-        //qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
-        //Config cfg("ntp",Config::User);
-//  cfg.setGroup("correction");
-        // int lastTime = cfg.readNumEntry("time",0);
-//  if ( lastTime == 0 )
-//  {
-        //   return;
-//  }
-//  int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
-//  int corr = int((now - lastTime) * _shiftPerSec);
-//  struct timeval myTv;
-//  myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) );
-//  myTv.tv_usec = 0;
-//
-//  if ( myTv.tv_sec != -1 )
-//      ::settimeofday( &myTv, 0 );
-//  Global::writeHWClock();
-//  cfg.writeEntry("time",now);
-        //qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
-//}
 
 float Ntp::getTimeShift()
 {
         QString _offset = "offset";
   QString _sec = "sec";
   QRegExp _reOffset = QRegExp(_offset);
@@ -140,13 +139,12 @@ float Ntp::getTimeShift()
   int posOffset = _reOffset.match( _ntpOutput );
   int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset );
   posOffset += _offset.length() + 1;
   QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1);
   qDebug("%s", _ntpOutput.latin1());
   qDebug("diff = >%s<",diff.latin1());
-  TextLabelTimeShift->setText(diff);
   return diff.toFloat();
 }
 
 void Ntp::readLookups()
 {
         Config cfg("ntp",Config::User);
@@ -161,12 +159,14 @@ void Ntp::readLookups()
   TableLookups->horizontalHeader()->setLabel(0,"shift/s");
   int cw = 50;//TableLookups->width()/4;
   qDebug("column width %i",cw);
   TableLookups->setColumnWidth( 0, cw+30 );
   TableLookups->setColumnWidth( 1, cw );
   TableLookups->setColumnWidth( 2, cw );
+  TableLookups->sortColumn(0, false, true );
+ // TableLookups->setSorting( true );
   for (int i=0; i < lookupCount; i++)
   {
           cfg.setGroup("lookup_"+QString::number(i));
            last = cfg.readEntry("secsSinceLast",0).toFloat();
     shift = QString(cfg.readEntry("timeShift",0)).toFloat();
         //   qDebug("%i last %f",i,last);
@@ -175,13 +175,13 @@ void Ntp::readLookups()
     _shiftPerSec += shiftPerSec;
                 TableLookups->setText( i,0,QString::number(shiftPerSec));
                 TableLookups->setText( i,2,QString::number(shift));
           TableLookups->setText( i,1,QString::number(last));
   }
   _shiftPerSec /= lookupCount+1;
-  TextLabelShift->setText(QString::number(_shiftPerSec));
+  TextLabelShift->setText(QString::number(_shiftPerSec)+tr(" seconds"));
 }
 
 void Ntp::preditctTime()
 {
         qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
         Config cfg("ntp",Config::User);
@@ -189,13 +189,13 @@ void Ntp::preditctTime()
          int lastTime = cfg.readNumEntry("time",0);
   setenv( "TZ", tz->currentZone(), 1 );
   int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
   int corr = int((now - lastTime) * _shiftPerSec);
   predictedTime = QDateTime::currentDateTime().addSecs(corr);
          TextLabelPredTime->setText(predictedTime.toString());
-  TextLabelMainPredTime->setText(predictedTime.toString());
+  TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>");
 }
 
 void Ntp::setPredictTime()
 {
   preditctTime();
          setTime( predictedTime );
@@ -207,10 +207,10 @@ void Ntp::slotCheckNtp(int i)
          {
     TextLabelMainPredTime->hide();
     ButtonSetTime->setText( tr("Get time from network") );
           connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) );
   }else{
           preditctTime();
-                ButtonSetTime->setText( tr("Predict time") );
+                ButtonSetTime->setText( tr("Set predicted time") );
           connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
   };
 }