Diffstat (limited to 'noncore/settings/netsystemtime/ntp.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 77 |
1 files changed, 51 insertions, 26 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()) ); + }; } |