summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/TODO1
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp11
-rw-r--r--noncore/settings/netsystemtime/ntp.h1
-rw-r--r--noncore/settings/netsystemtime/settime.cpp9
-rw-r--r--noncore/settings/netsystemtime/settime.h2
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,2 +1 @@
1- handle hour > 24 in SetTime::slotClockTick
2- improve tz setting - improve tz setting
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
@@ -417,3 +417,3 @@ void Ntp::showAdvancedFeatures(bool advMode)
417void Ntp::accept( ){ 417void Ntp::accept( ){
418 qDebug("accepted"); 418 qDebug("saving");
419 //SetTimeDate 419 //SetTimeDate
@@ -426 +426,10 @@ void Ntp::accept( ){
426} \ No newline at end of file 426} \ No newline at end of file
427
428void Ntp::reject( ){
429 qDebug("_oldTimeZone %s",_oldTimeZone.latin1());
430 if (!_oldTimeZone.isEmpty()){
431 qDebug("reverting timezone");
432 tzChange(_oldTimeZone);
433 commitTime();
434 }
435} \ 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
@@ -23,2 +23,3 @@ protected:
23 virtual void accept( ); 23 virtual void accept( );
24 virtual void reject( );
24 QDateTime predictedTime; 25 QDateTime predictedTime;
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
@@ -58,3 +58,3 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
58 setCaption( tr("System Time") ); 58 setCaption( tr("System Time") );
59 59 _oldTimeZone="";
60 QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); 60 QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 );
@@ -320,4 +320,3 @@ void SetDateTime::tzChange( const QString &tz )
320 // set the TZ get the time and leave gracefully... 320 // set the TZ get the time and leave gracefully...
321 QString strSave; 321 _oldTimeZone = getenv( "TZ" );
322 strSave = getenv( "TZ" );
323 setenv( "TZ", tz, 1 ); 322 setenv( "TZ", tz, 1 );
@@ -326,4 +325,4 @@ void SetDateTime::tzChange( const QString &tz )
326 // reset the time. 325 // reset the time.
327 if ( !strSave.isNull() ) { 326 if ( !_oldTimeZone.isNull() ) {
328 setenv( "TZ", strSave, 1 ); 327 setenv( "TZ", _oldTimeZone, 1 );
329 } 328 }
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
@@ -89,2 +89,3 @@ protected:
89 TimeZoneSelector *tz; 89 TimeZoneSelector *tz;
90 QString _oldTimeZone;
90 QComboBox *weekStartCombo; 91 QComboBox *weekStartCombo;
@@ -94,3 +95,2 @@ protected:
94 QPushButton *ButtonSetTime; 95 QPushButton *ButtonSetTime;
95 // QLabel *TextLabelMainPredTime;
96 96