5 files changed, 16 insertions, 8 deletions

diff --git a/noncore/settings/netsystemtime/TODO b/noncore/settings/netsystemtime/TODO
index fb003a2..c6106c3 100644
--- a/noncore/settings/netsystemtime/TODO
+++ b/noncore/settings/netsystemtime/TODO
@@ -1,3 +1,2 @@
-- handle hour > 24 in SetTime::slotClockTick
 - improve tz setting
           atm the tz gets written to the system as soon as changed...
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 53dbe46..551cedc 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -322,105 +322,114 @@ void Ntp::slotCheckNtp(int i)
         disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) );
         connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) );
       }else{
         disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) );
         connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
       }
     }else{              
       preditctTime();
       ButtonSetTime->setText( tr("Set predicted time: ")+predictedTime.toString() );
       if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer());
       connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
       connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
     }
 }
 
 void Ntp::slotProbeNtpServer()
 {
   ntpSock->connectToHost( getNtpServer() ,123);
 }
 
 void Ntp::slotNtpDelayChanged(int delay)
 {
   ntpTimer->changeInterval( delay*1000*60 );
 }
 
 void Ntp::ntpOutPut(QString out)
 {
   
   MultiLineEditntpOutPut->append(out);
   MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE);
 }
 
 
 void Ntp::makeChannel()
         {   
   channel = new QCopChannel( "QPE/Application/netsystemtime", this );
   connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
            this, SLOT(receive(const QCString&, const QByteArray&)) );
 }
 
 
 
 void Ntp::receive(const QCString &msg, const QByteArray &arg)
 {
   qDebug("QCop(Ntp) "+msg+" "+QCString(arg));
   if ( msg == "ntpLookup(QString)" )
     {
       _interactive = false;
       slotRunNtp();
     }
   if ( msg == "setPredictedTime(QString)" )
     {
       setPredictTime();
     }else{
       qDebug("Ntp::receive: Huh what do ya want");
     }
 }
 
 void Ntp::setDocument(const QString &fileName)
 {
   qDebug("Ntp::setDocument( %s )",fileName.latin1());
 }
 
 void Ntp::showAdvancedFeatures(bool advMode)
 {
   if  (advMode) {
     
     TabWidgetMain->addTab( tabPredict, tr( "Predict" ) );
     TabWidgetMain->addTab( tabNtp, tr( "NTP" ) );
     TextLabel1_2_2->show();
     TextLabel2_3->show();
     TextLabel3_3_2->show();
     TextLabel1_2->show();
     SpinBoxMinLookupDelay->show();
     TextLabel2->show();
     TextLabel3_3->show();
     SpinBoxNtpDelay->show();
     Line1->show();
   }else{
     TabWidgetMain->removePage( tabPredict );
     TabWidgetMain->removePage( tabNtp );
     TextLabel1_2_2->hide();
     TextLabel2_3->hide();
     TextLabel3_3_2->hide();
     TextLabel1_2->hide();
     SpinBoxMinLookupDelay->hide();
     TextLabel2->hide();
     TextLabel3_3->hide();
     SpinBoxNtpDelay->hide();
     Line1->hide();
   };
   TabWidgetMain->show();
 }
 
 
 void Ntp::accept( ){
-    qDebug("accepted");
+    qDebug("saving");
     //SetTimeDate
     commitTime();
           writeSettings(); 
     updateSystem();
     // Ntp
     saveConfig();    
     qApp->quit();
+}
+
+void Ntp::reject( ){
+    qDebug("_oldTimeZone %s",_oldTimeZone.latin1());
+    if (!_oldTimeZone.isEmpty()){
+      qDebug("reverting timezone");
+      tzChange(_oldTimeZone);
+      commitTime();
+    }
 }
\ No newline at end of file
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index a4573f8..150140e 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -1,57 +1,58 @@
 #ifndef NTP_H
 #define NTP_H
 #include "settime.h"
 #include <qdatetime.h>
 
 class OProcess;
 class QString;
 class QTimer;
 class QSocket;
 class QCopChannel;
 
 class Ntp : public SetDateTime
 {
   Q_OBJECT
 
 public:
   Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~Ntp();
 
 public slots:
   void setDocument (const QString &);
 protected:
   virtual void accept( );
+  virtual void reject( );
   QDateTime predictedTime;
   void makeChannel();
 protected slots:
   void receive(const QCString &msg, const QByteArray &arg);
 private:
   QString _ntpOutput;
   float _shiftPerSec;
   int _lookupDiff;
   OProcess *ntpProcess;
   QTimer *ntpTimer;
   QSocket *ntpSock;
   QCopChannel *channel;
   bool _interactive;
   float getTimeShift();
   void readLookups();
   void ntpOutPut(QString);
   bool ntpDelayElapsed();
   QString getNtpServer();
   void saveConfig();
 private slots:
   void slotTimerRunNtp();
   void slotButtonRunNtp();
   void slotRunNtp();
   void getNtpOutput(OProcess *proc, char *buffer, int buflen);
   void ntpFinished(OProcess*);
   void preditctTime();
   void slotCheckNtp(int);
   void setPredictTime();
   void showAdvancedFeatures(bool);
   void slotProbeNtpServer();
   void slotNtpDelayChanged(int);
 };
 
 #endif
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 36166ae..6a28989 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -1,155 +1,155 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "settime.h"
 
 #include <qpe/alarmserver.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/timeconversion.h>
 #include <qpe/tzselect.h>
 #include <qpe/timestring.h>
 #include <qpe/qpedialog.h>
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qtimer.h>
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qwindowsystem_qws.h>
 #include <qcombobox.h>
 
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 
 SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
     : NtpBase( parent, name, true, f )
 {
     setCaption( tr("System Time") );
-
+    _oldTimeZone="";
     QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 );
 
 //    TextLabelMainPredTime = new QLabel( FrameSystemTime );
 //    vb->addWidget( TextLabelMainPredTime, 1, 0 );
 
     timeButton = new SetTime( FrameSystemTime );
                 vb->addWidget( timeButton );
 
     QHBoxLayout *db = new QHBoxLayout( vb );
     QLabel *dateLabel = new QLabel( tr("Date"), FrameSystemTime );
     db->addWidget( dateLabel, 1 );
     dateButton = new DateButton( TRUE, FrameSystemTime );
     db->addWidget( dateButton, 2 );
 
     ButtonSetTime = new QPushButton( FrameSystemTime );
     vb->addWidget( ButtonSetTime, 1, 0 );
     
     QFrame *hline = new QFrame( FrameSystemTime );
     hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
     vb->addWidget( hline );
     
     QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" );
    
     QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" );
     lblZone->setMaximumSize( lblZone->sizeHint() );
     hb->addWidget( lblZone );
 
     tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" );
     tz->setMinimumSize( tz->sizeHint() );
     hb->addWidget( tz );   
 
     hline = new QFrame( FrameSystemTime );
     hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
     vb->addWidget( hline );
     
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     vb->addItem( spacer );
 
     Config config("qpe");
     config.setGroup( "Time" );
 
     QHBoxLayout *hb1 = new QHBoxLayout( vb );
 
     QLabel *l = new QLabel( tr("Time format"), FrameSystemTime );
     hb1->addWidget( l, 1 );
 
 
     ampmCombo = new QComboBox( FrameSystemTime );
     ampmCombo->insertItem( tr("24 hour"), 0 );
     ampmCombo->insertItem( tr("12 hour"), 1 );
     hb1->addWidget( ampmCombo, 2 );
 
     int show12hr = config.readBoolEntry("AMPM") ? 1 : 0;
     ampmCombo->setCurrentItem( show12hr );
     timeButton->show12hourTime( show12hr );
 
     connect(ampmCombo, SIGNAL(activated(int)),
       timeButton, SLOT(show12hourTime(int)));
 
 
 
     QHBoxLayout *hb2 = new QHBoxLayout( vb );
     l = new QLabel( tr("Weeks start on" ), FrameSystemTime );
     //l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l, 1 );
 
     weekStartCombo = new QComboBox( FrameSystemTime );
     weekStartCombo->insertItem( tr("Sunday"), 0 );
     weekStartCombo->insertItem( tr("Monday"), 1 );
 
     hb2->addWidget( weekStartCombo, 2 );
     int startMonday =  config.readBoolEntry("MONDAY") ? 1 : 0;
     dateButton->setWeekStartsMonday( startMonday );
     weekStartCombo->setCurrentItem( startMonday );
 
     connect( weekStartCombo, SIGNAL( activated(int)),
        dateButton, SLOT(setWeekStartsMonday(int)));
 
 
     QHBoxLayout *hb3 = new QHBoxLayout( vb );
     l = new QLabel( tr("Date format" ), FrameSystemTime );
     hb3->addWidget( l, 1 );
     dateFormatCombo = new QComboBox( FrameSystemTime );
     hb3->addWidget( dateFormatCombo, 2 );
 
     config.setGroup( "Date" );
     DateFormat df(QChar(config.readEntry("Separator", "/")[0]),
       (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear),
       (DateFormat::Order)config.readNumEntry("LongOrder", DateFormat::DayMonthYear));
 
     int currentdf = 0;
     date_formats[0] = DateFormat('/', DateFormat::MonthDayYear);
     dateFormatCombo->insertItem( tr( date_formats[0].toNumberString()) );
     date_formats[1] = DateFormat('.', DateFormat::DayMonthYear);
     if (df == date_formats[1])
   currentdf = 1;
@@ -225,200 +225,199 @@ void SetDateTime::writeSettings()
     config.writeEntry( "LongOrder", df.longOrder());
     config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() );
 
     Config lconfig("locale");
     lconfig.setGroup( "Location" );
     lconfig.writeEntry( "Timezone", tz->currentZone() );
 
 }
 
 void  SetDateTime::commitTime()
 {
                 Config cfg("ntp",Config::User);
           cfg.setGroup("lookups");
                 cfg.writeEntry("lastNtp",false);
     tz->setFocus();
     // Need to process the QCOP event generated above before proceeding
     qApp->processEvents();
 
     // before we progress further, set our TZ!
     setenv( "TZ", tz->currentZone(), 1 );
     // now set the time...
     QDateTime dt( dateButton->date(), timeButton->time() );
 
     if ( dt.isValid() ) setTime(dt);
 }
 
 void  SetDateTime::setTime(QDateTime dt)
 {
     // really turn off the screensaver before doing anything
     {
   // Needs to be encased in { } so that it deconstructs and sends
   QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
   disableScreenSaver << 0 << 0 << 0;
     }
         Config cfg("ntp",Config::User);
   cfg.setGroup("correction");
     int t = TimeConversion::toUTC(dt);
           struct timeval myTv;
           myTv.tv_sec = t;
           cfg.writeEntry("time", t );
           myTv.tv_usec = 0;
 
   if ( myTv.tv_sec != -1 )
       ::settimeofday( &myTv, 0 );
   Global::writeHWClock();
   // 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;
   //QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" );
   //timeApplet << "";
   // Restore screensaver
   QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
   enableScreenSaver << -1 << -1 << -1;
 }
 
 void SetDateTime::updateSystem()
 {
     // really turn off the screensaver before doing anything
     {
   // Needs to be encased in { } so that it deconstructs and sends
   QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
   disableScreenSaver << 0 << 0 << 0;
     }
         qDebug("SetDateTime::updateSystem()");
          writeSettings();
 
     // set the timezone for everyone else...
     QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
     setTimeZone << tz->currentZone();
 
     // AM/PM setting and notify time changed
     QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
     setClock << ampmCombo->currentItem();
 
     // Notify everyone what day we prefer to start the week on.
     QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
     setWeek << weekStartCombo->currentItem();
 
     // Notify everyone what date format  to use
     QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
     setDateFormat << date_formats[dateFormatCombo->currentItem()];
 
     // Restore screensaver
     QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
     enableScreenSaver << -1 << -1 << -1;
   // 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;
 
 }
 
 void SetDateTime::tzChange( const QString &tz )
 {
     // set the TZ get the time and leave gracefully...
-    QString strSave;
-    strSave = getenv( "TZ" );
+    _oldTimeZone = getenv( "TZ" );
     setenv( "TZ", tz, 1 );
 
     QDate d = QDate::currentDate();
     // reset the time.
-    if ( !strSave.isNull() ) {
-      setenv( "TZ", strSave, 1 );
+    if ( !_oldTimeZone.isNull() ) {
+      setenv( "TZ", _oldTimeZone, 1 );
     }
     dateButton->setDate( d );
     updateSystem();
 }
 
 void SetDateTime::formatChanged(int i)
 {
     dateButton->setDateFormat(date_formats[i]);
 }
 
 static const int ValueAM = 0;
 static const int ValuePM = 1;
 
 
 
 SetTime::SetTime( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
     clock = new QTimer(this, "clock" );
     connect(clock, SIGNAL( timeout() ), SLOT(slotClockTick()) );
     clock->start( 1000 * 60 );
     
     use12hourTime = FALSE;
 
     _time = QDateTime::currentDateTime();
     hour = _time.time().hour();
     minute = _time.time().minute();
 
     QHBoxLayout *hb2 = new QHBoxLayout( this );
     hb2->setSpacing( 3 );
 
     QLabel *l = new QLabel( tr("Hour"), this );
     //    l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l );
 
     sbHour = new QSpinBox( this );
     sbHour->setMinimumWidth( 30 );
     if(use12hourTime) {
   sbHour->setMinValue(1);
   sbHour->setMaxValue( 12 );
   int show_hour = hour;
   if (hour > 12)
       show_hour -= 12;
   if (show_hour == 0)
       show_hour = 12;
 
   sbHour->setValue( show_hour );
     } else {
   sbHour->setMinValue( 0 );
   sbHour->setMaxValue( 23 );
   sbHour->setValue( hour );
     }
     sbHour->setWrapping(TRUE);
     connect( sbHour, SIGNAL(valueChanged(int)), this, SLOT(hourChanged(int)) );
     hb2->addWidget( sbHour );
 
     hb2->addStretch( 1 );
 
     l = new QLabel( tr("Minute"), this );
     //l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l );
 
     sbMin = new QSpinBox( this );
     sbMin->setMinValue( 0 );
     sbMin->setMaxValue( 59 );
     sbMin->setWrapping(TRUE);
     sbMin->setValue( minute );
     sbMin->setMinimumWidth( 30 );
     connect( sbMin, SIGNAL(valueChanged(int)), this, SLOT(minuteChanged(int)) );
     hb2->addWidget( sbMin );
 
     hb2->addStretch( 1 );
 
     ampm = new QComboBox( this );
     ampm->insertItem( tr("AM"), ValueAM );
     ampm->insertItem( tr("PM"), ValuePM );
     connect( ampm, SIGNAL(activated(int)), this, SLOT(checkedPM(int)) );
     hb2->addWidget( ampm );
 
     hb2->addStretch( 1 );
 
 }
 
 QTime SetTime::time() const
 {
     return QTime( hour, minute, 0 );
 }
 
 void SetTime::hourChanged( int value )
 {
     if(use12hourTime) {
   int realhour = value;
   if (realhour == 12)
       realhour = 0;
   if (ampm->currentItem() == ValuePM )
       realhour += 12;
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 3c3a162..58d1006 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -1,102 +1,102 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef SYSTEM_TIME_H
 #define SYSTEM_TIME_H
 
 
 #include <qdatetime.h>
 #include <qdialog.h>
 
 #include <qpe/timestring.h>
 #include "ntpbase.h"
 
 class QToolButton;
 class QSpinBox;
 class QLabel;
 class TimeZoneSelector;
 class DateBookMonth;
 class QComboBox;
 
 class SetTime : public QWidget
 {
     Q_OBJECT
 public:
     SetTime( QWidget *parent=0, const char *name=0 );
 
     QTime time() const;
     void setTime( QDateTime );
 
 public slots:
     void slotTzChange( const QString& tz );
     void show12hourTime( int );
 
 protected slots:
     void slotClockTick();
     void hourChanged( int value );
     void minuteChanged( int value );
 
     void checkedPM( int );
 
 protected:
     int hour;
     int minute;
     bool use12hourTime;
     QDateTime _time;
     QTimer  *clock;
     QComboBox *ampm;
     QSpinBox *sbHour;
     QSpinBox *sbMin;
 };
 
 class DateButton;
 
 class SetDateTime : public NtpBase
 {
     Q_OBJECT
 public:
     SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 );
     ~SetDateTime();
 
 protected slots:
                 void commitTime();
     void tzChange( const QString &tz );
     void formatChanged(int);
                 void updateSystem();
 
 protected:
            void  setTime(QDateTime dt);
     void writeSettings();
 
     SetTime *timeButton;
     DateButton *dateButton;
     TimeZoneSelector *tz;
+    QString _oldTimeZone;
     QComboBox *weekStartCombo;
     QComboBox *ampmCombo;
     QComboBox *dateFormatCombo;
     QComboBox *clockAppletCombo;
     QPushButton *ButtonSetTime;
-   // QLabel *TextLabelMainPredTime;
 
     DateFormat date_formats[4];
 };
 
 
 #endif