-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 16 |
2 files changed, 14 insertions, 3 deletions
@@ -26,2 +26,3 @@ | |||
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) |
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 | |||
@@ -69,2 +69,3 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags | |||
69 | ntpTab = 0x0; | 69 | ntpTab = 0x0; |
70 | predictTab = 0x0; | ||
70 | 71 | ||
@@ -74,3 +75,2 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags | |||
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" ); |
@@ -277,2 +277,3 @@ void MainWindow::slotDisplayPredictTab( bool display ) | |||
277 | { | 277 | { |
278 | predictTab = new PredictTabWidget( mainWidget ); | ||
278 | } | 279 | } |
@@ -373,3 +374,8 @@ void MainWindow::slotNtpFinished( OProcess *p ) | |||
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 ); |
@@ -406,3 +412,7 @@ void MainWindow::slotCheckNtp( int i ) | |||
406 | { | 412 | { |
407 | predictTab->slotPredictTime(); | 413 | if(predictTab) |
414 | { | ||
415 | predictTab->slotPredictTime(); | ||
416 | } | ||
417 | |||
408 | if ( i > 0 ) | 418 | if ( i > 0 ) |