| -rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 228 |
1 files changed, 115 insertions, 113 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index f60e38d..40805a0 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -30,5 +30,5 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) - : SetDateTime( parent, name, fl ) + : SetDateTime( parent, name, fl ) { - Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File); + Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File); ntpSrvs.setGroup("servers"); @@ -36,12 +36,12 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) for (int i = 0; i < srvCount; i++) - { - ntpSrvs.setGroup(QString::number(i)); - ComboNtpSrv->insertItem( ntpSrvs.readEntry("name") ); - } + { + 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); + Config cfg("ntp",Config::User); cfg.setGroup("settings"); - SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",720) ); - SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",1440) ); + SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",720) ); + SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",1440) ); ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) ); @@ -58,5 +58,5 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) - ntpProcess = new OProcess( ); + ntpProcess = new OProcess( ); connect( SpinBoxNtpDelay, SIGNAL( valueChanged(int) ), - SLOT(slotNtpDelayChanged(int)) ); + SLOT(slotNtpDelayChanged(int)) ); @@ -64,3 +64,3 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) connect( ntpSock, SIGNAL( error(int) ), - SLOT(slotCheckNtp(int)) ); + SLOT(slotCheckNtp(int)) ); slotProbeNtpServer(); @@ -68,5 +68,5 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), - this, SLOT(getNtpOutput(OProcess*,char*,int))); + this, SLOT(getNtpOutput(OProcess*,char*,int))); connect ( ntpProcess, SIGNAL(processExited(OProcess*)), - this, SLOT(ntpFinished(OProcess*))); + this, SLOT(ntpFinished(OProcess*))); connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp())); @@ -99,6 +99,8 @@ bool Ntp::ntpDelayElapsed() { - Config cfg("ntp",Config::User); + Config cfg("ntp",Config::User); cfg.setGroup("lookups"); _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0); - return (_lookupDiff - (SpinBoxNtpDelay->value()*60)) > -60; + if (_lookupDiff < 0) return true; + int i =_lookupDiff - (SpinBoxNtpDelay->value()*60); + return i > -60; } @@ -107,3 +109,3 @@ QString Ntp::getNtpServer() { - return ComboNtpSrv->currentText(); + return ComboNtpSrv->currentText(); } @@ -113,24 +115,24 @@ 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 lookup.")+ - "<br>"+tr("Rerun NTP?"), - QMessageBox::Ok,QMessageBox::Cancel) - ) { - case QMessageBox::Ok: break; - case QMessageBox::Cancel: return; - default: return; + { + 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 lookup.")+ + "<br>"+tr("Rerun NTP?"), + QMessageBox::Ok,QMessageBox::Cancel) + ) { + case QMessageBox::Ok: break; + case QMessageBox::Cancel: return; + default: return; } - } - TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); + } + TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() ); - ntpProcess->clearArguments(); - *ntpProcess << "ntpdate" << getNtpServer(); - bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); + 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")); + qDebug("Error while executing ntpdate"); + ntpOutPut( tr("Error while executing ntpdate")); } @@ -144,6 +146,6 @@ void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) if (lineStr!=lineStrOld) - { - ntpOutPut(lineStr); - _ntpOutput += lineStr; - } + { + ntpOutPut(lineStr); + _ntpOutput += lineStr; + } lineStrOld = lineStr; @@ -154,7 +156,7 @@ void Ntp::ntpFinished(OProcess *p) // qDebug("p->exitStatus() %i",p->exitStatus()); - if (p->exitStatus()!=0 || !p->normalExit()) - { - slotProbeNtpServer(); - return; - } + if (p->exitStatus()!=0 || !p->normalExit()) + { + slotProbeNtpServer(); + return; + } @@ -166,6 +168,6 @@ void Ntp::ntpFinished(OProcess *p) -// QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" ); -// timeApplet << ""; + // QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" ); + // timeApplet << ""; - Config cfg("ntp",Config::User); + Config cfg("ntp",Config::User); cfg.setGroup("lookups"); @@ -179,3 +181,3 @@ void Ntp::ntpFinished(OProcess *p) if (timeShift == 0.0) return; - int secsSinceLast = time - lastLookup; + int secsSinceLast = time - lastLookup; TextLabelNewTime->setText(QDateTime::currentDateTime().toString()); @@ -183,13 +185,13 @@ void Ntp::ntpFinished(OProcess *p) if ( lastNtp && lastLookup > 0 && secsSinceLast > 60* SpinBoxMinLookupDelay->value()) - { - cfg.setGroup("lookup_"+QString::number(lookupCount)); - 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)); - cfg.setGroup("lookups"); - cfg.writeEntry("count",lookupCount); - cfg.writeEntry("lastNtp",true); - } + { + cfg.setGroup("lookup_"+QString::number(lookupCount)); + 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)); + cfg.setGroup("lookups"); + cfg.writeEntry("count",lookupCount); + cfg.writeEntry("lastNtp",true); + } } @@ -199,3 +201,3 @@ float Ntp::getTimeShift() { - QString _offset = "offset"; + QString _offset = "offset"; QString _sec = "sec"; @@ -214,3 +216,3 @@ void Ntp::readLookups() { - Config cfg("ntp",Config::User); + Config cfg("ntp",Config::User); cfg.setGroup("lookups"); @@ -231,16 +233,16 @@ void Ntp::readLookups() TableLookups->sortColumn(0, false, true ); - // TableLookups->setSorting( true ); + // TableLookups->setSorting( true ); _shiftPerSec = 0; 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(); - shiftPerSec = shift / last; - qDebug("%i shift %f",i,shiftPerSec); - _shiftPerSec += shiftPerSec; - TableLookups->setText( i,0,QString::number(shiftPerSec*60*60)); - TableLookups->setText( i,2,QString::number(shift)); - TableLookups->setText( i,1,QString::number(last/(60*60))); - } + { + cfg.setGroup("lookup_"+QString::number(i)); + last = cfg.readEntry("secsSinceLast",0).toFloat(); + shift = QString(cfg.readEntry("timeShift",0)).toFloat(); + shiftPerSec = shift / last; + qDebug("%i shift %f",i,shiftPerSec); + _shiftPerSec += shiftPerSec; + TableLookups->setText( i,0,QString::number(shiftPerSec*60*60)); + TableLookups->setText( i,2,QString::number(shift)); + TableLookups->setText( i,1,QString::number(last/(60*60))); + } _shiftPerSec /= lookupCount; @@ -251,6 +253,6 @@ void Ntp::preditctTime() { - Config cfg("ntp",Config::User); + Config cfg("ntp",Config::User); cfg.setGroup("lookups"); - int lastTime = cfg.readNumEntry("time",0); - cfg.writeEntry("lastNtp",true); + int lastTime = cfg.readNumEntry("time",0); + cfg.writeEntry("lastNtp",true); setenv( "TZ", tz->currentZone(), 1 ); @@ -260,3 +262,3 @@ void Ntp::preditctTime() predictedTime = QDateTime::currentDateTime().addSecs(corr); - TextLabelPredTime->setText(predictedTime.toString()); + TextLabelPredTime->setText(predictedTime.toString()); TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); @@ -267,3 +269,3 @@ void Ntp::setPredictTime() preditctTime(); - setTime( predictedTime ); + setTime( predictedTime ); } @@ -272,23 +274,23 @@ 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() ) + 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()) ); + 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: ")+predictedTime.toString() ); + if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer()); + connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) ); + connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); } - }else{ - preditctTime(); - ButtonSetTime->setText( tr("Set predicted time: ")+predictedTime.toString() ); - if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer()); - connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) ); - connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); - } } @@ -297,3 +299,3 @@ void Ntp::slotProbeNtpServer() { - ntpSock->connectToHost( getNtpServer() ,123); + ntpSock->connectToHost( getNtpServer() ,123); } @@ -307,3 +309,3 @@ void Ntp::ntpOutPut(QString out) { - MultiLineEditntpOutPut->append(out); + MultiLineEditntpOutPut->append(out); MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE); @@ -314,5 +316,5 @@ void Ntp::makeChannel() { - channel = new QCopChannel( "QPE/Application/netsystemtime", this ); - connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(receive(const QCString&, const QByteArray&)) ); + channel = new QCopChannel( "QPE/Application/netsystemtime", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); } @@ -323,13 +325,13 @@ void Ntp::receive(const QCString &msg, const QByteArray &arg) { - qDebug("QCop(Ntp) "+msg+" "+QCString(arg)); - if ( msg == "ntpLookup(QString)" ) - { - slotRunNtp(); - } - if ( msg == "setPredictedTime(QString)" ) - { - setPredictTime(); - }else{ - qDebug("Ntp::receive: Huh what do ya want"); - } + qDebug("QCop(Ntp) "+msg+" "+QCString(arg)); + if ( msg == "ntpLookup(QString)" ) + { + slotRunNtp(); + } + if ( msg == "setPredictedTime(QString)" ) + { + setPredictTime(); + }else{ + qDebug("Ntp::receive: Huh what do ya want"); + } } |