summaryrefslogtreecommitdiff
path: root/core/settings/citytime/citytime.cpp
Side-by-side diff
Diffstat (limited to 'core/settings/citytime/citytime.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/citytime/citytime.cpp18
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
@@ -19,4 +19,6 @@
**********************************************************************/
+// changes by Maximilian Reiss <harlekin@handhelds.org>
+
#include "zonemap.h"
#include "citytime.h"
@@ -30,5 +32,4 @@
#endif
-
#include <qdir.h>
#include <qfile.h>
@@ -38,4 +39,5 @@
#include <qtextstream.h>
#include <qtoolbutton.h>
+#include <qlayout.h>
#include <stdlib.h>
@@ -78,5 +80,4 @@ CityTime::CityTime( QWidget *parent, const char* name,
if ( d->width() < d->height() ) {
// append for that 4 down look
-
listCities.append( cmdCity4 );
listCities.append( cmdCity5 );
@@ -105,9 +106,13 @@ CityTime::CityTime( QWidget *parent, const char* name,
cmdCity6->hide();
}
+
+ selWidget = frmMap->selectionWidget( this );
+ selWidget->hide();
+ CityTimeBaseLayout->addWidget( selWidget );
bAdded = true;
readInTimes();
changed = FALSE;
- QObject::connect( qApp, SIGNAL( clockChanged(bool) ),
- this, SLOT( changeClock(bool) ) );
+ QObject::connect( qApp, SIGNAL( clockChanged( bool ) ),
+ this, SLOT( changeClock( bool ) ) );
// now start the timer so we can update the time quickly every second
timerEvent( 0 );
@@ -200,5 +205,8 @@ void CityTime::showTime( void )
void CityTime::beginNewTz()
{
+ buttonWidget->hide();
frmMap->setFocus();
+ selWidget->show();
+ // CityTimeBaseLayout->addWidget( selWidget );
}
@@ -224,4 +232,6 @@ void CityTime::slotNewTz( const QString & strNewCountry,
}
showTime();
+ buttonWidget->show();
+ selWidget->hide();
}