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,122 +1,123 @@
         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)
 
         2005-03-25Opie 1.2.0
 
         Fixed Bugs
         ----------
         * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
         * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
         * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
         * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
                 * n.a.- make qpeglobal.h include qglobal.h (zecke)
 
         2005-03-20Opie 1.2.0-rc1
 
 
         New Features
         ------------
         * Launcher: Support a static background pixmap (mickeyl)
         * LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
         * PackageManager supports the 'lists_dir' ipkg configuration option (drw)
         * Added hi-res inline images for large resolution devices (drw)
         * Improved launcher icons for consistency (ar)
         * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
 
         Fixed Bugs
         ----------
         * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
         * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
         * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
         * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
         * #1482 - Fix double '/' in paths (zecke)
         * #1536 - Autosave of custom locations in opie backup (ar)
         * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
         * #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
         * #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
         * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
         * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
         * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
         * #1558 - Fixed opie-login breaking opie startup (mickeyl)
         * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
         * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
         * #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
         * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
         * #1604 - Checkbook crashed on startup (drw)
         * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
         * #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
         * n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
         * n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
         * n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
         * n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
         * n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
         * n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
         * n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
         * n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
 
         Internal
         --------
         * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
         * Killed the need for weak symbols in QtE (zecke)
         * Added optional building libqpe without inline images (mickeyl)
         * OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
 
         2005-02-03Opie 1.1.9
 
         New Features
         ------------
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
@@ -1,171 +1,171 @@
 /*
                              This file is part of the Opie Project
 
                              Copyright (C) Opie Team <opie-devel@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
 :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "mainwindow.h"
 #include "timetabwidget.h"
 #include "formattabwidget.h"
 #include "settingstabwidget.h"
 #include "ntptabwidget.h"
 #include "predicttabwidget.h"
 
 #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&)) );
 
     // Do initial time server check
     slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) );
     slotCheckNtp( -1 );
 
     // Display app
     //showMaximized();
     (void)new QPEDialogListener(this);
 }
 
 MainWindow::~MainWindow()
 {
     if ( ntpProcess )
         delete ntpProcess;
 }
 
 void MainWindow::accept()
 {
     // Turn off the screensaver (Note: needs to be encased in { } so that it deconstructs and sends)
     {
         QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
         disableScreenSaver << 0 << 0 << 0;
     }
 
     // Update the systemtime
     timeTab->saveSettings( true );
 
     // Save format options
     formatTab->saveSettings( true );
 
     // Save settings options
     settingsTab->saveSettings();
 
     // Since time has changed quickly load in the DateBookDB to allow the alarm server to get a better
     // grip on itself (example re-trigger alarms for when we travel back in time).
     DateBookDB db;
 
     // Turn back on the screensaver
     QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
     enableScreenSaver << -1 << -1 << -1;
 
     // Exit app
     qApp->quit();
 }
 
 void MainWindow::reject()
 {
     // Reset time settings
     timeTab->saveSettings( false );
 
     // Send notifications but do not save settings
     formatTab->saveSettings( false );
 
     // Exit app
     qApp->quit();
 }
 
 void MainWindow::runNTP()
 {
     if ( !ntpDelayElapsed() && ntpInteractive )
     {
         QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) );
 
         switch (
@@ -182,237 +182,247 @@ void MainWindow::runNTP()
 
     // Send information to time server tab if enabled
     if ( ntpTabEnabled )
     {
         ntpTab->setStartTime( QDateTime::currentDateTime().toString() );
         QString output = tr( "Running:\nntpdate " );
         output.append( srv );
         ntpTab->addNtpOutput( output );
         ntpTab->setNTPBtnEnabled( false );
     }
 
     // Disable set time buttons & change app caption to indicate time update is happening
     timeTab->setNTPBtnEnabled( false );
     setCaption( tr( "Retrieving time from network..." ) );
 
     if ( !ntpProcess )
     {
         ntpProcess = new OProcess();
         connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
                  this, SLOT(slotNtpOutput(Opie::Core::OProcess*,char*,int)) );
         connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)),
                  this, SLOT(slotNtpFinished(Opie::Core::OProcess*)) );
     }
 
     else
         ntpProcess->clearArguments();
 
     *ntpProcess << "ntpdate"  << srv;
     bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
     if ( !ret )
     {
         QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) );
         if ( ntpTabEnabled )
         {
             ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) );
             ntpTab->setNTPBtnEnabled( true );
         }
 
         // Re-enable set time buttons & change app caption to indicate time update is happening
         timeTab->setNTPBtnEnabled( true );
         setCaption( tr( "SystemTime" ) );
     }
 }
 
 bool MainWindow::ntpDelayElapsed()
 {
     // Determine if time elapsed is greater than time delay
     Config config( "ntp" );
     config.setGroup( "lookups" );
     _lookupDiff = TimeConversion::toUTC( QDateTime::currentDateTime() ) - config.readNumEntry( "time", 0 );
     if ( _lookupDiff < 0 )
         return true;
     return ( _lookupDiff - ( ntpDelay * 60) ) > 0;
 }
 
 void MainWindow::slotSetTime( const QDateTime &dt )
 {
     timeTab->setDateTime( dt );
 }
 
 void MainWindow::slotQCopReceive( const QCString &msg, const QByteArray & )
 {
     if ( msg == "ntpLookup(QString)" )
     {
         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 );
 }
 
 void MainWindow::slotNtpFinished( OProcess *p )
 {
     QString output;
     QDateTime dt = QDateTime::currentDateTime();
 
     // Re-enable set time buttons & change app caption to indicate time update is happening
     if ( ntpTabEnabled )
         ntpTab->setNTPBtnEnabled( true );
     timeTab->setNTPBtnEnabled( true );
     setCaption( tr( "SystemTime" ) );
 
     //  Verify run was successful
     if ( p->exitStatus() != 0 )
     {
         if ( isVisible() && ntpInteractive )
         {
             output = tr( "Error while getting time from\n server: " );
             output.append( settingsTab->ntpServer() );
             QMessageBox::critical(this, tr( "Error" ), output );
         }
     //      slotCheckNtp(-1);
         return;
     }
 
     // Set controls on time tab to new time value
     timeTab->setDateTime( dt );
 
     // Write out lookup information
     Config config( "ntp" );
     config.setGroup( "lookups" );
     int lastLookup = config.readNumEntry( "time", 0 );
     int lookupCount = config.readNumEntry( "count", 0 );
     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()) );
     }
 }