author | harlekin <harlekin> | 2003-02-11 18:37:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-11 18:37:03 (UTC) |
commit | cb85b004afe2750733cef1663961539f6a3968e6 (patch) (side-by-side diff) | |
tree | 6084bf1fb78375325938f96077e0faa03ece955f /core/settings/citytime | |
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 @@ -40,25 +40,27 @@ #include <qtoolbutton.h> #include <qlayout.h> #include <stdlib.h> CityTime::CityTime( QWidget *parent, const char* name, WFlags fl ) : CityTimeBase( parent, name, fl ), strRealTz(0), bAdded(false) { Config config( "qpe" ); + config.setGroup( "Time" ); bWhichClock = config.readBoolEntry( "AMPM", TRUE ); + qDebug( QString("%1").arg(bWhichClock) ); frmMap->changeClock( bWhichClock ); char *pEnv; pEnv = NULL; pEnv = getenv("TZ"); if ( pEnv ) strRealTz = pEnv; pEnv = NULL; pEnv = getenv("HOME"); if ( pEnv ) strHome = pEnv; // append the labels to their respective lists... @@ -174,25 +176,25 @@ void CityTime::mousePressEvent( QMouseEvent * ) // frmMap->showZones(); } void CityTime::showTime( void ) { int i; QListIterator<QLabel> itTime(listTimes); // traverse the list... for ( i = 0, itTime.toFirst(); i < CITIES; i++, ++itTime) { if ( !strCityTz[i].isNull() ) { if ( setenv( "TZ", strCityTz[i], true ) == 0 ) { - itTime.current()->setText( TimeString::shortTime(bWhichClock) ); + itTime.current()->setText( TimeString::shortTime( bWhichClock ) ); } else { QMessageBox::critical( this, tr( "Time Changing" ), tr( "There was a problem setting timezone %1" ) .arg( QString::number( i + 1 ) ) ); } } } // done playing around... put it all back unsetenv( "TZ" ); if ( !strRealTz.isNull() ) { if ( setenv( "TZ", strRealTz, true ) != 0 ) { QMessageBox::critical( this, tr( "Restore Time Zone" ), |