summaryrefslogtreecommitdiff
path: root/core/settings/citytime
Side-by-side diff
Diffstat (limited to 'core/settings/citytime') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/citytime/citytime.cpp94
-rw-r--r--core/settings/citytime/citytimebase.cpp120
-rw-r--r--core/settings/citytime/zonemap.cpp402
3 files changed, 314 insertions, 302 deletions
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp
index 721285d..d73bda1 100644
--- a/core/settings/citytime/citytime.cpp
+++ b/core/settings/citytime/citytime.cpp
@@ -25,2 +25,3 @@
+/* OPIE */
#include <qpe/qpeapplication.h>
@@ -31,3 +32,5 @@
#endif
+#include <opie2/odebug.h>
+/* QT */
#include <qlabel.h>
@@ -37,2 +40,3 @@
+/* STD */
#include <stdlib.h>
@@ -48,3 +52,3 @@ CityTime::CityTime( QWidget *parent, const char* name,
bWhichClock = config.readBoolEntry( "AMPM", TRUE );
- qDebug( QString("%1").arg(bWhichClock) );
+ odebug << QString("%1").arg(bWhichClock) << oendl;
frmMap->changeClock( bWhichClock );
@@ -120,29 +124,29 @@ CityTime::~CityTime()
if ( changed ) {
- Config cfg("CityTime");
- cfg.setGroup("TimeZones");
- QListIterator<QToolButton> itCity( listCities );
- int i;
- bool realTzWritten = FALSE;
- for ( i = 0, itCity.toFirst(); i < CITIES; i++, ++itCity ) {
- if ( !strCityTz[i].isNull() ) {
- cfg.writeEntry("Zone"+QString::number(i), strCityTz[i]);
- cfg.writeEntry("ZoneName"+QString::number(i), itCity.current()->text());
- if ( strCityTz[i] == strRealTz )
- realTzWritten = TRUE;
- }
- }
- if ( realTzWritten ) {
- cfg.removeEntry("Zone"+QString::number(CITIES));
- cfg.removeEntry("ZoneName"+QString::number(CITIES));
- } else {
- cfg.writeEntry("Zone"+QString::number(CITIES), strRealTz);
- if ( nameRealTz.isEmpty() ) {
- int i = strRealTz.find( '/' );
- nameRealTz = strRealTz.mid( i+1 );
- }
- cfg.writeEntry("ZoneName"+QString::number(CITIES), nameRealTz);
- }
- QCopEnvelope ( "QPE/System", "timeZoneListChange()" );
+ Config cfg("CityTime");
+ cfg.setGroup("TimeZones");
+ QListIterator<QToolButton> itCity( listCities );
+ int i;
+ bool realTzWritten = FALSE;
+ for ( i = 0, itCity.toFirst(); i < CITIES; i++, ++itCity ) {
+ if ( !strCityTz[i].isNull() ) {
+ cfg.writeEntry("Zone"+QString::number(i), strCityTz[i]);
+ cfg.writeEntry("ZoneName"+QString::number(i), itCity.current()->text());
+ if ( strCityTz[i] == strRealTz )
+ realTzWritten = TRUE;
+ }
+ }
+ if ( realTzWritten ) {
+ cfg.removeEntry("Zone"+QString::number(CITIES));
+ cfg.removeEntry("ZoneName"+QString::number(CITIES));
+ } else {
+ cfg.writeEntry("Zone"+QString::number(CITIES), strRealTz);
+ if ( nameRealTz.isEmpty() ) {
+ int i = strRealTz.find( '/' );
+ nameRealTz = strRealTz.mid( i+1 );
+ }
+ cfg.writeEntry("ZoneName"+QString::number(CITIES), nameRealTz);
+ }
+ QCopEnvelope ( "QPE/System", "timeZoneListChange()" );
- changed = FALSE;
+ changed = FALSE;
}
@@ -160,3 +164,3 @@ void CityTime::timerEvent( QTimerEvent *e )
if ( e )
- killTimer( timerId );
+ killTimer( timerId );
// change the time again!!
@@ -182,3 +186,3 @@ void CityTime::showTime( void )
if ( setenv( "TZ", strCityTz[i], true ) == 0 ) {
- itTime.current()->setText( TimeString::shortTime( bWhichClock ) );
+ itTime.current()->setText( TimeString::shortTime( bWhichClock ) );
} else {
@@ -225,3 +229,3 @@ void CityTime::slotNewTz( const QString & strNewCountry,
// that is ever pressed!
- changed = TRUE;
+ changed = TRUE;
break;
@@ -243,11 +247,11 @@ void CityTime::readInTimes( void )
for ( ; i < CITIES ; i++ ) {
- zn = cfg.readEntry("Zone"+QString::number(i), QString::null);
- if ( zn.isNull() )
- break;
- QString nm = cfg.readEntry("ZoneName"+QString::number(i));
- strCityTz[i] = zn;
- itCity.current()->setText(nm);
- if ( zn == strRealTz )
- nameRealTz = nm;
- ++itCity;
+ zn = cfg.readEntry("Zone"+QString::number(i), QString::null);
+ if ( zn.isNull() )
+ break;
+ QString nm = cfg.readEntry("ZoneName"+QString::number(i));
+ strCityTz[i] = zn;
+ itCity.current()->setText(nm);
+ if ( zn == strRealTz )
+ nameRealTz = nm;
+ ++itCity;
}
@@ -265,8 +269,8 @@ void CityTime::readInTimes( void )
if ( nameRealTz.isEmpty() ) {
- //remember the current time zone even if we don't have room
- //to show it.
- zn = cfg.readEntry("Zone"+QString::number(CITIES), QString::null);
- if ( zn == strRealTz )
- nameRealTz = cfg.readEntry("ZoneName"+QString::number(CITIES));
- i++;
+ //remember the current time zone even if we don't have room
+ //to show it.
+ zn = cfg.readEntry("Zone"+QString::number(CITIES), QString::null);
+ if ( zn == strRealTz )
+ nameRealTz = cfg.readEntry("ZoneName"+QString::number(CITIES));
+ i++;
}
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp
index 323929b..77cb91d 100644
--- a/core/settings/citytime/citytimebase.cpp
+++ b/core/settings/citytime/citytimebase.cpp
@@ -5,6 +5,10 @@
#include "citytimebase.h"
+#include "zonemap.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+/* QT */
#include <qlabel.h>
#include <qtoolbutton.h>
-#include "zonemap.h"
#include <qlayout.h>
@@ -21,3 +25,3 @@ CityTimeBase::CityTimeBase( QWidget* parent, const char* name, WFlags )
if ( !name )
- setName( "CityTimeBase" );
+ setName( "CityTimeBase" );
setCaption( tr( "City Time" ) );
@@ -343,56 +347,56 @@ bool CityTimeBase::event( QEvent* ev )
if ( ev->type() == QEvent::ApplicationFontChange ) {
- QFont cmdCity7_font( cmdCity7->font() );
- cmdCity7_font.setBold( TRUE );
- cmdCity7->setFont( cmdCity7_font );
- QFont lblCTime9_font( lblCTime9->font() );
- lblCTime9_font.setPointSize( 10 );
- lblCTime9->setFont( lblCTime9_font );
- QFont cmdCity8_font( cmdCity8->font() );
- cmdCity8_font.setBold( TRUE );
- cmdCity8->setFont( cmdCity8_font );
- QFont cmdCity2_font( cmdCity2->font() );
- cmdCity2_font.setBold( TRUE );
- cmdCity2->setFont( cmdCity2_font );
- QFont lblCTime6_font( lblCTime6->font() );
- lblCTime6_font.setPointSize( 10 );
- lblCTime6->setFont( lblCTime6_font );
- QFont cmdCity6_font( cmdCity6->font() );
- cmdCity6_font.setBold( TRUE );
- cmdCity6->setFont( cmdCity6_font );
- QFont cmdCity4_font( cmdCity4->font() );
- cmdCity4_font.setBold( TRUE );
- cmdCity4->setFont( cmdCity4_font );
- QFont lblCTime5_font( lblCTime5->font() );
- lblCTime5_font.setPointSize( 10 );
- lblCTime5->setFont( lblCTime5_font );
- QFont lblCTime2_font( lblCTime2->font() );
- lblCTime2_font.setPointSize( 10 );
- lblCTime2->setFont( lblCTime2_font );
- QFont lblCTime1_font( lblCTime1->font() );
- lblCTime1_font.setPointSize( 10 );
- lblCTime1->setFont( lblCTime1_font );
- QFont cmdCity3_font( cmdCity3->font() );
- cmdCity3_font.setBold( TRUE );
- cmdCity3->setFont( cmdCity3_font );
- QFont lblCTime8_font( lblCTime8->font() );
- lblCTime8_font.setPointSize( 10 );
- lblCTime8->setFont( lblCTime8_font );
- QFont cmdCity1_font( cmdCity1->font() );
- cmdCity1_font.setBold( TRUE );
- cmdCity1->setFont( cmdCity1_font );
- QFont lblCTime7_font( lblCTime7->font() );
- lblCTime7_font.setPointSize( 10 );
- lblCTime7->setFont( lblCTime7_font );
- QFont lblCTime4_font( lblCTime4->font() );
- lblCTime4_font.setPointSize( 10 );
- lblCTime4->setFont( lblCTime4_font );
- QFont cmdCity5_font( cmdCity5->font() );
- cmdCity5_font.setBold( TRUE );
- cmdCity5->setFont( cmdCity5_font );
- QFont lblCTime3_font( lblCTime3->font() );
- lblCTime3_font.setPointSize( 10 );
- lblCTime3->setFont( lblCTime3_font );
- QFont cmdCity9_font( cmdCity9->font() );
- cmdCity9_font.setBold( TRUE );
- cmdCity9->setFont( cmdCity9_font );
+ QFont cmdCity7_font( cmdCity7->font() );
+ cmdCity7_font.setBold( TRUE );
+ cmdCity7->setFont( cmdCity7_font );
+ QFont lblCTime9_font( lblCTime9->font() );
+ lblCTime9_font.setPointSize( 10 );
+ lblCTime9->setFont( lblCTime9_font );
+ QFont cmdCity8_font( cmdCity8->font() );
+ cmdCity8_font.setBold( TRUE );
+ cmdCity8->setFont( cmdCity8_font );
+ QFont cmdCity2_font( cmdCity2->font() );
+ cmdCity2_font.setBold( TRUE );
+ cmdCity2->setFont( cmdCity2_font );
+ QFont lblCTime6_font( lblCTime6->font() );
+ lblCTime6_font.setPointSize( 10 );
+ lblCTime6->setFont( lblCTime6_font );
+ QFont cmdCity6_font( cmdCity6->font() );
+ cmdCity6_font.setBold( TRUE );
+ cmdCity6->setFont( cmdCity6_font );
+ QFont cmdCity4_font( cmdCity4->font() );
+ cmdCity4_font.setBold( TRUE );
+ cmdCity4->setFont( cmdCity4_font );
+ QFont lblCTime5_font( lblCTime5->font() );
+ lblCTime5_font.setPointSize( 10 );
+ lblCTime5->setFont( lblCTime5_font );
+ QFont lblCTime2_font( lblCTime2->font() );
+ lblCTime2_font.setPointSize( 10 );
+ lblCTime2->setFont( lblCTime2_font );
+ QFont lblCTime1_font( lblCTime1->font() );
+ lblCTime1_font.setPointSize( 10 );
+ lblCTime1->setFont( lblCTime1_font );
+ QFont cmdCity3_font( cmdCity3->font() );
+ cmdCity3_font.setBold( TRUE );
+ cmdCity3->setFont( cmdCity3_font );
+ QFont lblCTime8_font( lblCTime8->font() );
+ lblCTime8_font.setPointSize( 10 );
+ lblCTime8->setFont( lblCTime8_font );
+ QFont cmdCity1_font( cmdCity1->font() );
+ cmdCity1_font.setBold( TRUE );
+ cmdCity1->setFont( cmdCity1_font );
+ QFont lblCTime7_font( lblCTime7->font() );
+ lblCTime7_font.setPointSize( 10 );
+ lblCTime7->setFont( lblCTime7_font );
+ QFont lblCTime4_font( lblCTime4->font() );
+ lblCTime4_font.setPointSize( 10 );
+ lblCTime4->setFont( lblCTime4_font );
+ QFont cmdCity5_font( cmdCity5->font() );
+ cmdCity5_font.setBold( TRUE );
+ cmdCity5->setFont( cmdCity5_font );
+ QFont lblCTime3_font( lblCTime3->font() );
+ lblCTime3_font.setPointSize( 10 );
+ lblCTime3->setFont( lblCTime3_font );
+ QFont cmdCity9_font( cmdCity9->font() );
+ cmdCity9_font.setBold( TRUE );
+ cmdCity9->setFont( cmdCity9_font );
}
@@ -403,3 +407,3 @@ void CityTimeBase::beginNewTz()
{
- qWarning( "CityTimeBase::beginNewTz(): Not implemented yet!" );
+ owarn << "CityTimeBase::beginNewTz(): Not implemented yet!" << oendl;
}
@@ -408,3 +412,3 @@ void CityTimeBase::slotNewTz(const QString &, const QString &)
{
- qWarning( "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" );
+ owarn << "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" << oendl;
}
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index b6843d2..e4a25ef 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -25,5 +25,8 @@
+/* OPIE */
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qfile.h>
@@ -39,2 +42,3 @@
+/* STD */
#include <limits.h>
@@ -63,3 +67,3 @@ ZoneField::ZoneField( const QString& strLine )
// make a bunch of RegExp's to match the data from the line
- QRegExp regCoord( "[-+][0-9]+" ); // the latitude
+ QRegExp regCoord( "[-+][0-9]+" ); // the latitude
QRegExp regCountry( "[A-Za-z]+/" ); // the country (not good enough)
@@ -68,3 +72,3 @@ ZoneField::ZoneField( const QString& strLine )
int iStart,
- iStop,
+ iStop,
iLen,
@@ -77,21 +81,21 @@ ZoneField::ZoneField( const QString& strLine )
if ( iStart >= 0 ) {
- strTmp = strLine.mid( iStart, iLen );
- tmp = strTmp.toInt();
- // okay, there are two versions of the format, make a decision based on
- // the size...
- // Oh BTW, we are storing everything in seconds!
- if ( iLen < 7 ) {
- _y = tmp / 100;
- _y *= 60;
- _y += tmp % 100;
- _y *= 60;
- } else {
- _y = tmp / 10000;
- _y *= 60;
- tmp %= 10000;
- _y += tmp / 100;
- _y *= 60;
- tmp %= 100;
- _y += tmp;
- }
+ strTmp = strLine.mid( iStart, iLen );
+ tmp = strTmp.toInt();
+ // okay, there are two versions of the format, make a decision based on
+ // the size...
+ // Oh BTW, we are storing everything in seconds!
+ if ( iLen < 7 ) {
+ _y = tmp / 100;
+ _y *= 60;
+ _y += tmp % 100;
+ _y *= 60;
+ } else {
+ _y = tmp / 10000;
+ _y *= 60;
+ tmp %= 10000;
+ _y += tmp / 100;
+ _y *= 60;
+ tmp %= 100;
+ _y += tmp;
+ }
}
@@ -99,18 +103,18 @@ ZoneField::ZoneField( const QString& strLine )
if ( iStart >= 0 ) {
- strTmp = strLine.mid( iStart, iLen );
- tmp = strTmp.toInt();
- if ( iLen < 8 ) {
- _x = tmp / 100;
- _x *= 60;
- _x += tmp % 100;
- _x *= 60;
- } else {
- _x = tmp / 10000;
- _x *= 60;
- tmp %= 10000;
- _x += tmp / 100;
- _x *= 60;
- tmp %= 100;
- _x += tmp;
- }
+ strTmp = strLine.mid( iStart, iLen );
+ tmp = strTmp.toInt();
+ if ( iLen < 8 ) {
+ _x = tmp / 100;
+ _x *= 60;
+ _x += tmp % 100;
+ _x *= 60;
+ } else {
+ _x = tmp / 10000;
+ _x *= 60;
+ tmp %= 10000;
+ _x += tmp / 100;
+ _x *= 60;
+ tmp %= 100;
+ _x += tmp;
+ }
}
@@ -120,4 +124,4 @@ ZoneField::ZoneField( const QString& strLine )
if ( iStart >= 0 ) {
- iLen = (iStop - iStart) + 1;
- strCountry = strLine.mid( iStart, iLen );
+ iLen = (iStop - iStart) + 1;
+ strCountry = strLine.mid( iStart, iLen );
}
@@ -126,3 +130,3 @@ ZoneField::ZoneField( const QString& strLine )
if ( iStart >= 0 ) {
- strCity = strLine.mid( iStart, iLen );
+ strCity = strLine.mid( iStart, iLen );
}
@@ -132,6 +136,6 @@ void ZoneField::showStructure( void ) const
{
- qDebug( "Country: %s", strCountry.latin1() );
- qDebug( "City: %s", strCity.latin1() );
- qDebug( "x: %d", _x );
- qDebug( "y: %d\n", _y );
+ odebug << "Country: " << strCountry << "" << oendl;
+ odebug << "City: " << strCity << "" << oendl;
+ odebug << "x: " << _x << "" << oendl;
+ odebug << "y: " << _y << "\n" << oendl;
}
@@ -209,17 +213,17 @@ void ZoneMap::readZones( void )
if ( !fZone.open( IO_ReadOnly ) ) {
- QMessageBox::warning (this,
- tr( "Unable to Find Timezone Info" ),
- tr( "<p>Unable to find any timezone information in %1" )
- .arg( strZONEINFO ));
- exit(-1);
+ QMessageBox::warning (this,
+ tr( "Unable to Find Timezone Info" ),
+ tr( "<p>Unable to find any timezone information in %1" )
+ .arg( strZONEINFO ));
+ exit(-1);
} else {
- QTextStream tZone( &fZone );
- while ( !tZone.atEnd() ) {
- QString strLine = tZone.readLine();
- // only pass on lines that aren't comments
- if ( strLine[0] != '#' ) {
- zones.append( new ZoneField( strLine ) );
- }
- }
- fZone.close();
+ QTextStream tZone( &fZone );
+ while ( !tZone.atEnd() ) {
+ QString strLine = tZone.readLine();
+ // only pass on lines that aren't comments
+ if ( strLine[0] != '#' ) {
+ zones.append( new ZoneField( strLine ) );
+ }
+ }
+ fZone.close();
}
@@ -247,4 +251,4 @@ void ZoneMap::viewportMouseReleaseEvent( QMouseEvent* )
if ( pLast != NULL ) {
- emit signalTz( pLast->country(), pLast->city() );
- pLast = NULL;
+ emit signalTz( pLast->country(), pLast->city() );
+ pLast = NULL;
}
@@ -256,29 +260,29 @@ void ZoneMap::keyPressEvent( QKeyEvent *ke )
switch ( ke->key() ) {
- case Key_Left:
- case Key_Right:
- case Key_Up:
- case Key_Down: {
- tHide->stop();
- if ( !cursor )
- slotFindCity( QPoint( contentsWidth(), contentsHeight() ) / 2 );
- ZoneField *city = findCityNear( cursor, ke->key() );
- if ( city ) {
- cursor = city;
- int tmpx, tmpy;
- zoneToWin( cursor->x(), cursor->y(), tmpx, tmpy );
- ensureVisible( tmpx, tmpy );
- showCity( cursor );
- tHide->start( 3000, true );
- }
- }
- break;
-
- case Key_Space:
- case Key_Enter:
- case Key_Return:
- if ( cursor ) {
- emit signalTz( cursor->country(), cursor->city() );
- tHide->start( 0, true );
- }
- break;
+ case Key_Left:
+ case Key_Right:
+ case Key_Up:
+ case Key_Down: {
+ tHide->stop();
+ if ( !cursor )
+ slotFindCity( QPoint( contentsWidth(), contentsHeight() ) / 2 );
+ ZoneField *city = findCityNear( cursor, ke->key() );
+ if ( city ) {
+ cursor = city;
+ int tmpx, tmpy;
+ zoneToWin( cursor->x(), cursor->y(), tmpx, tmpy );
+ ensureVisible( tmpx, tmpy );
+ showCity( cursor );
+ tHide->start( 3000, true );
+ }
+ }
+ break;
+
+ case Key_Space:
+ case Key_Enter:
+ case Key_Return:
+ if ( cursor ) {
+ emit signalTz( cursor->country(), cursor->city() );
+ tHide->start( 0, true );
+ }
+ break;
}
@@ -294,31 +298,31 @@ ZoneField *ZoneMap::findCityNear( ZoneField *city, int key )
for (; it.current(); ++it) {
- pZone = it.current();
- long dx = (pZone->x() - city->x())/100;
- long dy = (pZone->y() - city->y())/100;
- switch ( key ) {
- case Key_Right:
- case Key_Left:
- if ( key == Key_Left )
- dx = -dx;
- if ( dx > 0 ) {
- long dist = QABS(dy)*4 + dx;
- if ( dist < ddist ) {
- ddist = dist;
- pClosest = pZone;
- }
- }
- break;
- case Key_Down:
- case Key_Up:
- if ( key == Key_Down )
- dy = -dy;
- if ( dy > 0 ) {
- long dist = QABS(dx)*4 + dy;
- if ( dist < ddist ) {
- ddist = dist;
- pClosest = pZone;
- }
- }
- break;
- }
+ pZone = it.current();
+ long dx = (pZone->x() - city->x())/100;
+ long dy = (pZone->y() - city->y())/100;
+ switch ( key ) {
+ case Key_Right:
+ case Key_Left:
+ if ( key == Key_Left )
+ dx = -dx;
+ if ( dx > 0 ) {
+ long dist = QABS(dy)*4 + dx;
+ if ( dist < ddist ) {
+ ddist = dist;
+ pClosest = pZone;
+ }
+ }
+ break;
+ case Key_Down:
+ case Key_Up:
+ if ( key == Key_Down )
+ dy = -dy;
+ if ( dy > 0 ) {
+ long dist = QABS(dx)*4 + dy;
+ if ( dist < ddist ) {
+ ddist = dist;
+ pClosest = pZone;
+ }
+ }
+ break;
+ }
}
@@ -353,10 +357,10 @@ void ZoneMap::slotFindCity( const QPoint &pos )
for (; it.current(); ++it) {
- pZone = it.current();
- // use the manhattenLength, a good enough of an appoximation here
- lDistance = QABS( x - pZone->x() ) + QABS( y - pZone->y() );
- // first to zero wins!
- if ( lDistance < lClosest ) {
- lClosest = lDistance;
- pClosest = pZone;
- }
+ pZone = it.current();
+ // use the manhattenLength, a good enough of an appoximation here
+ lDistance = QABS( x - pZone->x() ) + QABS( y - pZone->y() );
+ // first to zero wins!
+ if ( lDistance < lClosest ) {
+ lClosest = lDistance;
+ pClosest = pZone;
+ }
}
@@ -365,4 +369,4 @@ void ZoneMap::slotFindCity( const QPoint &pos )
if ( lClosest <= iTHRESHOLD ) {
- showCity( pClosest );
- cursor = pClosest;
+ showCity( pClosest );
+ cursor = pClosest;
}
@@ -383,3 +387,3 @@ void ZoneMap::showCity( ZoneField *city )
if ( p ) {
- strSave = p;
+ strSave = p;
}
@@ -388,3 +392,3 @@ void ZoneMap::showCity( ZoneField *city )
lblCity->setText( strCity.replace( QRegExp("_"), " ") + "\n" +
- TimeString::shortTime( ampm ) );
+ TimeString::shortTime( ampm ) );
lblCity->setMinimumSize( lblCity->sizeHint() );
@@ -393,3 +397,3 @@ void ZoneMap::showCity( ZoneField *city )
if ( p )
- setenv( "TZ", strSave, true );
+ setenv( "TZ", strSave, true );
// Now decide where to move the label, x & y can be reused
@@ -399,19 +403,19 @@ void ZoneMap::showCity( ZoneField *city )
if ( lblCity->width() > drawableW - x ) {
- // oops... try putting it on the right
- x = x - lblCity->width() - iLABELOFFSET;
+ // oops... try putting it on the right
+ x = x - lblCity->width() - iLABELOFFSET;
} else {
- // the default...
- x += iLABELOFFSET;
+ // the default...
+ x += iLABELOFFSET;
}
if ( lblCity->height() > drawableH - y ) {
- // move it up...
- y = y - lblCity->height() - iLABELOFFSET;
+ // move it up...
+ y = y - lblCity->height() - iLABELOFFSET;
} else if ( y < 0 ) {
- // the city is actually off the screen...
- // this only happens on the a zoom when you are near the top,
- // a quick workaround..
- y = iLABELOFFSET;
+ // the city is actually off the screen...
+ // this only happens on the a zoom when you are near the top,
+ // a quick workaround..
+ y = iLABELOFFSET;
} else {
- // the default
- y += iLABELOFFSET;
+ // the default
+ y += iLABELOFFSET;
}
@@ -420,10 +424,10 @@ void ZoneMap::showCity( ZoneField *city )
if ( pRepaint ) {
- int repx,
- repy;
- zoneToWin( pRepaint->x(), pRepaint->y(), repx, repy );
- updateContents( repx - iCITYOFFSET, repy - iCITYOFFSET,
- iCITYSIZE, iCITYSIZE );
+ int repx,
+ repy;
+ zoneToWin( pRepaint->x(), pRepaint->y(), repx, repy );
+ updateContents( repx - iCITYOFFSET, repy - iCITYOFFSET,
+ iCITYSIZE, iCITYSIZE );
}
updateContents( tmpx - iCITYOFFSET, tmpy - iCITYOFFSET, iCITYSIZE,
- iCITYSIZE );
+ iCITYSIZE );
pRepaint = pLast;
@@ -441,6 +445,6 @@ void ZoneMap::resizeEvent( QResizeEvent *e )
if ( !bZoom ) {
- drawableW = width() - 2 * frameWidth();
- drawableH = height() - 2 * frameWidth();
- makeMap( drawableW, drawableH );
- resizeContents( drawableW, drawableH );
+ drawableW = width() - 2 * frameWidth();
+ drawableH = height() - 2 * frameWidth();
+ makeMap( drawableW, drawableH );
+ resizeContents( drawableW, drawableH );
}
@@ -453,4 +457,4 @@ void ZoneMap::showZones( void ) const
for ( itZone.toFirst(); itZone.current(); ++itZone ) {
- ZoneField *pZone = itZone.current();
- pZone->showStructure();
+ ZoneField *pZone = itZone.current();
+ pZone->showStructure();
}
@@ -473,3 +477,3 @@ QWidget* ZoneMap::selectionWidget( QWidget *parent) {
for ( itZone.toFirst(); itZone.current(); ++itZone ) {
- ZoneField *pZone = itZone.current();
+ ZoneField *pZone = itZone.current();
if ( continentList.contains( pZone->country() ) == 0 ) {
@@ -500,3 +504,3 @@ void ZoneMap::slotGetCities( QListViewItem * contItem) {
for ( itZone.toFirst(); itZone.current(); ++itZone ) {
- ZoneField *pZone = itZone.current();
+ ZoneField *pZone = itZone.current();
if ( pZone->country() == contItem->text( 1 ) ) {
@@ -524,7 +528,7 @@ void ZoneMap::drawCities( QPainter *p )
for ( itZone.toFirst(), j = 0; itZone.current(); ++itZone, j++ ) {
- ZoneField *pZone = itZone.current();
- zoneToWin( pZone->x(), pZone->y(), x, y );
- if ( x > wImg )
- x = x - wImg;
- p->drawRect( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
+ ZoneField *pZone = itZone.current();
+ zoneToWin( pZone->x(), pZone->y(), x, y );
+ if ( x > wImg )
+ x = x - wImg;
+ p->drawRect( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
}
@@ -565,16 +569,16 @@ static void dayNight(QImage *pImage)
for ( i = 0; i < hImage; i++ ) {
- if ( wtab[i] > 0 ) {
- iStart = iMid - wtab[i];
- iStop = iMid + wtab[i];
- if ( iStart < 0 ) {
- darken( pImage, iStop, wImage + iStart, i );
- } else if ( iStop > wImage ) {
- darken( pImage, iStop - wImage, iStart, i );
- } else {
- darken( pImage, 0, iStart, i );
- darken( pImage, iStop, wImage, i );
- }
- } else {
- darken( pImage, 0, wImage, i );
- }
+ if ( wtab[i] > 0 ) {
+ iStart = iMid - wtab[i];
+ iStop = iMid + wtab[i];
+ if ( iStart < 0 ) {
+ darken( pImage, iStop, wImage + iStart, i );
+ } else if ( iStop > wImage ) {
+ darken( pImage, iStop - wImage, iStart, i );
+ } else {
+ darken( pImage, 0, iStart, i );
+ darken( pImage, iStop, wImage, i );
+ }
+ } else {
+ darken( pImage, 0, wImage, i );
+ }
}
@@ -593,4 +597,4 @@ static inline void darken( QImage *pImage, int start, int stop, int row )
for ( j = start; j <= stop; j++ ) {
- if ( p[j] < colors )
- p[j] += colors;
+ if ( p[j] < colors )
+ p[j] += colors;
}
@@ -602,7 +606,7 @@ void ZoneMap::makeMap( int w, int h )
if ( imgOrig.isNull() ) {
- QMessageBox::warning( this,
- tr( "Couldn't Find Map" ),
- tr( "<p>Couldn't load map: %1, exiting")
+ QMessageBox::warning( this,
+ tr( "Couldn't Find Map" ),
+ tr( "<p>Couldn't load map: %1, exiting")
.arg( strMAP ) );
- exit(-1);
+ exit(-1);
}
@@ -616,5 +620,5 @@ void ZoneMap::makeMap( int w, int h )
for ( int i = 0; i < numColors; i++ ) {
- QRgb rgb = imgOrig.color( i );
- imgOrig.setColor ( i + numColors, qRgb( 2 * qRed( rgb ) / 3,
- 2 * qGreen( rgb ) / 3, 2 * qBlue( rgb ) / 3 ) );
+ QRgb rgb = imgOrig.color( i );
+ imgOrig.setColor ( i + numColors, qRgb( 2 * qRed( rgb ) / 3,
+ 2 * qGreen( rgb ) / 3, 2 * qBlue( rgb ) / 3 ) );
}
@@ -623,4 +627,4 @@ void ZoneMap::makeMap( int w, int h )
if ( bIllum ) {
- // do a daylight mask
- dayNight(&imgOrig);
+ // do a daylight mask
+ dayNight(&imgOrig);
}
@@ -656,3 +660,3 @@ void ZoneMap::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
( pixmapH != drawableH) ) ) {
- makeMap( drawableW, drawableH );
+ makeMap( drawableW, drawableH );
}
@@ -667,7 +671,7 @@ void ZoneMap::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
for ( int r = toprow; r <= bottomrow; r++ ) {
- int py = r * rowheight;
- for ( int c = leftcol; c <= rightcol; c++ ) {
- int px = c * colwidth;
- p->drawPixmap( px, py, *pixCurr );
- }
+ int py = r * rowheight;
+ for ( int c = leftcol; c <= rightcol; c++ ) {
+ int px = c * colwidth;
+ p->drawPixmap( px, py, *pixCurr );
+ }
}
@@ -676,3 +680,3 @@ void ZoneMap::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
if ( pLast )
- drawCity( p, pLast );
+ drawCity( p, pLast );
}
@@ -683,7 +687,7 @@ void ZoneMap::slotZoom( bool setZoom )
if ( bZoom ) {
- makeMap( 2 * wImg , 2 * hImg );
- resizeContents( wImg, hImg );
+ makeMap( 2 * wImg , 2 * hImg );
+ resizeContents( wImg, hImg );
} else {
- makeMap( drawableW, drawableH );
- resizeContents( drawableW, drawableH );
+ makeMap( drawableW, drawableH );
+ resizeContents( drawableW, drawableH );
}
@@ -713,5 +717,5 @@ void ZoneMap::slotRedraw( void )
if ( pRepaint ) {
- pLast = 0;
- zoneToWin(pRepaint->x(), pRepaint->y(), x, y);
- updateContents( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
+ pLast = 0;
+ zoneToWin(pRepaint->x(), pRepaint->y(), x, y);
+ updateContents( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
pRepaint = 0;