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/citytime.cpp | |
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/citytime.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/citytime/citytime.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp index b2f9f14..f33b19f 100644 --- a/core/settings/citytime/citytime.cpp +++ b/core/settings/citytime/citytime.cpp | |||
@@ -18,6 +18,8 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | // changes by Maximilian Reiss <harlekin@handhelds.org> | ||
22 | |||
21 | #include "zonemap.h" | 23 | #include "zonemap.h" |
22 | #include "citytime.h" | 24 | #include "citytime.h" |
23 | 25 | ||
@@ -29,7 +31,6 @@ | |||
29 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
30 | #endif | 32 | #endif |
31 | 33 | ||
32 | |||
33 | #include <qdir.h> | 34 | #include <qdir.h> |
34 | #include <qfile.h> | 35 | #include <qfile.h> |
35 | #include <qlabel.h> | 36 | #include <qlabel.h> |
@@ -37,6 +38,7 @@ | |||
37 | #include <qregexp.h> | 38 | #include <qregexp.h> |
38 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
39 | #include <qtoolbutton.h> | 40 | #include <qtoolbutton.h> |
41 | #include <qlayout.h> | ||
40 | 42 | ||
41 | #include <stdlib.h> | 43 | #include <stdlib.h> |
42 | 44 | ||
@@ -77,7 +79,6 @@ CityTime::CityTime( QWidget *parent, const char* name, | |||
77 | QWidget *d = QApplication::desktop(); | 79 | QWidget *d = QApplication::desktop(); |
78 | if ( d->width() < d->height() ) { | 80 | if ( d->width() < d->height() ) { |
79 | // append for that 4 down look | 81 | // append for that 4 down look |
80 | |||
81 | listCities.append( cmdCity4 ); | 82 | listCities.append( cmdCity4 ); |
82 | listCities.append( cmdCity5 ); | 83 | listCities.append( cmdCity5 ); |
83 | listCities.append( cmdCity6 ); | 84 | listCities.append( cmdCity6 ); |
@@ -104,11 +105,15 @@ CityTime::CityTime( QWidget *parent, const char* name, | |||
104 | cmdCity5->hide(); | 105 | cmdCity5->hide(); |
105 | cmdCity6->hide(); | 106 | cmdCity6->hide(); |
106 | } | 107 | } |
108 | |||
109 | selWidget = frmMap->selectionWidget( this ); | ||
110 | selWidget->hide(); | ||
111 | CityTimeBaseLayout->addWidget( selWidget ); | ||
107 | bAdded = true; | 112 | bAdded = true; |
108 | readInTimes(); | 113 | readInTimes(); |
109 | changed = FALSE; | 114 | changed = FALSE; |
110 | QObject::connect( qApp, SIGNAL( clockChanged(bool) ), | 115 | QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), |
111 | this, SLOT( changeClock(bool) ) ); | 116 | this, SLOT( changeClock( bool ) ) ); |
112 | // now start the timer so we can update the time quickly every second | 117 | // now start the timer so we can update the time quickly every second |
113 | timerEvent( 0 ); | 118 | timerEvent( 0 ); |
114 | } | 119 | } |
@@ -199,7 +204,10 @@ void CityTime::showTime( void ) | |||
199 | 204 | ||
200 | void CityTime::beginNewTz() | 205 | void CityTime::beginNewTz() |
201 | { | 206 | { |
207 | buttonWidget->hide(); | ||
202 | frmMap->setFocus(); | 208 | frmMap->setFocus(); |
209 | selWidget->show(); | ||
210 | // CityTimeBaseLayout->addWidget( selWidget ); | ||
203 | } | 211 | } |
204 | 212 | ||
205 | void CityTime::slotNewTz( const QString & strNewCountry, | 213 | void CityTime::slotNewTz( const QString & strNewCountry, |
@@ -223,6 +231,8 @@ void CityTime::slotNewTz( const QString & strNewCountry, | |||
223 | } | 231 | } |
224 | } | 232 | } |
225 | showTime(); | 233 | showTime(); |
234 | buttonWidget->show(); | ||
235 | selWidget->hide(); | ||
226 | } | 236 | } |
227 | 237 | ||
228 | void CityTime::readInTimes( void ) | 238 | void CityTime::readInTimes( void ) |