author | tille <tille> | 2002-11-16 17:42:37 (UTC) |
---|---|---|
committer | tille <tille> | 2002-11-16 17:42:37 (UTC) |
commit | 0861a25d4f28be8a3ba794eafca9f29eac3cc7c1 (patch) (side-by-side diff) | |
tree | 0e78a2019fa62f803f6d61683b0daaeb4e810fd7 | |
parent | 55f437bb3caaeec328bce4e2d00818780f1b4aa2 (diff) | |
download | opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.zip opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.tar.gz opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.tar.bz2 |
first try to revert timezones on reject...
... not working i am too stupid ;)
-rw-r--r-- | noncore/settings/netsystemtime/TODO | 1 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 11 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntp.h | 1 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/settime.h | 2 |
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 @@ -416,5 +416,5 @@ void Ntp::showAdvancedFeatures(bool advMode) void Ntp::accept( ){ - qDebug("accepted"); + qDebug("saving"); //SetTimeDate commitTime(); @@ -424,3 +424,12 @@ void Ntp::accept( ){ 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 @@ -22,4 +22,5 @@ public slots: protected: virtual void accept( ); + virtual void reject( ); QDateTime predictedTime; void makeChannel(); 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 @@ -57,5 +57,5 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) { setCaption( tr("System Time") ); - + _oldTimeZone=""; QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); @@ -319,12 +319,11 @@ 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 ); 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 @@ -88,4 +88,5 @@ protected: DateButton *dateButton; TimeZoneSelector *tz; + QString _oldTimeZone; QComboBox *weekStartCombo; QComboBox *ampmCombo; @@ -93,5 +94,4 @@ protected: QComboBox *clockAppletCombo; QPushButton *ButtonSetTime; - // QLabel *TextLabelMainPredTime; DateFormat date_formats[4]; |