summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp12
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a32023..ba355ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,4 +25,5 @@
* #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
* #1535 - Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
+ * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
* #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
* #1557 - Light&Power-Settings don't store warning intervall and warning levels (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
@@ -68,4 +68,5 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags
ntpProcess = 0x0;
ntpTab = 0x0;
+ predictTab = 0x0;
// Add tab widgets
@@ -73,5 +74,4 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags
mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) );
mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) );
- mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) );
Config config( "ntp" );
config.setGroup( "settings" );
@@ -276,4 +276,5 @@ void MainWindow::slotDisplayPredictTab( bool display )
if ( display && !predictTab )
{
+ predictTab = new PredictTabWidget( mainWidget );
}
// Display/hide tab
@@ -372,5 +373,10 @@ void MainWindow::slotNtpFinished( OProcess *p )
config.setGroup( grpname );
lookupCount++;
+
+ if(predictTab)
+ {
predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) );
+ }
+
config.writeEntry( "secsSinceLast", secsSinceLast );
config.writeEntry( "timeShift", QString::number( timeShift ) );
@@ -405,5 +411,9 @@ void MainWindow::slotCheckNtp( int i )
else
{
+ if(predictTab)
+ {
predictTab->slotPredictTime();
+ }
+
if ( i > 0 )
{