summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-09-22 18:24:12 (UTC)
committer llornkcor <llornkcor>2002-09-22 18:24:12 (UTC)
commitf8aeb3c2e6b32600329ebbaeb0b4b7a2f371eca2 (patch) (side-by-side diff)
tree216d939631c0ebd8319c6e9564d5d4a69a1b06d2
parent7d8e7e3dba1a42864560c4b493e3f35f6bcb9660 (diff)
downloadopie-f8aeb3c2e6b32600329ebbaeb0b4b7a2f371eca2.zip
opie-f8aeb3c2e6b32600329ebbaeb0b4b7a2f371eca2.tar.gz
opie-f8aeb3c2e6b32600329ebbaeb0b4b7a2f371eca2.tar.bz2
opie uses citytime, not worldtime, and changed tz to more opie specific
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/tzselect.cpp125
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
@@ -48,19 +48,19 @@ TZCombo::TZCombo( QWidget *p, const char* n )
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);
}
@@ -74,3 +74,3 @@ TZCombo::TZCombo( QWidget *p, const char* n )
connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
- this, SLOT(handleSystemChannel(const QCString&, const QByteArray&)) );
+ this, SLOT(handleSystemChannel(const QCString&, const QByteArray&)) );
#endif
@@ -97,10 +97,10 @@ void TZCombo::updateZones()
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++;
+ }
}
@@ -108,14 +108,14 @@ void TZCombo::updateZones()
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;
}
@@ -124,11 +124,11 @@ void TZCombo::updateZones()
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;
}
@@ -136,16 +136,16 @@ void TZCombo::updateZones()
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;
}
@@ -177,6 +177,6 @@ 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;
+}
}
@@ -193,3 +193,3 @@ void TZCombo::handleSystemChannel(const QCString&msg, const QByteArray&)
if ( msg == "timeZoneListChange()" ) {
- updateZones();
+ updateZones();
}
@@ -251,3 +251,3 @@ void TimeZoneSelector::slotExecute( void )
// execute the world time application...
- Global::execute( "worldtime" );
+ Global::execute( "citytime" );
}
@@ -264,8 +264,9 @@ QStringList timezoneDefaults( void )
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;