imp. table

3 files changed, 18 insertions, 21 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 6a5c062..0abb401 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -1,294 +1,286 @@
 #include "ntp.h"
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtimer.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>
 #include <qpe/timestring.h>
 #include <qpe/qpedialog.h>
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
 
 
 Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
     : SetDateTime( parent, name, fl )
 {
                  
         Config ntpSrvs("/etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ntpSrvs.readNumEntry("count", 0 );
   for (int i = 0; i < srvCount; i++)
   {
           ntpSrvs.setGroup(QString::number(i));
            ComboNtpSrv->insertItem( ntpSrvs.readEntry("name") );
   }
   if ( srvCount==0 ) ComboNtpSrv->insertItem(tr("time.fu-berlin.de"));
 
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
         SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",41) );
         SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",42) );
   ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) );
 
   ntpTimer = new QTimer(this);
-  processTimer = new QTimer(this);
-        ntpTimer->start(SpinBoxNtpDelay->value()*1000*60);
 
          ntpProcess = new OProcess( );
   connect( SpinBoxNtpDelay, SIGNAL( valueChanged(int) ),
                                         SLOT(slotNtpDelayChanged(int)) );
 
   ntpSock = new QSocket( this );
   connect( ntpSock, SIGNAL( error(int) ),
                                         SLOT(slotCheckNtp(int)) );
   slotProbeNtpServer();
 
   connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
                                         this, SLOT(getNtpOutput(OProcess*,char*,int)));
   connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
                                         this, SLOT(ntpFinished(OProcess*)));
   connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
   connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
   connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime()));
   slotCheckNtp(-1);
   readLookups();
 }
 
 Ntp::~Ntp()
 {
         delete ntpProcess;
         Config ntpSrvs("/etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ComboNtpSrv->count();
   ntpSrvs.writeEntry("count", srvCount);
   for (int i = 0; i < srvCount; i++)
   {
           ntpSrvs.setGroup(QString::number(i));
            ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i) );
   }
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
   cfg.writeEntry("ntpServer", ComboNtpSrv->currentItem());
   cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() );
          cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() );
 }
 
 bool Ntp::ntpDelayElapsed()
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
   return (_lookupDiff - (SpinBoxNtpDelay->value()*60)) > -60;
 }
 
 QString Ntp::getNtpServer()
 {
         return ComboNtpSrv->currentText();
 }
 
 void Ntp::slotRunNtp()
 {
   if ( !ntpDelayElapsed() )
   {
           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());
   ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() );
-  connect( processTimer, SIGNAL( timeout() ), SLOT(slotTimeoutNtpProcess()) );
-        processTimer->start(2*1000*60, true);
          
         ntpProcess->clearArguments();
         *ntpProcess << "ntpdate" << getNtpServer();
         bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntpdate");
      ntpOutPut( tr("Error while executing ntpdate"));
   }
 }
 
 void  Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
 {
   QString lineStr, lineStrOld;
   lineStr = buffer;
   lineStr=lineStr.left(buflen);
   if (lineStr!=lineStrOld)
   {
                 ntpOutPut(lineStr);
                  _ntpOutput += lineStr;
   }
   lineStrOld = lineStr;
 }
 
 void  Ntp::ntpFinished(OProcess *p)
 {
-        if (!p->normalExit())
+        qDebug("p->exitStatus() %i",p->exitStatus());
+        if (p->exitStatus()!=0 || !p->normalExit())
          {
     slotProbeNtpServer();
            return;
   }
-        processTimer->stop();
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lastLookup = cfg.readNumEntry("time",0);
-  int lookupCount = cfg.readNumEntry("count",-1);
+  int lookupCount = cfg.readNumEntry("count",0);
   int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
   cfg.writeEntry("time", time);
   cfg.setGroup("correction");
   cfg.writeEntry("time", time);
          
   float timeShift = getTimeShift();
   if (timeShift == 0.0) return;
          int secsSinceLast = time - lastLookup;
   TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
   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;
            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));
   }
 }
 
 
 float Ntp::getTimeShift()
 {
         QString _offset = "offset";
   QString _sec = "sec";
   QRegExp _reOffset = QRegExp(_offset);
   QRegExp _reEndOffset = QRegExp(_sec);
   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());
   return diff.toFloat();
 }
 
 void Ntp::readLookups()
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
-  int lookupCount = cfg.readNumEntry("count",-1);
+  int lookupCount = cfg.readNumEntry("count",0);
   float last, shift, shiftPerSec;
   qDebug("lookupCount = %i",lookupCount);
   TableLookups->setNumCols( 3 );
   TableLookups->setNumRows( lookupCount);
-  TableLookups->horizontalHeader()->setLabel(1,"secsSinceLast");
-  TableLookups->horizontalHeader()->setLabel(2,"timeShift");
-  TableLookups->horizontalHeader()->setLabel(0,"shift/s");
+  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;
   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);
         //   qDebug("%i shift %f",i,shift);
     shiftPerSec =  shift / last;
     _shiftPerSec += shiftPerSec;
-                TableLookups->setText( i,0,QString::number(shiftPerSec));
+                TableLookups->setText( i,0,QString::number(shiftPerSec*60));
                 TableLookups->setText( i,2,QString::number(shift));
-          TableLookups->setText( i,1,QString::number(last));
+          TableLookups->setText( i,1,QString::number(last/60));
   }
   _shiftPerSec /= lookupCount+1;
   TextLabelShift->setText(QString::number(_shiftPerSec)+tr(" seconds"));
 }
 
 void Ntp::preditctTime()
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
          int lastTime = cfg.readNumEntry("time",0);
   setenv( "TZ", tz->currentZone(), 1 );
   int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
   int corr = int((now - lastTime) * _shiftPerSec);
   TextLabelEstimatedShift->setText(QString::number(corr)+tr(" seconds"));
   predictedTime = QDateTime::currentDateTime().addSecs(corr);
          TextLabelPredTime->setText(predictedTime.toString());
   TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>");
 }
 
 void Ntp::setPredictTime()
 {
   preditctTime();
          setTime( predictedTime );
 }
 
 void Ntp::slotCheckNtp(int i)
 {
         if (i == 0)
          {
     TextLabelMainPredTime->hide();
     ButtonSetTime->setText( tr("Get time from network") );
           connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) );
                  if ( ntpDelayElapsed() )
            {
       slotRunNtp();
                   disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) );
             connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotRunNtp()) );
           }else{
             disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotRunNtp()) );
                   connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
     }
   }else{
           preditctTime();
                 ButtonSetTime->setText( tr("Set predicted time") );
           if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer());
           connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
           connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
   }
 }
 
 void Ntp::slotProbeNtpServer()
 {
+        qDebug("Ntp::slotProbeNtpServer()");
         ntpSock->connectToHost( getNtpServer() ,123);
 }
 
 void Ntp::slotNtpDelayChanged(int delay)
 {
   ntpTimer->changeInterval( delay*1000*60 );
 }
 
 void Ntp::ntpOutPut(QString out)
 {
         MultiLineEditntpOutPut->append(out);
   MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE);
 }
 
-void Ntp::slotTimeoutNtpProcess()
-{
-        ntpProcess->kill();
-        slotProbeNtpServer();
-}
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index d166973..c78dc55 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -1,48 +1,47 @@
 #ifndef NTP_H
 #define NTP_H
 #include "settime.h"
 #include <qdatetime.h>
 
 class OProcess;
 class QString;
 class QTimer;
 class QSocket;
 
 class Ntp : public SetDateTime
 {
     Q_OBJECT
 
 public:
     Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Ntp();
 
 protected:
                 QDateTime predictedTime;
 
 
 private:
                 QString _ntpOutput;
            float _shiftPerSec;
     int _lookupDiff;
     OProcess *ntpProcess;
-    QTimer *ntpTimer, *processTimer;
+    QTimer *ntpTimer;
     QSocket *ntpSock;
 
            float getTimeShift();
           void readLookups();
           void ntpOutPut(QString);
            bool ntpDelayElapsed();
     QString getNtpServer();
 private slots:
     void slotRunNtp();
     void getNtpOutput(OProcess *proc, char *buffer, int buflen);
     void ntpFinished(OProcess*);
           void preditctTime();
           void slotCheckNtp(int);
           void setPredictTime();
           void slotProbeNtpServer();
           void slotNtpDelayChanged(int);
-          void slotTimeoutNtpProcess();
 };
 
 #endif
diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui
index a83dc93..f5e9371 100644
--- a/noncore/settings/netsystemtime/ntpbase.ui
+++ b/noncore/settings/netsystemtime/ntpbase.ui
@@ -1,78 +1,78 @@
 <!DOCTYPE UI><UI>
 <class>NtpBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>NtpBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>328</width>
+            <width>324</width>
             <height>411</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Network Time</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>2</number>
         </property>
         <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TabWidgetMain</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tabMain</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Main</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QFrame</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>FrameSystemTime</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>StyledPanel</enum>
                         </property>
                         <property stdset="1">
@@ -239,128 +239,134 @@
                                             <name>sizeType</name>
                                             <enum>Expanding</enum>
                                         </property>
                                         <property>
                                             <name>sizeHint</name>
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
                                             </size>
                                         </property>
                                     </spacer>
                                 </vbox>
                             </widget>
                             <widget row="1"  column="0" >
                                 <class>QMultiLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>MultiLineEditntpOutPut</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>font</name>
                                     <font>
                                         <pointsize>7</pointsize>
                                     </font>
                                 </property>
                                 <property stdset="1">
                                     <name>wordWrap</name>
                                     <enum>WidgetWidth</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string></string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Predict</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>5</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QTable</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TableLookups</cstring>
                         </property>
                         <property stdset="1">
+                            <name>font</name>
+                            <font>
+                                <pointsize>8</pointsize>
+                            </font>
+                        </property>
+                        <property stdset="1">
                             <name>numRows</name>
                             <number>2</number>
                         </property>
                         <property stdset="1">
                             <name>numCols</name>
                             <number>2</number>
                         </property>
                     </widget>
                     <widget row="1"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout9</cstring>
                         </property>
                         <grid>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget row="0"  column="1" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabelShift</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>nan</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel4</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Esimated Shift:</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabelEstimatedShift</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>nan</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel3_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>