From e9b05e2b93bf000777ae1c55e7d5cac35a67145d Mon Sep 17 00:00:00 2001 From: tille Date: Wed, 26 Jun 2002 16:24:42 +0000 Subject: timer working --- (limited to 'noncore/settings/netsystemtime') diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index 364609d..bcbf7a1 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -44,7 +44,7 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) ); ntpTimer = new QTimer(this); - ntpTimer->start(SpinBoxNtpDelay->value()*100); + ntpTimer->start(SpinBoxNtpDelay->value()*1000*60); ntpProcess = new OProcess( ); connect( SpinBoxNtpDelay, SIGNAL( valueChanged(int) ), @@ -85,20 +85,28 @@ Ntp::~Ntp() cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() ); } - -void Ntp::slotRunNtp() +bool Ntp::ntpDelayElapsed() { Config cfg("ntp",Config::User); cfg.setGroup("lookups"); - int lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0); + _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0); + return (_lookupDiff - (SpinBoxNtpDelay->value()*60)) > -60; +} - if ( lookupDiff < SpinBoxNtpDelay->value()*60 ) +QString Ntp::getNtpServer() +{ + return ComboNtpSrv->currentText(); +} + +void Ntp::slotRunNtp() +{ + if ( !ntpDelayElapsed() ) { switch ( - QMessageBox::warning(this, tr("Run ntp?"), + QMessageBox::warning(this, tr("Run NTP?"), tr("You asked for a delay of ")+SpinBoxNtpDelay->text()+tr(" minutes, but only ")+ - QString::number(lookupDiff%60)+tr(" minutes elapsed since last loopup.")+ - "
"+tr("Rerun ntp?"), + QString::number(_lookupDiff/60)+tr(" minutes elapsed since last loopup.")+ + "
"+tr("Rerun NTP?"), QMessageBox::Ok,QMessageBox::Cancel) ) { case QMessageBox::Ok: break; @@ -107,12 +115,13 @@ void Ntp::slotRunNtp() } } TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); - MultiLineEditntpOutPut->append( "\n"+tr("Running:")+"\nntpdate "+ ComboNtpSrv->currentText()+"\n"); + ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() ); ntpProcess->clearArguments(); - *ntpProcess << "ntpdate" << ComboNtpSrv->currentText(); + *ntpProcess << "ntpdate" << getNtpServer(); bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); if ( !ret ) { - qDebug("Error while executing ntp"); + qDebug("Error while executing ntpdate"); + ntpOutPut( tr("Error while executing ntpdate")); } } @@ -123,7 +132,7 @@ void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) lineStr=lineStr.left(buflen); if (lineStr!=lineStrOld) { - MultiLineEditntpOutPut->append(lineStr); + ntpOutPut(lineStr); _ntpOutput += lineStr; } lineStrOld = lineStr; @@ -151,7 +160,6 @@ void Ntp::ntpFinished(OProcess*) 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)); @@ -212,7 +220,6 @@ void Ntp::readLookups() 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); @@ -238,11 +245,9 @@ void Ntp::slotCheckNtp(int i) TextLabelMainPredTime->hide(); ButtonSetTime->setText( tr("Get time from network") ); connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) ); - Config cfg("ntp",Config::User); - cfg.setGroup("lookups"); - int lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0); - if ( lookupDiff > SpinBoxNtpDelay->value()*60 ) + if ( ntpDelayElapsed() ) { + slotRunNtp(); disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotRunNtp()) ); }else{ @@ -252,21 +257,26 @@ void Ntp::slotCheckNtp(int i) }else{ preditctTime(); ButtonSetTime->setText( tr("Set predicted time") ); + if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer()); connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) ); connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); } +// ntpTimer->start(SpinBoxNtpDelay->value()*1000*60); } void Ntp::slotProbeNtpServer() { - Config cfg("ntp",Config::User); - cfg.setGroup("lookups"); - int lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0); - if ( lookupDiff > SpinBoxNtpDelay->value()*60 ) - ntpSock->connectToHost( ComboNtpSrv->currentText() ,123); + if ( ntpDelayElapsed() ) + ntpSock->connectToHost( getNtpServer() ,123); } void Ntp::slotNtpDelayChanged(int delay) { - ntpTimer->changeInterval( delay*100 ); + ntpTimer->changeInterval( delay*1000*60 ); +} + +void Ntp::ntpOutPut(QString out) +{ + MultiLineEditntpOutPut->append(out); + MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE); } diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h index 7cc309f..c78dc55 100644 --- a/noncore/settings/netsystemtime/ntp.h +++ b/noncore/settings/netsystemtime/ntp.h @@ -23,12 +23,16 @@ protected: private: QString _ntpOutput; float _shiftPerSec; + int _lookupDiff; OProcess *ntpProcess; QTimer *ntpTimer; QSocket *ntpSock; float getTimeShift(); void readLookups(); + void ntpOutPut(QString); + bool ntpDelayElapsed(); + QString getNtpServer(); private slots: void slotRunNtp(); void getNtpOutput(OProcess *proc, char *buffer, int buflen); diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui index 4e10fd2..a83dc93 100644 --- a/noncore/settings/netsystemtime/ntpbase.ui +++ b/noncore/settings/netsystemtime/ntpbase.ui @@ -11,8 +11,8 @@ 0 0 - 331 - 426 + 328 + 411 diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control index 406d7b0..d3290e9 100644 --- a/noncore/settings/netsystemtime/opie-netsystemtime.control +++ b/noncore/settings/netsystemtime/opie-netsystemtime.control @@ -1,4 +1,4 @@ -Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop +Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers Priority: optional Section: opie/settings Depends: ntpdate diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 2398c08..93543cd 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp @@ -300,7 +300,6 @@ void SetDateTime::updateSystem(int i) void SetDateTime::tzChange( const QString &tz ) { - qDebug("SetDateTime::tzChange"); // set the TZ get the time and leave gracefully... QString strSave; strSave = getenv( "TZ" ); @@ -456,7 +455,6 @@ void SetTime::checkedPM( int c ) void SetTime::slotTzChange( const QString &tz ) { - qDebug("SetTime::slotTzChange"); // set the TZ get the time and leave gracefully... QString strSave; strSave = getenv( "TZ" ); -- cgit v0.9.0.2