summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 551cedc..06d944d 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -79,65 +79,69 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
79 79
80 ntpSock = new QSocket( this ); 80 ntpSock = new QSocket( this );
81 connect( ntpSock, SIGNAL( error(int) ),SLOT(slotCheckNtp(int)) ); 81 connect( ntpSock, SIGNAL( error(int) ),SLOT(slotCheckNtp(int)) );
82 slotProbeNtpServer(); 82 slotProbeNtpServer();
83 83
84 connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), 84 connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
85 this, SLOT(getNtpOutput(OProcess*,char*,int))); 85 this, SLOT(getNtpOutput(OProcess*,char*,int)));
86 connect ( ntpProcess, SIGNAL(processExited(OProcess*)), 86 connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
87 this, SLOT(ntpFinished(OProcess*))); 87 this, SLOT(ntpFinished(OProcess*)));
88 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotButtonRunNtp())); 88 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotButtonRunNtp()));
89 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime())); 89 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
90 connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime())); 90 connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime()));
91 slotCheckNtp(-1); 91 slotCheckNtp(-1);
92 readLookups(); 92 readLookups();
93} 93}
94 94
95Ntp::~Ntp() 95Ntp::~Ntp()
96{ 96{
97 delete ntpProcess; 97 delete ntpProcess;
98} 98}
99 99
100void Ntp::saveConfig(){ 100void Ntp::saveConfig(){
101 int srvCount = ComboNtpSrv->count(); 101 int srvCount = ComboNtpSrv->count();
102 bool serversChanged = true; 102 bool serversChanged = true;
103 int curSrv = ComboNtpSrv->currentItem();
103 QString edit = ComboNtpSrv->currentText(); 104 QString edit = ComboNtpSrv->currentText();
104 for (int i = 0; i < srvCount; i++){ 105 for (int i = 0; i < srvCount; i++){
105 if ( edit == ComboNtpSrv->text(i)) serversChanged = false; 106 if ( edit == ComboNtpSrv->text(i)) serversChanged = false;
106 } 107 }
107 if (serversChanged){ 108 if (serversChanged){
108 Config ntpSrvs("/etc/ntpservers",Config::File); 109 Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File);
109 ntpSrvs.setGroup("servers"); 110 ntpSrvs.setGroup("servers");
110 ntpSrvs.writeEntry("count", srvCount); 111 ntpSrvs.writeEntry("count", ++srvCount);
111 for (int i = 0; i < srvCount; i++){ 112 ntpSrvs.setGroup("0");
113 ntpSrvs.writeEntry( "name", edit );
114 curSrv = 0;
115 for (int i = 1; i < srvCount; i++){
112 qDebug("ntpSrvs[%i/%i]=%s",i,srvCount,ComboNtpSrv->text(i).latin1()); 116 qDebug("ntpSrvs[%i/%i]=%s",i,srvCount,ComboNtpSrv->text(i).latin1());
113 ntpSrvs.setGroup(QString::number(i)); 117 ntpSrvs.setGroup(QString::number(i));
114 ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i) ); 118 ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i-1) );
115 } 119 }
116 } 120 }
117 Config cfg("ntp",Config::User); 121 Config cfg("ntp",Config::User);
118 cfg.setGroup("settings"); 122 cfg.setGroup("settings");
119 cfg.writeEntry("ntpServer", ComboNtpSrv->currentItem()); 123 cfg.writeEntry("ntpServer", curSrv );
120 cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() ); 124 cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() );
121 cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() ); 125 cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() );
122 cfg.writeEntry( "advancedFeatures", CheckBoxAdvSettings->isChecked() ); 126 cfg.writeEntry( "advancedFeatures", CheckBoxAdvSettings->isChecked() );
123} 127}
124 128
125bool Ntp::ntpDelayElapsed() 129bool Ntp::ntpDelayElapsed()
126{ 130{
127 Config cfg("ntp",Config::User); 131 Config cfg("ntp",Config::User);
128 cfg.setGroup("lookups"); 132 cfg.setGroup("lookups");
129 _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0); 133 _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
130 if (_lookupDiff < 0) return true; 134 if (_lookupDiff < 0) return true;
131 int i =_lookupDiff - (SpinBoxNtpDelay->value()*60); 135 int i =_lookupDiff - (SpinBoxNtpDelay->value()*60);
132 return i > -60; 136 return i > -60;
133} 137}
134 138
135QString Ntp::getNtpServer() 139QString Ntp::getNtpServer()
136{ 140{
137 return ComboNtpSrv->currentText(); 141 return ComboNtpSrv->currentText();
138} 142}
139 143
140void Ntp::slotButtonRunNtp() 144void Ntp::slotButtonRunNtp()
141{ 145{
142 _interactive = true; 146 _interactive = true;
143 slotRunNtp(); 147 slotRunNtp();
@@ -411,25 +415,25 @@ void Ntp::showAdvancedFeatures(bool advMode)
411 Line1->hide(); 415 Line1->hide();
412 }; 416 };
413 TabWidgetMain->show(); 417 TabWidgetMain->show();
414} 418}
415 419
416 420
417void Ntp::accept( ){ 421void Ntp::accept( ){
418 qDebug("saving"); 422 qDebug("saving");
419 //SetTimeDate 423 //SetTimeDate
420 commitTime(); 424 commitTime();
421 writeSettings(); 425 writeSettings();
422 updateSystem(); 426 updateSystem();
423 // Ntp 427 // Ntp
424 saveConfig(); 428 saveConfig();
425 qApp->quit(); 429 qApp->quit();
426} 430}
427 431
428void Ntp::reject( ){ 432void Ntp::reject( ){
429 qDebug("_oldTimeZone %s",_oldTimeZone.latin1()); 433 qDebug("_oldTimeZone %s",_oldTimeZone.latin1());
430 if (!_oldTimeZone.isEmpty()){ 434 if (!_oldTimeZone.isEmpty()){
431 qDebug("reverting timezone"); 435 qDebug("reverting timezone");
432 tzChange(_oldTimeZone); 436 tzChange(_oldTimeZone);
433 commitTime(); 437 commitTime();
434 } 438 }
435} \ No newline at end of file 439}