working

5 files changed, 212 insertions, 86 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 87b20ec..4a7959e 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -1,191 +1,216 @@
 #include "ntp.h"
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtable.h>
 #include <qlabel.h>
+#include <qsocket.h>
 #include <qlineedit.h>
+#include <qspinbox.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 cfg("ntp",Config::User);
   cfg.setGroup("settings");
-         _maxOffset = cfg.readNumEntry("maxOffset",5);
-  _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
-  LineEditNtpServer->setText( cfg.readEntry("ntpServer") );
+        // _maxOffset = cfg.readNumEntry("maxOffset",5);
+//  _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
+        SpinBoxMinDelay->setValue( cfg.readNumEntry("minLookupDiff",10) );
+        SpinBoxMinDelay->setMinValue( 7 );
+  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) ),
+                                        SLOT(slotCheckNtp(int)) );
+
   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()));
-        // _nextCorrection = new QTimer( this );
-//    connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
-  slotRunNtp();
+
+//  slotRunNtp();
   readLookups();
 }
 
 Ntp::~Ntp()
 {
-
-}
-
-void Ntp::accept()
-{
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
-  cfg.writeEntry("ntpServer", LineEditNtpServer->text());
+  cfg.writeEntry("ntpServer", LineEditNtpSrv->text());
+  cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() );
 }
 
 
 void Ntp::slotRunNtp()
 {
         TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
         ntpProcess->clearArguments();
-        *ntpProcess << "ntpdate" << LineEditNtpServer->text();
+        *ntpProcess << "ntpdate" << LineEditNtpSrv->text();
         bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntp");
   }
 }
 
 void  Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
 {
   QString lineStr, lineStrOld;
   lineStr = buffer;
   lineStr=lineStr.left(buflen);
   if (lineStr!=lineStrOld)
   {
-        //        outPut->append(lineStr);
+                MultiLineEditntpOutPut->append(lineStr);
                  _ntpOutput += lineStr;
   }
   lineStrOld = lineStr;
 }
 
 void  Ntp::ntpFinished(OProcess*)
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lastLookup = cfg.readNumEntry("time",0);
   int lookupCount = cfg.readNumEntry("count",-1);
   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());
-  if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff)
+  if ( lastLookup > 0 && secsSinceLast > 60*24* SpinBoxMinDelay->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);
   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());
   TextLabelTimeShift->setText(diff);
   return diff.toFloat();
 }
 
 void Ntp::readLookups()
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lookupCount = cfg.readNumEntry("count",-1);
   float last, shift, shiftPerSec;
   qDebug("lookupCount = %i",lookupCount);
   TableLookups->setNumCols( 3 );
   TableLookups->setNumRows( lookupCount);
-  TableLookups->horizontalHeader()->setLabel(2,"secsSinceLast");
-  TableLookups->horizontalHeader()->setLabel(1,"timeShift");
+  TableLookups->horizontalHeader()->setLabel(1,"secsSinceLast");
+  TableLookups->horizontalHeader()->setLabel(2,"timeShift");
   TableLookups->horizontalHeader()->setLabel(0,"shift/s");
-  int cw = TableLookups->width()/4;
+  int cw = 50;//TableLookups->width()/4;
   qDebug("column width %i",cw);
-  TableLookups->setColumnWidth( 0, cw );
+  TableLookups->setColumnWidth( 0, cw+30 );
   TableLookups->setColumnWidth( 1, cw );
   TableLookups->setColumnWidth( 2, cw );
   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);
+        //   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,1,QString::number(shift));
-          TableLookups->setText( i,2,QString::number(last));
+                TableLookups->setText( i,2,QString::number(shift));
+          TableLookups->setText( i,1,QString::number(last));
   }
   _shiftPerSec /= lookupCount+1;
   TextLabelShift->setText(QString::number(_shiftPerSec));
 }
 
 void Ntp::preditctTime()
 {
         qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
         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);
-  QDateTime dt = QDateTime::currentDateTime().addSecs(corr);
-  setTime(dt);
-         TextLabelPredTime->setText(dt.toString());
+  predictedTime = QDateTime::currentDateTime().addSecs(corr);
+         TextLabelPredTime->setText(predictedTime.toString());
+  TextLabelMainPredTime->setText(predictedTime.toString());
+}
+
+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()) );
+  }else{
+          preditctTime();
+                ButtonSetTime->setText( tr("Predict time") );
+          connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
+  };
 }
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index d2e238d..284ae27 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -1,41 +1,38 @@
 #ifndef NTP_H
 #define NTP_H
 #include "settime.h"
 #include <qdatetime.h>
-#include <qtimer.h>
 
 class OProcess;
 class QString;
 
 
 class Ntp : public SetDateTime
 {
     Q_OBJECT
 
 public:
     Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Ntp();
 
-    OProcess *ntpProcess;
-
 protected:
-    virtual void accept();
+                QDateTime predictedTime;
+
 
 private:
                 QString _ntpOutput;
-          int _maxOffset;
            float _shiftPerSec;
-        //  QTimer *_nextCorrection;
-    int _minLookupDiff;
+    OProcess *ntpProcess;
 
            float getTimeShift();
           void readLookups();
 private slots:
     void slotRunNtp();
     void getNtpOutput(OProcess *proc, char *buffer, int buflen);
     void ntpFinished(OProcess*);
-//    void correctClock();
           void preditctTime();
+          void slotCheckNtp(int);
+          void setPredictTime();
 };
 
 #endif
diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui
index ccae5bf..e444065 100644
--- a/noncore/settings/netsystemtime/ntpbase.ui
+++ b/noncore/settings/netsystemtime/ntpbase.ui
@@ -1,482 +1,587 @@
 <!DOCTYPE UI><UI>
 <class>NtpBase</class>
 <widget>
-    <class>QDialog</class>
+    <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>280</width>
+            <width>276</width>
             <height>337</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>1</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>3</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</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">
                             <name>frameShadow</name>
                             <enum>Raised</enum>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tabNtp</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>NTP</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>3</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="1"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>runNtp</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>get time from network</string>
                         </property>
                     </widget>
                     <widget row="0"  column="0" >
                         <class>QFrame</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>FrameNtp</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>StyledPanel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Raised</enum>
                         </property>
                         <property>
                             <name>layoutMargin</name>
                         </property>
                         <grid>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget row="0"  column="0" >
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Layout4</cstring>
                                 </property>
                                 <vbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>0</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>6</number>
                                     </property>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabel1</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>autoMask</name>
                                             <bool>false</bool>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Start Time:</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabelStartTime</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>nan</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabel3</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Time Shift:</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabelTimeShift</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>nan</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabel5</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>New Time:</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabelNewTime</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>nan</string>
                                         </property>
                                     </widget>
                                     <spacer>
                                         <property>
                                             <name>name</name>
                                             <cstring>Spacer1</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>orientation</name>
                                             <enum>Vertical</enum>
                                         </property>
                                         <property stdset="1">
                                             <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>QLayoutWidget</class>
+                                <class>QMultiLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Layout6</cstring>
+                                    <cstring>MultiLineEditntpOutPut</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>wordWrap</name>
+                                    <enum>WidgetWidth</enum>
                                 </property>
-                                <hbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
-                                        <class>QLabel</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>TextLabel7</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>NTP Server:</string>
-                                        </property>
-                                    </widget>
-                                    <widget>
-                                        <class>QLineEdit</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>LineEditNtpServer</cstring>
-                                        </property>
-                                    </widget>
-                                </hbox>
                             </widget>
                         </grid>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>Auto</string>
+                    <string>Predict</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>QTable</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TableLookups</cstring>
                         </property>
                         <property stdset="1">
                             <name>numRows</name>
                             <number>2</number>
                         </property>
                         <property stdset="1">
                             <name>numCols</name>
                             <number>2</number>
                         </property>
                     </widget>
                     <widget row="2"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>PushButtonPredict</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>predict time</string>
                         </property>
                     </widget>
                     <widget row="1"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout5</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="1" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabelPredTime</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>nan</string>
                                 </property>
                             </widget>
                             <widget row="0"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Mean_shift_label</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Mean shift:</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel3_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Pred. Time:</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>TabSettings</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Settings</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>3</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QFrame</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>FrameSettings</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>StyledPanel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Raised</enum>
                         </property>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget row="0"  column="0" >
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout6</cstring>
+                                </property>
+                                <grid>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <spacer row="2"  column="0" >
+                                        <property>
+                                            <name>name</name>
+                                            <cstring>Spacer2</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>orientation</name>
+                                            <enum>Vertical</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizeType</name>
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property>
+                                            <name>sizeHint</name>
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget row="1"  column="0" >
+                                        <class>QLayoutWidget</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>Layout6</cstring>
+                                        </property>
+                                        <hbox>
+                                            <property stdset="1">
+                                                <name>margin</name>
+                                                <number>0</number>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>spacing</name>
+                                                <number>6</number>
+                                            </property>
+                                            <widget>
+                                                <class>QLabel</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>TextLabel7_2</cstring>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>text</name>
+                                                    <string>NTP Server:</string>
+                                                </property>
+                                            </widget>
+                                            <widget>
+                                                <class>QLineEdit</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>LineEditNtpSrv</cstring>
+                                                </property>
+                                            </widget>
+                                        </hbox>
+                                    </widget>
+                                    <widget row="0"  column="0" >
+                                        <class>QLayoutWidget</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>Layout5</cstring>
+                                        </property>
+                                        <hbox>
+                                            <property stdset="1">
+                                                <name>margin</name>
+                                                <number>0</number>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>spacing</name>
+                                                <number>6</number>
+                                            </property>
+                                            <widget>
+                                                <class>QLabel</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>TextLabel1_2</cstring>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>text</name>
+                                                    <string>Min. delay:</string>
+                                                </property>
+                                            </widget>
+                                            <widget>
+                                                <class>QSpinBox</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>SpinBoxMinDelay</cstring>
+                                                </property>
+                                            </widget>
+                                            <widget>
+                                                <class>QLabel</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>TextLabel2</cstring>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>text</name>
+                                                    <string>minutes</string>
+                                                </property>
+                                            </widget>
+                                        </hbox>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tabSetTime</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Manual</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
                     <widget>
                         <class>QFrame</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>FrameSetTime</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>StyledPanel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Raised</enum>
                         </property>
                     </widget>
                     <widget>
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>PushButtonSetManualTime</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Set time</string>
                         </property>
                     </widget>
                 </vbox>
             </widget>
         </widget>
     </grid>
 </widget>
 </UI>
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 01268c9..2cef6e8 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -1,461 +1,462 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "settime.h"
 
 #include <qpe/alarmserver.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/timeconversion.h>
 #include <qpe/tzselect.h>
 #include <qpe/timestring.h>
 #include <qpe/qpedialog.h>
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qwindowsystem_qws.h>
 #include <qcombobox.h>
 
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 
 SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
     : NtpBase( parent, name, f )
 {
  //   setCaption( tr("Set System Time") );
 
 //    QVBoxLayout *vb = new QVBoxLayout( this, 5 );
     QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 );
     QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 );
 
+    TextLabelMainPredTime = new QLabel( FrameSystemTime );
+    vb->addWidget( TextLabelMainPredTime, 1, 0 );
+    ButtonSetTime = new QPushButton( FrameSystemTime );
+    vb->addWidget( ButtonSetTime, 1, 0 );
+
+    QFrame *hline = new QFrame( FrameSystemTime );
+    hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+    vb->addWidget( hline );
+
     QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" );
 
     QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" );
     lblZone->setMaximumSize( lblZone->sizeHint() );
     hb->addWidget( lblZone );
 
     tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" );
     tz->setMinimumSize( tz->sizeHint() );
     hb->addWidget( tz );
 
     timeButton = new SetTime( FrameSetTime );
                 vb2->addWidget( timeButton );
 
     QHBoxLayout *db = new QHBoxLayout( vb2 );
     QLabel *dateLabel = new QLabel( tr("Date"), FrameSetTime );
     db->addWidget( dateLabel, 1 );
     dateButton = new DateButton( TRUE, FrameSetTime );
     db->addWidget( dateButton, 2 );
 
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     vb2->addItem( spacer );
 
-    QFrame *hline = new QFrame( FrameSystemTime );
+    hline = new QFrame( FrameSystemTime );
     hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
     vb->addWidget( hline );
 
     Config config("qpe");
     config.setGroup( "Time" );
 
     QHBoxLayout *hb1 = new QHBoxLayout( vb );
 
     QLabel *l = new QLabel( tr("Time format"), FrameSystemTime );
-    //    l->setAlignment( AlignRight | AlignVCenter );
     hb1->addWidget( l, 1 );
 
 
     ampmCombo = new QComboBox( FrameSystemTime );
     ampmCombo->insertItem( tr("24 hour"), 0 );
     ampmCombo->insertItem( tr("12 hour"), 1 );
     hb1->addWidget( ampmCombo, 2 );
 
     int show12hr = config.readBoolEntry("AMPM") ? 1 : 0;
     ampmCombo->setCurrentItem( show12hr );
     timeButton->show12hourTime( show12hr );
 
     connect(ampmCombo, SIGNAL(activated(int)),
       timeButton, SLOT(show12hourTime(int)));
 
 
 
     QHBoxLayout *hb2 = new QHBoxLayout( vb );
     l = new QLabel( tr("Weeks start on" ), FrameSystemTime );
     //l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l, 1 );
 
     weekStartCombo = new QComboBox( FrameSystemTime );
     weekStartCombo->insertItem( tr("Sunday"), 0 );
     weekStartCombo->insertItem( tr("Monday"), 1 );
 
     hb2->addWidget( weekStartCombo, 2 );
     int startMonday =  config.readBoolEntry("MONDAY") ? 1 : 0;
     dateButton->setWeekStartsMonday( startMonday );
     weekStartCombo->setCurrentItem( startMonday );
 
     connect( weekStartCombo, SIGNAL( activated(int)),
        dateButton, SLOT(setWeekStartsMonday(int)));
 
 
     QHBoxLayout *hb3 = new QHBoxLayout( vb );
     l = new QLabel( tr("Date format" ), FrameSystemTime );
     hb3->addWidget( l, 1 );
     dateFormatCombo = new QComboBox( FrameSystemTime );
     hb3->addWidget( dateFormatCombo, 2 );
 
     config.setGroup( "Date" );
     DateFormat df(QChar(config.readEntry("Separator", "/")[0]),
       (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear),
       (DateFormat::Order)config.readNumEntry("LongOrder", DateFormat::DayMonthYear));
 
     int currentdf = 0;
     date_formats[0] = DateFormat('/', DateFormat::MonthDayYear);
     dateFormatCombo->insertItem( tr( date_formats[0].toNumberString()) );
     date_formats[1] = DateFormat('.', DateFormat::DayMonthYear);
     if (df == date_formats[1])
   currentdf = 1;
     dateFormatCombo->insertItem( tr( date_formats[1].toNumberString() ) );
     date_formats[2] = DateFormat('-', DateFormat::YearMonthDay,
       DateFormat::DayMonthYear);
     if (df == date_formats[2])
   currentdf = 2;
     dateFormatCombo->insertItem( tr( date_formats[2].toNumberString() ) ); //ISO8601
     date_formats[3] = DateFormat('/', DateFormat::DayMonthYear);
     if (df == date_formats[3])
   currentdf = 3;
     dateFormatCombo->insertItem( tr( date_formats[3].toNumberString() ) );
 
     dateFormatCombo->setCurrentItem( currentdf );
     dateButton->setDateFormat( df );
 
     connect( dateFormatCombo, SIGNAL( activated(int)),
         SLOT(formatChanged(int)));
 
     QHBoxLayout *hb4 = new QHBoxLayout( vb );
     l = new QLabel( tr("Applet format" ), FrameSystemTime );
     hb4->addWidget( l, 1 );
 
     clockAppletCombo = new QComboBox( FrameSystemTime );
     clockAppletCombo->insertItem( tr("hh:mm"), 0 );
     clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 );
     clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 );
 
     hb4->addWidget( clockAppletCombo, 2 );
     int clockApplet =  config.readNumEntry("ClockApplet",0);
     clockAppletCombo->setCurrentItem( clockApplet );
 
     vb->addStretch( 0 );
 
+    QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()),
+                                                                        this, SLOT(commitTime()));
+
     QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
                       timeButton, SLOT( slotTzChange( const QString& ) ) );
     QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
                        SLOT( tzChange( const QString& ) ) );
-    QObject::connect( PushButtonSetManualTime, SLOT(clicked()),
-                                                                        SLOT(commitTime()));
-//    dl = new QPEDialogListener(this);
 }
 
-void SetDateTime::accept()
+SetDateTime::~SetDateTime()
 {
 
     Config config("qpe");
     config.setGroup( "Time" );
     config.writeEntry( "AMPM", ampmCombo->currentItem() );
     config.writeEntry( "MONDAY", weekStartCombo->currentItem() );
     config.setGroup( "Date" );
     DateFormat df = date_formats[dateFormatCombo->currentItem()];
     config.writeEntry( "Separator", QString(df.separator()));
     config.writeEntry( "ShortOrder", df.shortOrder());
     config.writeEntry( "LongOrder", df.longOrder());
     config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() );
 
     Config lconfig("locale");
     lconfig.setGroup( "Location" );
     lconfig.writeEntry( "Timezone", tz->currentZone() );
 
 }
 
 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!
     setenv( "TZ", tz->currentZone(), 1 );
     // now set the time...
     QDateTime dt( dateButton->date(), timeButton->time() );
 
     if ( dt.isValid() ) setTime(dt);
 }
 
 void  SetDateTime::setTime(QDateTime dt)
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("correction");
     int t = TimeConversion::toUTC(dt);
           struct timeval myTv;
           myTv.tv_sec = t;
           cfg.writeEntry("time", t );
           myTv.tv_usec = 0;
 
   if ( myTv.tv_sec != -1 )
       ::settimeofday( &myTv, 0 );
   Global::writeHWClock();
   // 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;
 
     // set the timezone for everyone else...
     QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
     setTimeZone << tz->currentZone();
 
     // AM/PM setting and notify time changed
     QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
     setClock << ampmCombo->currentItem();
 
     // Notify everyone what day we prefer to start the week on.
     QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
     setWeek << weekStartCombo->currentItem();
 
     // Notify everyone what date format  to use 
     QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
     setDateFormat << date_formats[dateFormatCombo->currentItem()];
 
     // Restore screensaver
     QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
     enableScreenSaver << -1 << -1 << -1;
 
- //   QDialog::accept();
-}
-
-void SetDateTime::done(int r)
-{
-//    QDialog::done(r);
-    close();
 }
 
 void SetDateTime::tzChange( const QString &tz )
 {
     // set the TZ get the time and leave gracefully...
     QString strSave;
     strSave = getenv( "TZ" );
     setenv( "TZ", tz, 1 );
 
     QDate d = QDate::currentDate();
     // reset the time.
     if ( !strSave.isNull() ) {
   setenv( "TZ", strSave, 1 );
     }
     dateButton->setDate( d );
 }
 
 void SetDateTime::formatChanged(int i)
 {
     dateButton->setDateFormat(date_formats[i]);
 }
 
 static const int ValueAM = 0;
 static const int ValuePM = 1;
 
 
 
 SetTime::SetTime( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
     use12hourTime = FALSE;
 
     QTime currTime = QTime::currentTime();
     hour = currTime.hour();
     minute = currTime.minute();
 
     QHBoxLayout *hb2 = new QHBoxLayout( this );
     hb2->setSpacing( 3 );
 
     QLabel *l = new QLabel( tr("Hour"), this );
     //    l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l );
 
     sbHour = new QSpinBox( this );
     sbHour->setMinimumWidth( 30 );
     if(use12hourTime) {
   sbHour->setMinValue(1);
   sbHour->setMaxValue( 12 );
   int show_hour = hour;
   if (hour > 12)
       show_hour -= 12;
   if (show_hour == 0)
       show_hour = 12;
 
   sbHour->setValue( show_hour );
     } else {
   sbHour->setMinValue( 0 );
   sbHour->setMaxValue( 23 );
   sbHour->setValue( hour );
     }
     sbHour->setWrapping(TRUE);
     connect( sbHour, SIGNAL(valueChanged(int)), this, SLOT(hourChanged(int)) );
     hb2->addWidget( sbHour );
 
     hb2->addStretch( 1 );
 
     l = new QLabel( tr("Minute"), this );
     //l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l );
 
     sbMin = new QSpinBox( this );
     sbMin->setMinValue( 0 );
     sbMin->setMaxValue( 59 );
     sbMin->setWrapping(TRUE);
     sbMin->setValue( minute );
     sbMin->setMinimumWidth( 30 );
     connect( sbMin, SIGNAL(valueChanged(int)), this, SLOT(minuteChanged(int)) );
     hb2->addWidget( sbMin );
 
     hb2->addStretch( 1 );
 
     ampm = new QComboBox( this );
     ampm->insertItem( tr("AM"), ValueAM );
     ampm->insertItem( tr("PM"), ValuePM );
     connect( ampm, SIGNAL(activated(int)), this, SLOT(checkedPM(int)) );
     hb2->addWidget( ampm );
 
     hb2->addStretch( 1 );
 
 }
 
 QTime SetTime::time() const
 {
     return QTime( hour, minute, 0 );
 }
 
 void SetTime::hourChanged( int value )
 {
     if(use12hourTime) {
   int realhour = value;
   if (realhour == 12)
       realhour = 0;
   if (ampm->currentItem() == ValuePM )
       realhour += 12;
   hour = realhour;
     } else
   hour = value;
 }
 
 void SetTime::minuteChanged( int value )
 {
     minute = value;
 }
 
 void SetTime::show12hourTime( int on )
 {
     use12hourTime = on;
     ampm->setEnabled(on);
 
     int show_hour = hour;
     if ( on ) {
   /* this might change the value of hour */
   sbHour->setMinValue(1);
   sbHour->setMaxValue( 12 );
 
   /* so use one we saved earlier */
   if (show_hour >= 12) {
       show_hour -= 12;
       ampm->setCurrentItem( ValuePM );
   } else {
       ampm->setCurrentItem( ValueAM );
   }
   if (show_hour == 0)
       show_hour = 12;
 
     } else {
   sbHour->setMinValue( 0 );
   sbHour->setMaxValue( 23 );
     }
 
 
     sbHour->setValue( show_hour );
 }
 
 void SetTime::checkedPM( int c )
 {
     int show_hour = sbHour->value();
     if (show_hour == 12)
   show_hour = 0;
 
     if ( c == ValuePM )
   show_hour += 12;
 
     hour = show_hour;
 }
 
 void SetTime::slotTzChange( const QString &tz )
 {
     // set the TZ get the time and leave gracefully...
     QString strSave;
     strSave = getenv( "TZ" );
     setenv( "TZ", tz, 1 );
 
     QTime t = QTime::currentTime();
     // reset the time.
     if ( !strSave.isNull() ) {
   setenv( "TZ", strSave, 1 );
     }
 
     // just set the spinboxes and let it propage through
     if(use12hourTime) {
   int show_hour = t.hour();
   if (t.hour() >= 12) {
       show_hour -= 12;
       ampm->setCurrentItem( ValuePM );
   } else {
       ampm->setCurrentItem( ValueAM );
   }
   if (show_hour == 0)
       show_hour = 12;
   sbHour->setValue( show_hour );
     } else {
   sbHour->setValue( t.hour() );
     }
     sbMin->setValue( t.minute() );
 }
 
 
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 729bf4b..60423e7 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -1,98 +1,96 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef SYSTEM_TIME_H
 #define SYSTEM_TIME_H
 
 
 #include <qdatetime.h>
 #include <qdialog.h>
 
 #include <qpe/timestring.h>
 #include "ntpbase.h"
 
 class QToolButton;
 class QSpinBox;
 class QLabel;
 class TimeZoneSelector;
 class DateBookMonth;
 class QComboBox;
-//class QPEDialogListener;
 
 class SetTime : public QWidget
 {
     Q_OBJECT
 public:
     SetTime( QWidget *parent=0, const char *name=0 );
 
     QTime time() const;
 
 public slots:
     void slotTzChange( const QString& tz );
     void show12hourTime( int );
 
 protected slots:
     void hourChanged( int value );
     void minuteChanged( int value );
 
     void checkedPM( int );
 
 protected:
     int hour;
     int minute;
     bool use12hourTime;
     QComboBox *ampm;
     QSpinBox *sbHour;
     QSpinBox *sbMin;
 };
 
 class DateButton;
 
 class SetDateTime : public NtpBase
 {
     Q_OBJECT
 public:
     SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 );
+    ~SetDateTime();
 
 protected slots:
+                void commitTime();
     void tzChange( const QString &tz );
     void formatChanged(int);
 
 protected:
-                void commitTime();
            void  setTime(QDateTime dt);
-    virtual void accept();
-    virtual void done(int);
 
     SetTime *timeButton;
     DateButton *dateButton;
     TimeZoneSelector *tz;
     QComboBox *weekStartCombo;
     QComboBox *ampmCombo;
     QComboBox *dateFormatCombo;
     QComboBox *clockAppletCombo;
-
-//    QPEDialogListener *dl;
+    QPushButton *ButtonSetTime;
+    QLabel *TextLabelMainPredTime;
 
     DateFormat date_formats[4];
 };
 
 
 #endif