summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp16
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a32023..ba355ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,12 +21,13 @@
21 * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) 21 * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
22 - We actually suspend the complete Opie now in that case. 22 - We actually suspend the complete Opie now in that case.
23 * #1384 - Battery status updated improperly when charging (skyhusker) 23 * #1384 - Battery status updated improperly when charging (skyhusker)
24 * #1476 - Wrong order of application entries in the O-menu (skyhusker) 24 * #1476 - Wrong order of application entries in the O-menu (skyhusker)
25 * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl) 25 * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
26 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) 26 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
27 * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
27 * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker) 28 * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
28 * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker) 29 * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
29 * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller) 30 * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
30 * #1614 - Make Opie-console start in $HOME instead of / (skyhusker) 31 * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
31 * #1635 - opie-today, datebook-plugin does not show notes (skyhusker) 32 * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
32 * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker) 33 * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
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
@@ -64,18 +64,18 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags
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" ) );
@@ -272,12 +272,13 @@ 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
@@ -368,13 +369,18 @@ void MainWindow::slotNtpFinished( OProcess *p )
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 }
@@ -401,13 +407,17 @@ void MainWindow::slotCheckNtp( int i )
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 )