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
@@ -5,3 +5,5 @@
 #include <qlabel.h>
+#include <qsocket.h>
 #include <qlineedit.h>
+#include <qspinbox.h>
 #include <qmultilineedit.h>
@@ -24,6 +26,14 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
   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)),
@@ -34,5 +44,4 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
   connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
-// 	_nextCorrection = new QTimer( this );
-//    connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
-  slotRunNtp();
+
+//  slotRunNtp();
   readLookups();
@@ -42,10 +51,6 @@ 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() );
 }
@@ -57,3 +62,3 @@ void Ntp::slotRunNtp()
 	ntpProcess->clearArguments();
-	*ntpProcess << "ntpdate" << LineEditNtpServer->text();
+	*ntpProcess << "ntpdate" << LineEditNtpSrv->text();
 	bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
@@ -71,3 +76,3 @@ void  Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
   {
-//	        outPut->append(lineStr);
+	        MultiLineEditntpOutPut->append(lineStr);
          	_ntpOutput += lineStr;
@@ -92,3 +97,3 @@ void  Ntp::ntpFinished(OProcess*)
   TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
-  if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff)
+  if ( lastLookup > 0 && secsSinceLast > 60*24* SpinBoxMinDelay->value())
   {
@@ -153,8 +158,8 @@ void Ntp::readLookups()
   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 );
@@ -166,4 +171,4 @@ void Ntp::readLookups()
     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;
@@ -171,4 +176,4 @@ void Ntp::readLookups()
 		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));
   }
@@ -187,5 +192,25 @@ void Ntp::preditctTime()
   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
@@ -4,3 +4,2 @@
 #include <qdatetime.h>
-#include <qtimer.h>
 
@@ -18,6 +17,5 @@ public:
 
-    OProcess *ntpProcess;
-
 protected:
-    virtual void accept();
+		QDateTime predictedTime;
+
 
@@ -25,6 +23,4 @@ private:
 		QString _ntpOutput;
-  	int _maxOffset;
    	float _shiftPerSec;
-//  	QTimer *_nextCorrection;
-    int _minLookupDiff;
+    OProcess *ntpProcess;
 
@@ -36,4 +32,5 @@ private slots:
     void ntpFinished(OProcess*);
-//    void correctClock();
 	  void preditctTime();
+	  void slotCheckNtp(int);
+	  void setPredictTime();
 };
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
@@ -3,3 +3,3 @@
 <widget>
-    <class>QDialog</class>
+    <class>QWidget</class>
     <property stdset="1">
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>280</width>
+            <width>276</width>
             <height>337</height>
@@ -249,35 +249,11 @@
                             <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>
@@ -295,3 +271,3 @@
                     <name>title</name>
-                    <string>Auto</string>
+                    <string>Predict</string>
                 </attribute>
@@ -428,2 +404,131 @@
                         </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>
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
@@ -62,2 +62,11 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
 
+    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" );
@@ -84,3 +93,3 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
 
-    QFrame *hline = new QFrame( FrameSystemTime );
+    hline = new QFrame( FrameSystemTime );
     hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
@@ -94,3 +103,2 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
     QLabel *l = new QLabel( tr("Time format"), FrameSystemTime );
-    //    l->setAlignment( AlignRight | AlignVCenter );
     hb1->addWidget( l, 1 );
@@ -179,2 +187,5 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
 
+    QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()),
+    									this, SLOT(commitTime()));
+
     QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
@@ -183,8 +194,5 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
                        SLOT( tzChange( const QString& ) ) );
-    QObject::connect( PushButtonSetManualTime, SLOT(clicked()),
-    									SLOT(commitTime()));
-//    dl = new QPEDialogListener(this);
 }
 
-void SetDateTime::accept()
+SetDateTime::~SetDateTime()
 {
@@ -266,9 +274,2 @@ void  SetDateTime::setTime(QDateTime dt)
 
- //   QDialog::accept();
-}
-
-void SetDateTime::done(int r)
-{
-//    QDialog::done(r);
-    close();
 }
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
@@ -35,3 +35,2 @@ class DateBookMonth;
 class QComboBox;
-//class QPEDialogListener;
 
@@ -71,4 +70,6 @@ public:
     SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 );
+    ~SetDateTime();
 
 protected slots:
+		void commitTime();
     void tzChange( const QString &tz );
@@ -77,6 +78,3 @@ protected slots:
 protected:
-		void commitTime();
    	void  setTime(QDateTime dt);
-    virtual void accept();
-    virtual void done(int);
 
@@ -89,4 +87,4 @@ protected:
     QComboBox *clockAppletCombo;
-
-//    QPEDialogListener *dl;
+    QPushButton *ButtonSetTime;
+    QLabel *TextLabelMainPredTime;