Show 'Predict' tab only once - close #1543

2 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a32023..ba355ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,58 +1,59 @@
         2005-??-??Opie 1.2.1
         
         
         New Features
         ------------
         * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
         * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
         * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
         * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
         * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
         * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
         * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
         * ZSafe: Made UI conform to Opie standards (drw)
         * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
         * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
         * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
         * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
 
         Fixed Bugs
         ----------
         * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
                 - We actually suspend the complete Opie now in that case.
         * #1384 - Battery status updated improperly when charging (skyhusker)
         * #1476 - Wrong order of application entries in the O-menu (skyhusker)
         * #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)
         * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
         * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
         * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
         * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
                 * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker)
         * #1667 - Opie-IRC does not show messages from !channel (skyhusker)
         * #1679 - Security PIN plugin is QVGA sized (hrw)
                 * n.a.- always show volume and wireless applet popups inside visible screen (deller)
         * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
                 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
                 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
                 * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl)
                 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
         * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
         * n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
         * n.a.  - remove hardcoded font size from netsystemtime (hrw)
         * n.a.  - remove hardcoded font size from checkbook graphs (hrw)
 
         Internal
         --------
         * Make BluezApplet use OTaskbarApplet (mickeyl)
         * libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
         * libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
         * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
         * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
         * libopienet: Miscellaneous API cleanups (mickeyl)
         * libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
         * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl)
         * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl)
 
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
@@ -38,70 +38,70 @@
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qsocket.h>
 #include <qstring.h>
 #include <qtimer.h>
 
 using namespace Opie::Ui;
 using namespace Opie::Core;
 MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
     : QDialog( parent, name, modal, f )
 {
     setCaption( tr( "SystemTime" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     // Create main tabbed control
     mainWidget = new OTabWidget( this );
 
     // Default object pointers to null
     ntpProcess = 0x0;
     ntpTab = 0x0;
+    predictTab = 0x0;
 
     // Add tab widgets
     mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) );
     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" );
     slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", false ) );
     slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", false ) );
 
     mainWidget->setCurrentTab( tr( "Time" ) );
     layout->addWidget( mainWidget );
 
     connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
         this, SLOT(slotQCopReceive(const QCString&,const QByteArray&)) );
 
 
     // Create NTP socket
     ntpSock = new QSocket( this );
     connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) );
     slotProbeNTPServer();
 
     // Create timer for automatic time lookups
     ntpTimer = new QTimer( this );
 
     // Connect everything together
     connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
     connect( timeTab, SIGNAL(tzChanged(const QString&)), predictTab, SLOT(slotTZChanged(const QString&)) );
     connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) );
     connect( formatTab, SIGNAL(show12HourTime(int)), timeTab, SLOT(slotUse12HourTime(int)) );
     connect( formatTab, SIGNAL(dateFormatChanged(const DateFormat&)),
              timeTab, SLOT(slotDateFormatChanged(const DateFormat&)) );
     connect( formatTab, SIGNAL(weekStartChanged(int)), timeTab, SLOT(slotWeekStartChanged(int)) );
     connect( settingsTab, SIGNAL(ntpDelayChanged(int)), this, SLOT(slotNTPDelayChanged(int)) );
     connect( settingsTab, SIGNAL(displayNTPTab(bool)), this, SLOT(slotDisplayNTPTab(bool)) );
     connect( settingsTab, SIGNAL(displayPredictTab(bool)), this, SLOT(slotDisplayPredictTab(bool)) );
     connect( predictTab, SIGNAL(setTime(const QDateTime&)), this, SLOT(slotSetTime(const QDateTime&)) );
@@ -246,64 +246,65 @@ void MainWindow::slotQCopReceive( const QCString &msg, const QByteArray & )
         ntpInteractive = false;
         runNTP();
     }
     if ( msg == "setPredictedTime(QString)" )
     {
         //setPredictTime();
     }
 }
 
 void MainWindow::slotDisplayNTPTab( bool display )
 {
     ntpTabEnabled = display;
 
     // Create widget if it hasn't needed
     if ( display && !ntpTab )
     {
         ntpTab = new NTPTabWidget( mainWidget );
         connect( ntpTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
     }
 
     // Display/hide tab
     display ? mainWidget->addTab( ntpTab, "netsystemtime/ntptab", tr( "Time Server" ) )
             : mainWidget->removePage( ntpTab );
 }
 
 void MainWindow::slotDisplayPredictTab( bool display )
 {
     predictTabEnabled = display;
 
     // Create widget if it hasn't needed
     if ( display && !predictTab )
     {
+        predictTab = new PredictTabWidget( mainWidget );
     }
     // Display/hide tab
     display ? mainWidget->addTab( predictTab, "netsystemtime/predicttab", tr( "Predict" ) )
             : mainWidget->removePage( predictTab );
 }
 
 void MainWindow::slotGetNTPTime()
 {
     ntpInteractive = true;
     runNTP();
 }
 
 void MainWindow::slotTimerGetNTPTime()
 {
     ntpInteractive = false;
     runNTP();
 }
 
 void MainWindow::slotProbeNTPServer()
 {
     ntpSock->connectToHost( settingsTab->ntpServer(), 123 );
 }
 
 void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen )
 {
     QString output = QString( buffer ).left( buflen );
     ntpOutput.append( output );
 
     if ( ntpTabEnabled )
         ntpTab->addNtpOutput( output );
 }
 
@@ -342,77 +343,86 @@ void MainWindow::slotNtpFinished( OProcess *p )
     bool lastNtp = config.readBoolEntry( "lastNtp", false );
     int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
     config.writeEntry( "time", time );
 
     // Calculate new time/time shift
     QString _offset = "offset";
     QString _sec = "sec";
     QRegExp _reOffset = QRegExp( _offset );
     QRegExp _reEndOffset = QRegExp( _sec );
     int posOffset = _reOffset.match(  ntpOutput );
     int posEndOffset = _reEndOffset.match(  ntpOutput, posOffset );
     posOffset += _offset.length() + 1;
     QString diff =  ntpOutput.mid( posOffset, posEndOffset - posOffset - 1 );
 
     float timeShift = diff.toFloat();
     if ( timeShift == 0.0 )
         return;
     int secsSinceLast = time - lastLookup;
     output = tr( "%1 seconds").arg(QString::number( timeShift ));
 
     // Display information on time server tab
     if ( ntpTabEnabled )
     {
         ntpTab->setTimeShift( output );
         ntpTab->setNewTime( dt.toString() );
     }
 
     if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay )
     {
         QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) );
         config.setGroup( grpname );
         lookupCount++;
-        predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) );
+        
+        if(predictTab)
+        {
+            predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) );
+        }
+
         config.writeEntry( "secsSinceLast", secsSinceLast );
         config.writeEntry( "timeShift", QString::number( timeShift ) );
         config.setGroup( "lookups" );
         config.writeEntry( "count", lookupCount );
         config.writeEntry( "lastNtp", true );
     }
 }
 
 void MainWindow::slotNTPDelayChanged( int delay )
 {
     ntpTimer->changeInterval( delay * 1000 * 60 );
     ntpDelay = delay;
 }
 
 void MainWindow::slotCheckNtp( int i )
 {
     if ( i == 0 )
     {
         if ( ntpDelayElapsed() )
         {
             runNTP();
             disconnect( ntpTimer, SIGNAL(timeout()), this, SLOT(slotProbeNTPServer()) );
             connect( ntpTimer, SIGNAL(timeout()), SLOT(slotTimerGetNTPTime()) );
         }
         else
         {
             disconnect(ntpTimer, SIGNAL(timeout()), this, SLOT(slotTimerGetNTPTime()) );
             connect(ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) );
         }
     }
     else
     {
-        predictTab->slotPredictTime();
+        if(predictTab)
+        {
+            predictTab->slotPredictTime();
+        }
+
         if ( i > 0 )
         {
             QString output = tr( "Could not connect to server " );
             output.append( settingsTab->ntpServer() );
             ntpOutput.append( output );
             if ( ntpTabEnabled )
                 ntpTab->addNtpOutput( output );
         }
         connect( ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) );
     }
 }