author | harlekin <harlekin> | 2002-10-12 13:43:58 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-12 13:43:58 (UTC) |
commit | 4f1cf7f8c9925f31f2940207b8f7b5771533b734 (patch) (unidiff) | |
tree | 95656286280ec923b6262bcdfb55a986c8fc4ab8 /core/settings/citytime/zonemap.h | |
parent | d442e7bcc977c46a77749c0d2508a755a8d9db7a (diff) | |
download | opie-4f1cf7f8c9925f31f2940207b8f7b5771533b734.zip opie-4f1cf7f8c9925f31f2940207b8f7b5771533b734.tar.gz opie-4f1cf7f8c9925f31f2940207b8f7b5771533b734.tar.bz2 |
first step to make citytime more usable
Diffstat (limited to 'core/settings/citytime/zonemap.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/citytime/zonemap.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/settings/citytime/zonemap.h b/core/settings/citytime/zonemap.h index c9c2035..ea0142b 100644 --- a/core/settings/citytime/zonemap.h +++ b/core/settings/citytime/zonemap.h | |||
@@ -25,25 +25,26 @@ | |||
25 | 25 | ||
26 | #include <qlist.h> | 26 | #include <qlist.h> |
27 | #include <qscrollview.h> | 27 | #include <qscrollview.h> |
28 | #include <qstring.h> | 28 | #include <qstring.h> |
29 | 29 | ||
30 | extern const int iCITYOFFSET; | 30 | extern const int iCITYOFFSET; |
31 | 31 | ||
32 | class QImage; | 32 | class QImage; |
33 | class QComboBox; | 33 | class QComboBox; |
34 | class QLabel; | 34 | class QLabel; |
35 | class QTimer; | 35 | class QTimer; |
36 | class QToolButton; | 36 | class QToolButton; |
37 | 37 | class QListViewItem; | |
38 | class QListView; | ||
38 | 39 | ||
39 | 40 | ||
40 | class ZoneField | 41 | class ZoneField |
41 | { | 42 | { |
42 | public: | 43 | public: |
43 | ZoneField( const QString & ); | 44 | ZoneField( const QString & ); |
44 | void showStructure( void ) const; | 45 | void showStructure( void ) const; |
45 | inline int x( void ) const { return _x; }; | 46 | inline int x( void ) const { return _x; }; |
46 | inline int y( void ) const { return _y; }; | 47 | inline int y( void ) const { return _y; }; |
47 | 48 | ||
48 | inline QString city( void ) const { return strCity; }; | 49 | inline QString city( void ) const { return strCity; }; |
49 | inline QString country( void ) const { return strCountry; }; | 50 | inline QString country( void ) const { return strCountry; }; |
@@ -54,65 +55,72 @@ private: | |||
54 | QString strCountryCode; | 55 | QString strCountryCode; |
55 | QString strCountry; | 56 | QString strCountry; |
56 | QString strCity; | 57 | QString strCity; |
57 | }; | 58 | }; |
58 | 59 | ||
59 | class ZoneMap : public QScrollView | 60 | class ZoneMap : public QScrollView |
60 | { | 61 | { |
61 | Q_OBJECT | 62 | Q_OBJECT |
62 | public: | 63 | public: |
63 | ZoneMap( QWidget *parent = 0, const char *name = 0 ); | 64 | ZoneMap( QWidget *parent = 0, const char *name = 0 ); |
64 | ~ZoneMap(); | 65 | ~ZoneMap(); |
65 | void showZones( void ) const; | 66 | void showZones( void ) const; |
67 | QWidget* selectionWidget( QWidget* parent ); | ||
66 | // convert between the pixels on the image and the coordinates in the | 68 | // convert between the pixels on the image and the coordinates in the |
67 | // database | 69 | // database |
68 | inline bool zoneToWin( int zoneX, int zoneY, int &winX, int &winY ) const; | 70 | inline bool zoneToWin( int zoneX, int zoneY, int &winX, int &winY ) const; |
69 | inline bool winToZone( int winX, int winY, int &zoneX, int &zoneY ) const; | 71 | inline bool winToZone( int winX, int winY, int &zoneX, int &zoneY ) const; |
70 | 72 | ||
71 | public slots: | 73 | public slots: |
72 | void slotZoom( bool setZoom ); | 74 | void slotZoom( bool setZoom ); |
73 | void slotIllum( bool setIllum ); | 75 | void slotIllum( bool setIllum ); |
74 | void slotUpdate( void ); | 76 | void slotUpdate( void ); |
75 | void slotRedraw( void ); | 77 | void slotRedraw( void ); |
76 | void slotFindCity( const QPoint &pos ); // Find the closest city | 78 | void slotFindCity( const QPoint &pos ); // Find the closest city |
77 | void changeClock( bool ); | 79 | void changeClock( bool ); |
78 | 80 | ||
79 | signals: | 81 | signals: |
80 | void signalTz( const QString &newCountry, const QString &newCity ); | 82 | void signalTz( const QString &newCountry, const QString &newCity ); |
81 | 83 | ||
82 | protected: | 84 | protected: |
83 | virtual void viewportMouseMoveEvent( QMouseEvent *event ); | 85 | virtual void viewportMouseMoveEvent( QMouseEvent *event ); |
84 | virtual void viewportMousePressEvent( QMouseEvent *event ); | 86 | virtual void viewportMousePressEvent( QMouseEvent *event ); |
85 | virtual void viewportMouseReleaseEvent( QMouseEvent *event ); | 87 | virtual void viewportMouseReleaseEvent( QMouseEvent *event ); |
86 | virtual void keyPressEvent( QKeyEvent * ); | 88 | virtual void keyPressEvent( QKeyEvent * ); |
87 | virtual void resizeEvent( QResizeEvent *); | 89 | virtual void resizeEvent( QResizeEvent *); |
88 | virtual void drawContents( QPainter *p, int cx, int cy, int cw, int ch ); | 90 | virtual void drawContents( QPainter *p, int cx, int cy, int cw, int ch ); |
89 | 91 | ||
92 | private slots: | ||
93 | void slotGetCities( QListViewItem * ); | ||
94 | void slotCitySelected( QListViewItem * ); | ||
90 | private: | 95 | private: |
91 | ZoneField *findCityNear( ZoneField *city, int key ); | 96 | ZoneField *findCityNear( ZoneField *city, int key ); |
92 | void showCity( ZoneField *city ); | 97 | void showCity( ZoneField *city ); |
93 | void drawCities( QPainter *p );// put all the cities on the map (ugly) | 98 | void drawCities( QPainter *p );// put all the cities on the map (ugly) |
94 | void drawCity( QPainter *p, const ZoneField *pCity ); // draw the given city on the map | 99 | void drawCity( QPainter *p, const ZoneField *pCity ); // draw the given city on the map |
95 | void readZones( void ); // Read in the zone information from the file | 100 | void readZones( void ); // Read in the zone information from the file |
96 | void zoom( void ); // Zoom the map... | 101 | void zoom( void ); // Zoom the map... |
97 | void makeMap( int width, int height ); | 102 | void makeMap( int width, int height ); |
98 | QPixmap* pixCurr; // image to be drawn on the screen | 103 | QPixmap* pixCurr; // image to be drawn on the screen |
99 | QLabel* lblCity; // the "tool-tip" that shows up when you pick a city... | 104 | QLabel* lblCity; // the "tool-tip" that shows up when you pick a city... |
100 | QToolButton *cmdZoom; // our zoom option... | 105 | QToolButton *cmdZoom; // our zoom option... |
101 | QTimer*tHide; // the timer to hide the "tool tip" | 106 | QTimer*tHide; // the timer to hide the "tool tip" |
102 | ZoneField *pLast; // the last known good city that was found... | 107 | ZoneField *pLast; // the last known good city that was found... |
103 | ZoneField *pRepaint; // save the location to maximize the repaint... | 108 | ZoneField *pRepaint; // save the location to maximize the repaint... |
104 | QList<ZoneField> zones; // a linked list to hold all this information | 109 | QList<ZoneField> zones; // a linked list to hold all this information |
105 | StylusNormalizer norm; | 110 | StylusNormalizer norm; |
106 | 111 | ||
112 | QListView *cityView; | ||
113 | QString selectedCont; | ||
114 | |||
107 | //the True width and height of the map... | 115 | //the True width and height of the map... |
108 | int wImg; | 116 | int wImg; |
109 | int hImg; | 117 | int hImg; |
110 | // the pixel points that correspond to (0, 0); | 118 | // the pixel points that correspond to (0, 0); |
111 | int ox; | 119 | int ox; |
112 | int oy; | 120 | int oy; |
113 | 121 | ||
114 | // the drawable area of the map... | 122 | // the drawable area of the map... |
115 | int drawableW; | 123 | int drawableW; |
116 | int drawableH; | 124 | int drawableH; |
117 | 125 | ||
118 | bool bZoom; // a flag to indicate zoom is active | 126 | bool bZoom; // a flag to indicate zoom is active |