image relocation

2 files changed, 1 insertions, 1 deletions

diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index 337f4d9..1d60aee 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -1,301 +1,301 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "sun.h"
 #include "zonemap.h"
 
 #include <qpe/resource.h>
 #include <qpe/timestring.h>
 #include <qpe/qpeapplication.h>
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qmessagebox.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtimer.h>
 #include <qtoolbutton.h>
 
 #include <limits.h>
 
 // the map file...
 static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab";
-static const char strMAP[] = "simple_grid_400";
+static const char strMAP[] = "citytime/simple_grid_400";
 
 // the maximum distance we'll allow the pointer to be away from a city
 // and still show the city's time
 static const int iTHRESHOLD = 50000;
 
 // The label offset (how far away from pointer)
 static const int iLABELOFFSET = 8;
 
 // the size of the dot to draw, and where to start it
 static const int iCITYSIZE = 3;
 const int iCITYOFFSET = 2;
 
 // the darkening function
 static inline void darken( QImage *pImage, int start, int stop, int row );
 static void dayNight( QImage *pImage );
 
 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 regCountry( "[A-Za-z]+/" ); // the country (not good enough)
     QRegExp regCity( "[A-Za-z_-]*" ); // the city
 
     int iStart,
         iStop,
         iLen,
         tmp;
     QString strTmp;
     // we should be able to assume that the country code is always the first
     // two chars, so just grap them and let it go...
     strCountryCode = strLine.left( 2 );
     iStart = regCoord.match( strLine, 0, &iLen );
     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;
         }
     }
     iStart = regCoord.match( strLine, iStart + iLen, &iLen );
     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;
         }
     }
     iStart = regCountry.match( strLine, 0, &iLen );
     // help with the shortcoming in 2.x regexp...
     iStop = strLine.findRev( '/' );
     if ( iStart >= 0 ) {
         iLen = (iStop - iStart) + 1;
         strCountry = strLine.mid( iStart, iLen );
     }
     // now match the city...
     iStart = regCity.match( strLine, iStart + iLen, &iLen );
     if ( iStart >= 0 ) {
         strCity = strLine.mid( iStart, iLen );
     }
 }
 
 void ZoneField::showStructure( void ) const
 {
     qDebug( "Country: %s", strCountry.latin1() );
     qDebug( "City: %s", strCity.latin1() );
     qDebug( "x: %d", _x );
     qDebug( "y: %d\n", _y );
 }
 
 ZoneMap::ZoneMap( QWidget *parent, const char* name )
     : QScrollView( parent, name ),
       pLast( 0 ),
       pRepaint( 0 ),
       ox( 0 ),
       oy( 0 ),
       drawableW( -1 ),
       drawableH( -1 ),
       bZoom( FALSE ),
       bIllum( TRUE ),
       cursor( 0 )
 {
     viewport()->setFocusPolicy( StrongFocus );
 
     // set mouse tracking so we can use the mouse move event
     zones.setAutoDelete( true );
     // get the map loaded
     // just set the current image to point
     pixCurr = new QPixmap();
 
     QPixmap pixZoom = Resource::loadPixmap( "mag" );
 
     cmdZoom = new QToolButton( this, "Zoom command" );
     cmdZoom->setPixmap( pixZoom );
     cmdZoom->setToggleButton( true );
 
     cmdZoom->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0,
                             (QSizePolicy::SizeType)0,
                             cmdZoom->sizePolicy().hasHeightForWidth() ) );
     cmdZoom->setMaximumSize( cmdZoom->sizeHint() );
     // probably don't need this, but just in case...
     cmdZoom->move( width() - cmdZoom->width(), height() - cmdZoom->height() );
 
 
     lblCity = new QLabel( tr( "CITY" ), this, "City Label" );
     lblCity->setMinimumSize( lblCity->sizeHint() );
     lblCity->setFrameStyle( QFrame::Plain | QFrame::Box );
     lblCity->setBackgroundColor( yellow );
     lblCity->hide();
 
     // A timer to make sure the label gets hidden
     tHide = new QTimer( this, "Label Timer" );
     QObject::connect( tHide, SIGNAL( timeout() ),
                       lblCity, SLOT( hide() ) );
     QObject::connect( tHide, SIGNAL( timeout() ),
                       this, SLOT( slotRedraw() ) );
     QTimer *tUpdate = new QTimer( this, "Update Timer" );
     QObject::connect( tUpdate, SIGNAL( timeout() ),
                       this, SLOT( slotUpdate() ) );
     QObject::connect( qApp, SIGNAL( timeChanged() ),
                       this, SLOT( slotUpdate() ) );
     QObject::connect( cmdZoom, SIGNAL( toggled( bool ) ),
                       this, SLOT( slotZoom( bool ) ) );
     QObject::connect( &norm, SIGNAL( signalNewPoint( const QPoint& ) ),
                       this, SLOT( slotFindCity( const QPoint& ) ) );
     QObject::connect( qApp, SIGNAL( clockChanged( bool ) ),
                       this, SLOT( changeClock( bool ) ) );
     // update the sun's movement every 5 minutes
     tUpdate->start( 5 * 60 * 1000 );
     // May as well read in the timezone information too...
     readZones();
 }
 
 ZoneMap::~ZoneMap()
 {
 }
 
 void ZoneMap::readZones( void )
 {
     QFile fZone( strZONEINFO );
     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);
     } 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();
     }
 }
 
 void ZoneMap::viewportMousePressEvent( QMouseEvent* event )
 {
     // add the mouse event into the normalizer, and get the average,
     // pass it along
     slotRedraw();
     norm.start();
     norm.addEvent( event->pos() );
 }
 
 void ZoneMap::viewportMouseMoveEvent( QMouseEvent* event )
 {
     norm.addEvent( event->pos() );
 }
 
 void ZoneMap::viewportMouseReleaseEvent( QMouseEvent* )
 {
     // get the averaged points in case a timeout hasn't occurred,
     // more for "mouse clicks"
     norm.stop();
     if ( pLast != NULL ) {
         emit signalTz( pLast->country(), pLast->city() );
         pLast = NULL;
     }
     tHide->start( 2000, true );
 }
 
 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;
     }
 }
 
 ZoneField *ZoneMap::findCityNear( ZoneField *city, int key )
 {
     ZoneField *pZone;
     ZoneField *pClosest = 0;
     long ddist = LONG_MAX;
 
     QListIterator<ZoneField> it( zones );
     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:
diff --git a/pics/simple_grid_400.png b/pics/simple_grid_400.png
deleted file mode 100644
index 5e0e21d..0000000
--- a/pics/simple_grid_400.png
+++ b/dev/null