summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/citytime/zonemap.cpp2
-rw-r--r--pics/simple_grid_400.pngbin4533 -> 0 bytes
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,109 +1,109 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "sun.h" 21#include "sun.h"
22#include "zonemap.h" 22#include "zonemap.h"
23 23
24#include <qpe/resource.h> 24#include <qpe/resource.h>
25#include <qpe/timestring.h> 25#include <qpe/timestring.h>
26#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
27 27
28#include <qdatetime.h> 28#include <qdatetime.h>
29#include <qfile.h> 29#include <qfile.h>
30#include <qimage.h> 30#include <qimage.h>
31#include <qlabel.h> 31#include <qlabel.h>
32#include <qlist.h> 32#include <qlist.h>
33#include <qmessagebox.h> 33#include <qmessagebox.h>
34#include <qpixmap.h> 34#include <qpixmap.h>
35#include <qpainter.h> 35#include <qpainter.h>
36#include <qregexp.h> 36#include <qregexp.h>
37#include <qtextstream.h> 37#include <qtextstream.h>
38#include <qtimer.h> 38#include <qtimer.h>
39#include <qtoolbutton.h> 39#include <qtoolbutton.h>
40 40
41#include <limits.h> 41#include <limits.h>
42 42
43// the map file... 43// the map file...
44static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab"; 44static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab";
45static const char strMAP[] = "simple_grid_400"; 45static const char strMAP[] = "citytime/simple_grid_400";
46 46
47// the maximum distance we'll allow the pointer to be away from a city 47// the maximum distance we'll allow the pointer to be away from a city
48// and still show the city's time 48// and still show the city's time
49static const int iTHRESHOLD = 50000; 49static const int iTHRESHOLD = 50000;
50 50
51// The label offset (how far away from pointer) 51// The label offset (how far away from pointer)
52static const int iLABELOFFSET = 8; 52static const int iLABELOFFSET = 8;
53 53
54// the size of the dot to draw, and where to start it 54// the size of the dot to draw, and where to start it
55static const int iCITYSIZE = 3; 55static const int iCITYSIZE = 3;
56const int iCITYOFFSET = 2; 56const int iCITYOFFSET = 2;
57 57
58// the darkening function 58// the darkening function
59static inline void darken( QImage *pImage, int start, int stop, int row ); 59static inline void darken( QImage *pImage, int start, int stop, int row );
60static void dayNight( QImage *pImage ); 60static void dayNight( QImage *pImage );
61 61
62ZoneField::ZoneField( const QString& strLine ) 62ZoneField::ZoneField( const QString& strLine )
63{ 63{
64 // make a bunch of RegExp's to match the data from the line 64 // make a bunch of RegExp's to match the data from the line
65 QRegExp regCoord( "[-+][0-9]+" );// the latitude 65 QRegExp regCoord( "[-+][0-9]+" );// the latitude
66 QRegExp regCountry( "[A-Za-z]+/" ); // the country (not good enough) 66 QRegExp regCountry( "[A-Za-z]+/" ); // the country (not good enough)
67 QRegExp regCity( "[A-Za-z_-]*" ); // the city 67 QRegExp regCity( "[A-Za-z_-]*" ); // the city
68 68
69 int iStart, 69 int iStart,
70 iStop, 70 iStop,
71 iLen, 71 iLen,
72 tmp; 72 tmp;
73 QString strTmp; 73 QString strTmp;
74 // we should be able to assume that the country code is always the first 74 // we should be able to assume that the country code is always the first
75 // two chars, so just grap them and let it go... 75 // two chars, so just grap them and let it go...
76 strCountryCode = strLine.left( 2 ); 76 strCountryCode = strLine.left( 2 );
77 iStart = regCoord.match( strLine, 0, &iLen ); 77 iStart = regCoord.match( strLine, 0, &iLen );
78 if ( iStart >= 0 ) { 78 if ( iStart >= 0 ) {
79 strTmp = strLine.mid( iStart, iLen ); 79 strTmp = strLine.mid( iStart, iLen );
80 tmp = strTmp.toInt(); 80 tmp = strTmp.toInt();
81 // okay, there are two versions of the format, make a decision based on 81 // okay, there are two versions of the format, make a decision based on
82 // the size... 82 // the size...
83 // Oh BTW, we are storing everything in seconds! 83 // Oh BTW, we are storing everything in seconds!
84 if ( iLen < 7 ) { 84 if ( iLen < 7 ) {
85 _y = tmp / 100; 85 _y = tmp / 100;
86 _y *= 60; 86 _y *= 60;
87 _y += tmp % 100; 87 _y += tmp % 100;
88 _y *= 60; 88 _y *= 60;
89 } else { 89 } else {
90 _y = tmp / 10000; 90 _y = tmp / 10000;
91 _y *= 60; 91 _y *= 60;
92 tmp %= 10000; 92 tmp %= 10000;
93 _y += tmp / 100; 93 _y += tmp / 100;
94 _y *= 60; 94 _y *= 60;
95 tmp %= 100; 95 tmp %= 100;
96 _y += tmp; 96 _y += tmp;
97 } 97 }
98 } 98 }
99 iStart = regCoord.match( strLine, iStart + iLen, &iLen ); 99 iStart = regCoord.match( strLine, iStart + iLen, &iLen );
100 if ( iStart >= 0 ) { 100 if ( iStart >= 0 ) {
101 strTmp = strLine.mid( iStart, iLen ); 101 strTmp = strLine.mid( iStart, iLen );
102 tmp = strTmp.toInt(); 102 tmp = strTmp.toInt();
103 if ( iLen < 8 ) { 103 if ( iLen < 8 ) {
104 _x = tmp / 100; 104 _x = tmp / 100;
105 _x *= 60; 105 _x *= 60;
106 _x += tmp % 100; 106 _x += tmp % 100;
107 _x *= 60; 107 _x *= 60;
108 } else { 108 } else {
109 _x = tmp / 10000; 109 _x = tmp / 10000;
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
Binary files differ