author | harlekin <harlekin> | 2003-02-11 18:37:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-11 18:37:03 (UTC) |
commit | cb85b004afe2750733cef1663961539f6a3968e6 (patch) (unidiff) | |
tree | 6084bf1fb78375325938f96077e0faa03ece955f | |
parent | ec6795c6a15a3b9f4721b628d48366097da9c903 (diff) | |
download | opie-cb85b004afe2750733cef1663961539f6a3968e6.zip opie-cb85b004afe2750733cef1663961539f6a3968e6.tar.gz opie-cb85b004afe2750733cef1663961539f6a3968e6.tar.bz2 |
fix bug #644, ampm vs 24 h handling
-rw-r--r-- | core/settings/citytime/citytime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp index 5dc9b02..b359ae1 100644 --- a/core/settings/citytime/citytime.cpp +++ b/core/settings/citytime/citytime.cpp | |||
@@ -46,13 +46,15 @@ CityTime::CityTime( QWidget *parent, const char* name, | |||
46 | WFlags fl ) | 46 | WFlags fl ) |
47 | : CityTimeBase( parent, name, fl ), | 47 | : CityTimeBase( parent, name, fl ), |
48 | strRealTz(0), | 48 | strRealTz(0), |
49 | bAdded(false) | 49 | bAdded(false) |
50 | { | 50 | { |
51 | Config config( "qpe" ); | 51 | Config config( "qpe" ); |
52 | config.setGroup( "Time" ); | ||
52 | bWhichClock = config.readBoolEntry( "AMPM", TRUE ); | 53 | bWhichClock = config.readBoolEntry( "AMPM", TRUE ); |
54 | qDebug( QString("%1").arg(bWhichClock) ); | ||
53 | frmMap->changeClock( bWhichClock ); | 55 | frmMap->changeClock( bWhichClock ); |
54 | 56 | ||
55 | char *pEnv; | 57 | char *pEnv; |
56 | pEnv = NULL; | 58 | pEnv = NULL; |
57 | pEnv = getenv("TZ"); | 59 | pEnv = getenv("TZ"); |
58 | if ( pEnv ) | 60 | if ( pEnv ) |
@@ -180,13 +182,13 @@ void CityTime::showTime( void ) | |||
180 | QListIterator<QLabel> itTime(listTimes); | 182 | QListIterator<QLabel> itTime(listTimes); |
181 | 183 | ||
182 | // traverse the list... | 184 | // traverse the list... |
183 | for ( i = 0, itTime.toFirst(); i < CITIES; i++, ++itTime) { | 185 | for ( i = 0, itTime.toFirst(); i < CITIES; i++, ++itTime) { |
184 | if ( !strCityTz[i].isNull() ) { | 186 | if ( !strCityTz[i].isNull() ) { |
185 | if ( setenv( "TZ", strCityTz[i], true ) == 0 ) { | 187 | if ( setenv( "TZ", strCityTz[i], true ) == 0 ) { |
186 | itTime.current()->setText( TimeString::shortTime(bWhichClock) ); | 188 | itTime.current()->setText( TimeString::shortTime( bWhichClock ) ); |
187 | } else { | 189 | } else { |
188 | QMessageBox::critical( this, tr( "Time Changing" ), | 190 | QMessageBox::critical( this, tr( "Time Changing" ), |
189 | tr( "There was a problem setting timezone %1" ) | 191 | tr( "There was a problem setting timezone %1" ) |
190 | .arg( QString::number( i + 1 ) ) ); | 192 | .arg( QString::number( i + 1 ) ) ); |
191 | } | 193 | } |
192 | } | 194 | } |