first try to revert timezones on reject...

... not working i am too stupid ;)

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
@@ -394,33 +394,42 @@ void Ntp::showAdvancedFeatures(bool advMode)
     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,47 +1,48 @@
 #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);
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
@@ -35,49 +35,49 @@
 #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" );
@@ -297,56 +297,55 @@ void SetDateTime::updateSystem()
     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;
 
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
@@ -66,37 +66,37 @@ protected:
 };
 
 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