summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp36
1 files changed, 19 insertions, 17 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 06d944d..aecefc1 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -45,26 +45,26 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
cfg.setGroup("settings");
SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",720) );
SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",1440) );
ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) );
//make tab order
-
+
TabWidgetMain->removePage( tabMain );
TabWidgetMain->removePage( tabManualSetTime );
TabWidgetMain->removePage( TabSettings );
TabWidgetMain->removePage( tabPredict );
TabWidgetMain->removePage( tabNtp );
TabWidgetMain->insertTab( tabMain, tr( "Main" ) );
TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) );
TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) );
TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) );
NtpBaseLayout->addWidget( TabWidgetMain, 0, 0 );
-
+
bool advMode = cfg.readBoolEntry("advancedFeatures", false );
showAdvancedFeatures(advMode);
CheckBoxAdvSettings->setChecked( advMode );
connect( CheckBoxAdvSettings, SIGNAL( toggled( bool ) ),
SLOT( showAdvancedFeatures( bool ) ) );
@@ -97,22 +97,22 @@ Ntp::~Ntp()
delete ntpProcess;
}
void Ntp::saveConfig(){
int srvCount = ComboNtpSrv->count();
bool serversChanged = true;
- int curSrv = ComboNtpSrv->currentItem();
+ int curSrv = ComboNtpSrv->currentItem();
QString edit = ComboNtpSrv->currentText();
for (int i = 0; i < srvCount; i++){
if ( edit == ComboNtpSrv->text(i)) serversChanged = false;
}
if (serversChanged){
Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File);
ntpSrvs.setGroup("servers");
ntpSrvs.writeEntry("count", ++srvCount);
- ntpSrvs.setGroup("0");
+ ntpSrvs.setGroup("0");
ntpSrvs.writeEntry( "name", edit );
curSrv = 0;
for (int i = 1; i < srvCount; i++){
qDebug("ntpSrvs[%i/%i]=%s",i,srvCount,ComboNtpSrv->text(i).latin1());
ntpSrvs.setGroup(QString::number(i));
ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i-1) );
@@ -128,13 +128,13 @@ void Ntp::saveConfig(){
bool Ntp::ntpDelayElapsed()
{
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
_lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
- if (_lookupDiff < 0) return true;
+ if (_lookupDiff < 0) return true;
int i =_lookupDiff - (SpinBoxNtpDelay->value()*60);
return i > -60;
}
QString Ntp::getNtpServer()
{
@@ -169,13 +169,13 @@ void Ntp::slotRunNtp()
case QMessageBox::Cancel: return;
default: return;
}
}
TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() );
-
+
ntpProcess->clearArguments();
*ntpProcess << "ntpdate" << getNtpServer();
bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
if ( !ret ) {
QMessageBox::critical(this, tr("ntp error"),
tr("Error while getting time form network!"));
@@ -199,28 +199,28 @@ void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
}
void Ntp::ntpFinished(OProcess *p)
{
qDebug("p->exitStatus() %i",p->exitStatus());
if (p->exitStatus()!=0 || !p->normalExit())
- {
+ {
if ( isVisible() && _interactive ){
QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput );
}
// slotCheckNtp(-1);
return;
}
-
+
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
int lastLookup = cfg.readNumEntry("time",0);
int lookupCount = cfg.readNumEntry("count",0);
bool lastNtp = cfg.readBoolEntry("lastNtp",false);
int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
cfg.writeEntry("time", time);
-
+
float timeShift = getTimeShift();
if (timeShift == 0.0) return;
int secsSinceLast = time - lastLookup;
TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
TextLabelTimeShift->setText(QString::number(timeShift)+tr(" seconds"));
if ( lastNtp && lastLookup > 0 && secsSinceLast > 60* SpinBoxMinLookupDelay->value())
@@ -326,13 +326,13 @@ void Ntp::slotCheckNtp(int i)
disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) );
connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) );
}else{
disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) );
connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
}
- }else{
+ }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()) );
}
@@ -347,20 +347,20 @@ void Ntp::slotNtpDelayChanged(int delay)
{
ntpTimer->changeInterval( delay*1000*60 );
}
void Ntp::ntpOutPut(QString out)
{
-
+
MultiLineEditntpOutPut->append(out);
MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE);
}
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&)) );
}
@@ -386,15 +386,17 @@ void Ntp::setDocument(const QString &fileName)
qDebug("Ntp::setDocument( %s )",fileName.latin1());
}
void Ntp::showAdvancedFeatures(bool advMode)
{
if (advMode) {
-
- TabWidgetMain->addTab( tabPredict, tr( "Predict" ) );
- TabWidgetMain->addTab( tabNtp, tr( "NTP" ) );
+
+ if ( tabNtp->isVisible() ) {
+ TabWidgetMain->addTab( tabPredict, tr( "Predict" ) );
+ TabWidgetMain->addTab( tabNtp, tr( "NTP" ) );
+ }
TextLabel1_2_2->show();
TextLabel2_3->show();
TextLabel3_3_2->show();
TextLabel1_2->show();
SpinBoxMinLookupDelay->show();
TextLabel2->show();
@@ -419,16 +421,16 @@ void Ntp::showAdvancedFeatures(bool advMode)
void Ntp::accept( ){
qDebug("saving");
//SetTimeDate
commitTime();
- writeSettings();
+ writeSettings();
updateSystem();
// Ntp
- saveConfig();
+ saveConfig();
qApp->quit();
}
void Ntp::reject( ){
qDebug("_oldTimeZone %s",_oldTimeZone.latin1());
if (!_oldTimeZone.isEmpty()){