| -rw-r--r-- | library/tzselect.cpp | 125 |
1 files changed, 63 insertions, 62 deletions
diff --git a/library/tzselect.cpp b/library/tzselect.cpp index 6cc0bea..e16b8d4 100644 --- a/library/tzselect.cpp +++ b/library/tzselect.cpp @@ -41,43 +41,43 @@ public: TZCombo::TZCombo( QWidget *p, const char* n ) : QComboBox( p, n ) { updateZones(); // check to see if TZ is set, if it is set the current item to that QString tz = getenv("TZ"); if (parent()->inherits("TimeZoneSelector")) { - if ( ((TimeZoneSelector *)parent())->localIncluded() ) { - // overide to the 'local' type. - tz = "None"; - } + if ( ((TimeZoneSelector *)parent())->localIncluded() ) { + // overide to the 'local' type. + tz = "None"; + } } if ( !tz.isNull() ) { - int n = 0, + int n = 0, index = 0; for ( QStringList::Iterator it=identifiers.begin(); - it!=identifiers.end(); ++it) { - if ( *it == tz ) - index = n; - n++; - } - setCurrentItem(index); + it!=identifiers.end(); ++it) { + if ( *it == tz ) + index = n; + n++; + } + setCurrentItem(index); } else { - setCurrentItem(0); + setCurrentItem(0); } // listen on QPE/System #if defined(Q_WS_QWS) #if !defined(QT_NO_COP) QCopChannel *channel = new QCopChannel( "QPE/System", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(handleSystemChannel(const QCString&, const QByteArray&)) ); + this, SLOT(handleSystemChannel(const QCString&, const QByteArray&)) ); #endif #endif } TZCombo::~TZCombo() { @@ -90,69 +90,69 @@ void TZCombo::updateZones() identifiers.clear(); int curix=0; QString tz = getenv("TZ"); bool tzFound = FALSE; Config cfg("WorldTime"); cfg.setGroup("TimeZones"); int listIndex = 0; if (parent()->inherits("TimeZoneSelector")) { - if ( ((TimeZoneSelector *)parent())->localIncluded() ) { - // overide to the 'local' type. - identifiers.append( "None" ); - insertItem( tr("None") ); - if ( cur == tr("None")) - curix = 0; - listIndex++; - } + if ( ((TimeZoneSelector *)parent())->localIncluded() ) { + // overide to the 'local' type. + identifiers.append( "None" ); + insertItem( tr("None") ); + if ( cur == tr("None")) + curix = 0; + listIndex++; + } } int cfgIndex = 0; while (1) { - QString zn = cfg.readEntry("Zone"+QString::number(cfgIndex), QString::null); - if ( zn.isNull() ) - break; - if ( zn == tz ) - tzFound = TRUE; - QString nm = cfg.readEntry("ZoneName"+QString::number(cfgIndex)); - identifiers.append(zn); - insertItem(nm); - if ( nm == cur ) - curix = listIndex; - ++cfgIndex; - ++listIndex; + QString zn = cfg.readEntry("Zone"+QString::number(cfgIndex), QString::null); + if ( zn.isNull() ) + break; + if ( zn == tz ) + tzFound = TRUE; + QString nm = cfg.readEntry("ZoneName"+QString::number(cfgIndex)); + identifiers.append(zn); + insertItem(nm); + if ( nm == cur ) + curix = listIndex; + ++cfgIndex; + ++listIndex; } if ( !listIndex ) { QStringList list = timezoneDefaults(); for ( QStringList::Iterator it = list.begin(); it!=list.end(); ++it ) { - QString zn = *it; - QString nm = *++it; - if ( zn == tz ) - tzFound = TRUE; - if ( nm == cur ) - curix = listIndex; + QString zn = *it; + QString nm = *++it; + if ( zn == tz ) + tzFound = TRUE; + if ( nm == cur ) + curix = listIndex; identifiers.append(zn); insertItem(nm); - ++listIndex; + ++listIndex; } } for (QStringList::Iterator it=extras.begin(); it!=extras.end(); ++it) { - insertItem(*it); - identifiers.append(*it); - if ( *it == cur ) - curix = listIndex; - ++listIndex; + insertItem(*it); + identifiers.append(*it); + if ( *it == cur ) + curix = listIndex; + ++listIndex; } if ( !tzFound && !tz.isEmpty()) { - int i = tz.find( '/' ); - QString nm = tz.mid( i+1 ).replace(QRegExp("_"), " "); - identifiers.append(tz); - insertItem(nm); - if ( nm == cur ) - curix = listIndex; - ++listIndex; + int i = tz.find( '/' ); + QString nm = tz.mid( i+1 ).replace(QRegExp("_"), " "); + identifiers.append(tz); + insertItem(nm); + if ( nm == cur ) + curix = listIndex; + ++listIndex; } setCurrentItem(curix); } void TZCombo::keyPressEvent( QKeyEvent *e ) { // ### should popup() in Qt 3.0 (it's virtual there) @@ -170,33 +170,33 @@ void TZCombo::mousePressEvent(QMouseEvent*e) QString TZCombo::currZone() const { return identifiers[currentItem()]; } void TZCombo::setCurrZone( const QString& id ) { for (int i=0; i< count(); i++) { - if ( identifiers[i] == id ) { - setCurrentItem(i); - return; - } + if ( identifiers[i] == id ) { + setCurrentItem(i); + return; +} } insertItem(id); setCurrentItem( count() - 1); identifiers.append(id); extras.append(id); } void TZCombo::handleSystemChannel(const QCString&msg, const QByteArray&) { if ( msg == "timeZoneListChange()" ) { - updateZones(); + updateZones(); } } TimeZoneSelector::TimeZoneSelector(QWidget* p, const char* n) : QHBox(p,n) { d = new TimeZoneSelectorPrivate(); @@ -244,31 +244,32 @@ void TimeZoneSelector::setCurrentZone( const QString& id ) void TimeZoneSelector::slotTzActive( int ) { emit signalNewTz( cmbTz->currZone() ); } void TimeZoneSelector::slotExecute( void ) { // execute the world time application... - Global::execute( "worldtime" ); + Global::execute( "citytime" ); } QStringList timezoneDefaults( void ) { QStringList tzs; // load up the list just like the file format (citytime.cpp) tzs.append( "America/New_York" ); tzs.append( "New York" ); tzs.append( "America/Los_Angeles" ); tzs.append( "Los Angeles" ); tzs.append( "Australia/Brisbane" ); tzs.append( "Brisbane" ); - tzs.append( "Europe/Oslo" ); - tzs.append( "Oslo" ); + tzs.append( "Europe/Berlin" ); + tzs.append( "Berlin" ); tzs.append( "Asia/Tokyo" ); tzs.append( "Tokyo" ); - tzs.append( "Asia/Hong_Kong" ); - tzs.append( "Hong Kong" ); + tzs.append( "America/Denver" ); + tzs.append( "Denver" ); + return tzs; } |