Diffstat (limited to 'noncore/settings/netsystemtime/ntp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index c7e3b52..53dbe46 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp | |||
@@ -49,5 +49,5 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) | |||
49 | 49 | ||
50 | //make tab order | 50 | //make tab order |
51 | 51 | ||
52 | TabWidgetMain->removePage( tabMain ); | 52 | TabWidgetMain->removePage( tabMain ); |
53 | TabWidgetMain->removePage( tabManualSetTime ); | 53 | TabWidgetMain->removePage( tabManualSetTime ); |
@@ -57,5 +57,4 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) | |||
57 | 57 | ||
58 | TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); | 58 | TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); |
59 | TabWidgetMain->insertTab( tabManualSetTime, tr( "Manual" ) ); | ||
60 | TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); | 59 | TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); |
61 | TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); | 60 | TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); |
@@ -97,4 +96,7 @@ Ntp::~Ntp() | |||
97 | { | 96 | { |
98 | delete ntpProcess; | 97 | delete ntpProcess; |
98 | } | ||
99 | |||
100 | void Ntp::saveConfig(){ | ||
99 | int srvCount = ComboNtpSrv->count(); | 101 | int srvCount = ComboNtpSrv->count(); |
100 | bool serversChanged = true; | 102 | bool serversChanged = true; |
@@ -200,18 +202,8 @@ void Ntp::ntpFinished(OProcess *p) | |||
200 | if ( isVisible() && _interactive ){ | 202 | if ( isVisible() && _interactive ){ |
201 | QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput ); | 203 | QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput ); |
202 | TabWidgetMain->showPage( tabManualSetTime ); | ||
203 | } | 204 | } |
204 | 205 | // slotCheckNtp(-1); | |
205 | return; | 206 | return; |
206 | } | 207 | } |
207 | |||
208 | Global::writeHWClock(); | ||
209 | // since time has changed quickly load in the datebookdb | ||
210 | // to allow the alarm server to get a better grip on itself | ||
211 | // (example re-trigger alarms for when we travel back in time) | ||
212 | DateBookDB db; | ||
213 | |||
214 | // QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" ); | ||
215 | // timeApplet << ""; | ||
216 | 208 | ||
217 | Config cfg("ntp",Config::User); | 209 | Config cfg("ntp",Config::User); |
@@ -307,30 +299,32 @@ void Ntp::preditctTime() | |||
307 | predictedTime = QDateTime::currentDateTime().addSecs(corr); | 299 | predictedTime = QDateTime::currentDateTime().addSecs(corr); |
308 | TextLabelPredTime->setText(predictedTime.toString()); | 300 | TextLabelPredTime->setText(predictedTime.toString()); |
309 | TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); | 301 | // TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); |
310 | } | 302 | } |
311 | 303 | ||
312 | void Ntp::setPredictTime() | 304 | void Ntp::setPredictTime() |
313 | { | 305 | { |
306 | qDebug("Ntp::setPredictTime"); | ||
314 | preditctTime(); | 307 | preditctTime(); |
315 | setTime( predictedTime ); | 308 | timeButton->setTime( predictedTime ); |
316 | } | 309 | } |
317 | 310 | ||
318 | void Ntp::slotCheckNtp(int i) | 311 | void Ntp::slotCheckNtp(int i) |
319 | { | 312 | { |
313 | qDebug(" Ntp::slotCheckNtp(%i)",i); | ||
320 | if (i == 0) | 314 | if (i == 0) |
321 | { | 315 | { |
322 | TextLabelMainPredTime->hide(); | 316 | // TextLabelMainPredTime->hide(); |
323 | ButtonSetTime->setText( tr("Get time from network") ); | 317 | ButtonSetTime->setText( tr("Get time from network") ); |
324 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotButtonRunNtp()) ); | 318 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotButtonRunNtp()) ); |
325 | if ( ntpDelayElapsed() ) | 319 | if ( ntpDelayElapsed() ) |
326 | { | 320 | { |
327 | slotRunNtp(); | 321 | slotRunNtp(); |
328 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); | 322 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); |
329 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) ); | 323 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) ); |
330 | }else{ | 324 | }else{ |
331 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) ); | 325 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) ); |
332 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); | 326 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); |
333 | } | 327 | } |
334 | }else{ | 328 | }else{ |
335 | preditctTime(); | 329 | preditctTime(); |
336 | ButtonSetTime->setText( tr("Set predicted time: ")+predictedTime.toString() ); | 330 | ButtonSetTime->setText( tr("Set predicted time: ")+predictedTime.toString() ); |
@@ -419,2 +413,14 @@ void Ntp::showAdvancedFeatures(bool advMode) | |||
419 | TabWidgetMain->show(); | 413 | TabWidgetMain->show(); |
420 | } | 414 | } |
415 | |||
416 | |||
417 | void Ntp::accept( ){ | ||
418 | qDebug("accepted"); | ||
419 | //SetTimeDate | ||
420 | commitTime(); | ||
421 | writeSettings(); | ||
422 | updateSystem(); | ||
423 | // Ntp | ||
424 | saveConfig(); | ||
425 | qApp->quit(); | ||
426 | } \ No newline at end of file | ||