author | tille <tille> | 2002-06-26 16:34:14 (UTC) |
---|---|---|
committer | tille <tille> | 2002-06-26 16:34:14 (UTC) |
commit | 9d692658a94c59889c6e46baaeae971226952eb8 (patch) (unidiff) | |
tree | 4cd8a9cf939a5e096e3c1610feac1678131b1673 | |
parent | 12ec527b60e774d0f794fa98f8b6fdf9c194b7a9 (diff) | |
download | opie-9d692658a94c59889c6e46baaeae971226952eb8.zip opie-9d692658a94c59889c6e46baaeae971226952eb8.tar.gz opie-9d692658a94c59889c6e46baaeae971226952eb8.tar.bz2 |
improved startup
-rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index bcbf7a1..b2f5332 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp | |||
@@ -237,46 +237,45 @@ void Ntp::setPredictTime() | |||
237 | preditctTime(); | 237 | preditctTime(); |
238 | setTime( predictedTime ); | 238 | setTime( predictedTime ); |
239 | } | 239 | } |
240 | 240 | ||
241 | void Ntp::slotCheckNtp(int i) | 241 | void Ntp::slotCheckNtp(int i) |
242 | { | 242 | { |
243 | if (i == 0) | 243 | if (i == 0) |
244 | { | 244 | { |
245 | TextLabelMainPredTime->hide(); | 245 | TextLabelMainPredTime->hide(); |
246 | ButtonSetTime->setText( tr("Get time from network") ); | 246 | ButtonSetTime->setText( tr("Get time from network") ); |
247 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) ); | 247 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) ); |
248 | if ( ntpDelayElapsed() ) | 248 | if ( ntpDelayElapsed() ) |
249 | { | 249 | { |
250 | slotRunNtp(); | 250 | slotRunNtp(); |
251 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); | 251 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); |
252 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotRunNtp()) ); | 252 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotRunNtp()) ); |
253 | }else{ | 253 | }else{ |
254 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotRunNtp()) ); | 254 | disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotRunNtp()) ); |
255 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); | 255 | connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); |
256 | } | 256 | } |
257 | }else{ | 257 | }else{ |
258 | preditctTime(); | 258 | preditctTime(); |
259 | ButtonSetTime->setText( tr("Set predicted time") ); | 259 | ButtonSetTime->setText( tr("Set predicted time") ); |
260 | if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer()); | 260 | if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer()); |
261 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) ); | 261 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) ); |
262 | connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); | 262 | connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); |
263 | } | 263 | } |
264 | //ntpTimer->start(SpinBoxNtpDelay->value()*1000*60); | 264 | //ntpTimer->start(SpinBoxNtpDelay->value()*1000*60); |
265 | } | 265 | } |
266 | 266 | ||
267 | void Ntp::slotProbeNtpServer() | 267 | void Ntp::slotProbeNtpServer() |
268 | { | 268 | { |
269 | if ( ntpDelayElapsed() ) | 269 | ntpSock->connectToHost( getNtpServer() ,123); |
270 | ntpSock->connectToHost( getNtpServer() ,123); | ||
271 | } | 270 | } |
272 | 271 | ||
273 | void Ntp::slotNtpDelayChanged(int delay) | 272 | void Ntp::slotNtpDelayChanged(int delay) |
274 | { | 273 | { |
275 | ntpTimer->changeInterval( delay*1000*60 ); | 274 | ntpTimer->changeInterval( delay*1000*60 ); |
276 | } | 275 | } |
277 | 276 | ||
278 | void Ntp::ntpOutPut(QString out) | 277 | void Ntp::ntpOutPut(QString out) |
279 | { | 278 | { |
280 | MultiLineEditntpOutPut->append(out); | 279 | MultiLineEditntpOutPut->append(out); |
281 | MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE); | 280 | MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE); |
282 | } | 281 | } |