summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/citytime/opie-citytime.control2
-rw-r--r--core/settings/citytime/zonemap.cpp10
2 files changed, 7 insertions, 5 deletions
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 03fa555..71ee7d0 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/settings 4Section: opie/settings
5Maintainer: Maximilian Reiss <harlekin@handhelds.org> 5Maintainer: Maximilian Reiss <harlekin@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: Time-zone / world clock settings 8Description: Time-zone / world clock settings
9 The time-zone manager for the Opie environment. 9 The time-zone manager for the Opie environment.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index e4a25ef..7edc45f 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -24,9 +24,10 @@
24#include "zonemap.h" 24#include "zonemap.h"
25 25
26/* OPIE */ 26/* OPIE */
27#include <qpe/resource.h>
28#include <qpe/qpeapplication.h>
29#include <opie2/odebug.h> 27#include <opie2/odebug.h>
28#include <opie2/oresource.h>
29
30#include <qpe/qpeapplication.h>
30 31
31/* QT */ 32/* QT */
32#include <qfile.h> 33#include <qfile.h>
@@ -160,9 +161,10 @@ ZoneMap::ZoneMap( QWidget *parent, const char* name )
160 // just set the current image to point 161 // just set the current image to point
161 pixCurr = new QPixmap(); 162 pixCurr = new QPixmap();
162 163
163 QPixmap pixZoom = Resource::loadPixmap( "mag" ); 164 QPixmap pixZoom = Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon );
164 165
165 cmdZoom = new QToolButton( this, "Zoom command" ); 166 cmdZoom = new QToolButton( this, "Zoom command" );
167 cmdZoom->setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
166 cmdZoom->setPixmap( pixZoom ); 168 cmdZoom->setPixmap( pixZoom );
167 cmdZoom->setToggleButton( true ); 169 cmdZoom->setToggleButton( true );
168 170
@@ -602,7 +604,7 @@ static inline void darken( QImage *pImage, int start, int stop, int row )
602 604
603void ZoneMap::makeMap( int w, int h ) 605void ZoneMap::makeMap( int w, int h )
604{ 606{
605 QImage imgOrig = Resource::loadImage( strMAP ); 607 QImage imgOrig = Opie::Core::OResource::loadImage( strMAP );
606 if ( imgOrig.isNull() ) { 608 if ( imgOrig.isNull() ) {
607 QMessageBox::warning( this, 609 QMessageBox::warning( this,
608 tr( "Couldn't Find Map" ), 610 tr( "Couldn't Find Map" ),