Diffstat (limited to 'noncore/settings/netsystemtime/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 35d4105..c1cd796 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp | |||
@@ -46,54 +46,54 @@ | |||
46 | 46 | ||
47 | #include <qlayout.h> | 47 | #include <qlayout.h> |
48 | #include <qmessagebox.h> | 48 | #include <qmessagebox.h> |
49 | #include <qsocket.h> | 49 | #include <qsocket.h> |
50 | #include <qstring.h> | 50 | #include <qstring.h> |
51 | #include <qtimer.h> | 51 | #include <qtimer.h> |
52 | 52 | ||
53 | using namespace Opie::Ui; | 53 | using namespace Opie::Ui; |
54 | using namespace Opie::Core; | 54 | using namespace Opie::Core; |
55 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) | 55 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) |
56 | : QDialog( parent, name, modal, f ) | 56 | : QDialog( parent, name, modal, f ) |
57 | { | 57 | { |
58 | setCaption( tr( "SystemTime" ) ); | 58 | setCaption( tr( "SystemTime" ) ); |
59 | 59 | ||
60 | QVBoxLayout *layout = new QVBoxLayout( this ); | 60 | QVBoxLayout *layout = new QVBoxLayout( this ); |
61 | layout->setMargin( 2 ); | 61 | layout->setMargin( 2 ); |
62 | layout->setSpacing( 4 ); | 62 | layout->setSpacing( 4 ); |
63 | 63 | ||
64 | // Create main tabbed control | 64 | // Create main tabbed control |
65 | mainWidget = new OTabWidget( this ); | 65 | mainWidget = new OTabWidget( this ); |
66 | 66 | ||
67 | // Default object pointers to null | 67 | // Default object pointers to null |
68 | ntpProcess = 0x0; | 68 | ntpProcess = 0x0; |
69 | ntpTab = 0x0; | 69 | ntpTab = 0x0; |
70 | predictTab = 0x0; | ||
70 | 71 | ||
71 | // Add tab widgets | 72 | // Add tab widgets |
72 | mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); | 73 | mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); |
73 | mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) ); | 74 | mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) ); |
74 | mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); | 75 | mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); |
75 | mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) ); | ||
76 | Config config( "ntp" ); | 76 | Config config( "ntp" ); |
77 | config.setGroup( "settings" ); | 77 | config.setGroup( "settings" ); |
78 | slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", false ) ); | 78 | slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", false ) ); |
79 | slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", false ) ); | 79 | slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", false ) ); |
80 | 80 | ||
81 | mainWidget->setCurrentTab( tr( "Time" ) ); | 81 | mainWidget->setCurrentTab( tr( "Time" ) ); |
82 | layout->addWidget( mainWidget ); | 82 | layout->addWidget( mainWidget ); |
83 | 83 | ||
84 | connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), | 84 | connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), |
85 | this, SLOT(slotQCopReceive(const QCString&,const QByteArray&)) ); | 85 | this, SLOT(slotQCopReceive(const QCString&,const QByteArray&)) ); |
86 | 86 | ||
87 | 87 | ||
88 | // Create NTP socket | 88 | // Create NTP socket |
89 | ntpSock = new QSocket( this ); | 89 | ntpSock = new QSocket( this ); |
90 | connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) ); | 90 | connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) ); |
91 | slotProbeNTPServer(); | 91 | slotProbeNTPServer(); |
92 | 92 | ||
93 | // Create timer for automatic time lookups | 93 | // Create timer for automatic time lookups |
94 | ntpTimer = new QTimer( this ); | 94 | ntpTimer = new QTimer( this ); |
95 | 95 | ||
96 | // Connect everything together | 96 | // Connect everything together |
97 | connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) ); | 97 | connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) ); |
98 | connect( timeTab, SIGNAL(tzChanged(const QString&)), predictTab, SLOT(slotTZChanged(const QString&)) ); | 98 | connect( timeTab, SIGNAL(tzChanged(const QString&)), predictTab, SLOT(slotTZChanged(const QString&)) ); |
99 | connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) ); | 99 | connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) ); |
@@ -254,48 +254,49 @@ void MainWindow::slotQCopReceive( const QCString &msg, const QByteArray & ) | |||
254 | 254 | ||
255 | void MainWindow::slotDisplayNTPTab( bool display ) | 255 | void MainWindow::slotDisplayNTPTab( bool display ) |
256 | { | 256 | { |
257 | ntpTabEnabled = display; | 257 | ntpTabEnabled = display; |
258 | 258 | ||
259 | // Create widget if it hasn't needed | 259 | // Create widget if it hasn't needed |
260 | if ( display && !ntpTab ) | 260 | if ( display && !ntpTab ) |
261 | { | 261 | { |
262 | ntpTab = new NTPTabWidget( mainWidget ); | 262 | ntpTab = new NTPTabWidget( mainWidget ); |
263 | connect( ntpTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) ); | 263 | connect( ntpTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) ); |
264 | } | 264 | } |
265 | 265 | ||
266 | // Display/hide tab | 266 | // Display/hide tab |
267 | display ? mainWidget->addTab( ntpTab, "netsystemtime/ntptab", tr( "Time Server" ) ) | 267 | display ? mainWidget->addTab( ntpTab, "netsystemtime/ntptab", tr( "Time Server" ) ) |
268 | : mainWidget->removePage( ntpTab ); | 268 | : mainWidget->removePage( ntpTab ); |
269 | } | 269 | } |
270 | 270 | ||
271 | void MainWindow::slotDisplayPredictTab( bool display ) | 271 | void MainWindow::slotDisplayPredictTab( bool display ) |
272 | { | 272 | { |
273 | predictTabEnabled = display; | 273 | predictTabEnabled = display; |
274 | 274 | ||
275 | // Create widget if it hasn't needed | 275 | // Create widget if it hasn't needed |
276 | if ( display && !predictTab ) | 276 | if ( display && !predictTab ) |
277 | { | 277 | { |
278 | predictTab = new PredictTabWidget( mainWidget ); | ||
278 | } | 279 | } |
279 | // Display/hide tab | 280 | // Display/hide tab |
280 | display ? mainWidget->addTab( predictTab, "netsystemtime/predicttab", tr( "Predict" ) ) | 281 | display ? mainWidget->addTab( predictTab, "netsystemtime/predicttab", tr( "Predict" ) ) |
281 | : mainWidget->removePage( predictTab ); | 282 | : mainWidget->removePage( predictTab ); |
282 | } | 283 | } |
283 | 284 | ||
284 | void MainWindow::slotGetNTPTime() | 285 | void MainWindow::slotGetNTPTime() |
285 | { | 286 | { |
286 | ntpInteractive = true; | 287 | ntpInteractive = true; |
287 | runNTP(); | 288 | runNTP(); |
288 | } | 289 | } |
289 | 290 | ||
290 | void MainWindow::slotTimerGetNTPTime() | 291 | void MainWindow::slotTimerGetNTPTime() |
291 | { | 292 | { |
292 | ntpInteractive = false; | 293 | ntpInteractive = false; |
293 | runNTP(); | 294 | runNTP(); |
294 | } | 295 | } |
295 | 296 | ||
296 | void MainWindow::slotProbeNTPServer() | 297 | void MainWindow::slotProbeNTPServer() |
297 | { | 298 | { |
298 | ntpSock->connectToHost( settingsTab->ntpServer(), 123 ); | 299 | ntpSock->connectToHost( settingsTab->ntpServer(), 123 ); |
299 | } | 300 | } |
300 | 301 | ||
301 | void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen ) | 302 | void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen ) |
@@ -350,69 +351,78 @@ void MainWindow::slotNtpFinished( OProcess *p ) | |||
350 | QRegExp _reEndOffset = QRegExp( _sec ); | 351 | QRegExp _reEndOffset = QRegExp( _sec ); |
351 | int posOffset = _reOffset.match( ntpOutput ); | 352 | int posOffset = _reOffset.match( ntpOutput ); |
352 | int posEndOffset = _reEndOffset.match( ntpOutput, posOffset ); | 353 | int posEndOffset = _reEndOffset.match( ntpOutput, posOffset ); |
353 | posOffset += _offset.length() + 1; | 354 | posOffset += _offset.length() + 1; |
354 | QString diff = ntpOutput.mid( posOffset, posEndOffset - posOffset - 1 ); | 355 | QString diff = ntpOutput.mid( posOffset, posEndOffset - posOffset - 1 ); |
355 | 356 | ||
356 | float timeShift = diff.toFloat(); | 357 | float timeShift = diff.toFloat(); |
357 | if ( timeShift == 0.0 ) | 358 | if ( timeShift == 0.0 ) |
358 | return; | 359 | return; |
359 | int secsSinceLast = time - lastLookup; | 360 | int secsSinceLast = time - lastLookup; |
360 | output = tr( "%1 seconds").arg(QString::number( timeShift )); | 361 | output = tr( "%1 seconds").arg(QString::number( timeShift )); |
361 | 362 | ||
362 | // Display information on time server tab | 363 | // Display information on time server tab |
363 | if ( ntpTabEnabled ) | 364 | if ( ntpTabEnabled ) |
364 | { | 365 | { |
365 | ntpTab->setTimeShift( output ); | 366 | ntpTab->setTimeShift( output ); |
366 | ntpTab->setNewTime( dt.toString() ); | 367 | ntpTab->setNewTime( dt.toString() ); |
367 | } | 368 | } |
368 | 369 | ||
369 | if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay ) | 370 | if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay ) |
370 | { | 371 | { |
371 | QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) ); | 372 | QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) ); |
372 | config.setGroup( grpname ); | 373 | config.setGroup( grpname ); |
373 | lookupCount++; | 374 | lookupCount++; |
374 | predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) ); | 375 | |
376 | if(predictTab) | ||
377 | { | ||
378 | predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) ); | ||
379 | } | ||
380 | |||
375 | config.writeEntry( "secsSinceLast", secsSinceLast ); | 381 | config.writeEntry( "secsSinceLast", secsSinceLast ); |
376 | config.writeEntry( "timeShift", QString::number( timeShift ) ); | 382 | config.writeEntry( "timeShift", QString::number( timeShift ) ); |
377 | config.setGroup( "lookups" ); | 383 | config.setGroup( "lookups" ); |
378 | config.writeEntry( "count", lookupCount ); | 384 | config.writeEntry( "count", lookupCount ); |
379 | config.writeEntry( "lastNtp", true ); | 385 | config.writeEntry( "lastNtp", true ); |
380 | } | 386 | } |
381 | } | 387 | } |
382 | 388 | ||
383 | void MainWindow::slotNTPDelayChanged( int delay ) | 389 | void MainWindow::slotNTPDelayChanged( int delay ) |
384 | { | 390 | { |
385 | ntpTimer->changeInterval( delay * 1000 * 60 ); | 391 | ntpTimer->changeInterval( delay * 1000 * 60 ); |
386 | ntpDelay = delay; | 392 | ntpDelay = delay; |
387 | } | 393 | } |
388 | 394 | ||
389 | void MainWindow::slotCheckNtp( int i ) | 395 | void MainWindow::slotCheckNtp( int i ) |
390 | { | 396 | { |
391 | if ( i == 0 ) | 397 | if ( i == 0 ) |
392 | { | 398 | { |
393 | if ( ntpDelayElapsed() ) | 399 | if ( ntpDelayElapsed() ) |
394 | { | 400 | { |
395 | runNTP(); | 401 | runNTP(); |
396 | disconnect( ntpTimer, SIGNAL(timeout()), this, SLOT(slotProbeNTPServer()) ); | 402 | disconnect( ntpTimer, SIGNAL(timeout()), this, SLOT(slotProbeNTPServer()) ); |
397 | connect( ntpTimer, SIGNAL(timeout()), SLOT(slotTimerGetNTPTime()) ); | 403 | connect( ntpTimer, SIGNAL(timeout()), SLOT(slotTimerGetNTPTime()) ); |
398 | } | 404 | } |
399 | else | 405 | else |
400 | { | 406 | { |
401 | disconnect(ntpTimer, SIGNAL(timeout()), this, SLOT(slotTimerGetNTPTime()) ); | 407 | disconnect(ntpTimer, SIGNAL(timeout()), this, SLOT(slotTimerGetNTPTime()) ); |
402 | connect(ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) ); | 408 | connect(ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) ); |
403 | } | 409 | } |
404 | } | 410 | } |
405 | else | 411 | else |
406 | { | 412 | { |
407 | predictTab->slotPredictTime(); | 413 | if(predictTab) |
414 | { | ||
415 | predictTab->slotPredictTime(); | ||
416 | } | ||
417 | |||
408 | if ( i > 0 ) | 418 | if ( i > 0 ) |
409 | { | 419 | { |
410 | QString output = tr( "Could not connect to server " ); | 420 | QString output = tr( "Could not connect to server " ); |
411 | output.append( settingsTab->ntpServer() ); | 421 | output.append( settingsTab->ntpServer() ); |
412 | ntpOutput.append( output ); | 422 | ntpOutput.append( output ); |
413 | if ( ntpTabEnabled ) | 423 | if ( ntpTabEnabled ) |
414 | ntpTab->addNtpOutput( output ); | 424 | ntpTab->addNtpOutput( output ); |
415 | } | 425 | } |
416 | connect( ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) ); | 426 | connect( ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) ); |
417 | } | 427 | } |
418 | } | 428 | } |