| -rw-r--r-- | core/settings/citytime/opie-citytime.control | 2 | ||||
| -rw-r--r-- | core/settings/citytime/zonemap.cpp | 10 |
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 @@ -6,3 +6,3 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Time-zone / world clock settings 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 @@ -26,5 +26,6 @@ /* OPIE */ -#include <qpe/resource.h> -#include <qpe/qpeapplication.h> #include <opie2/odebug.h> +#include <opie2/oresource.h> + +#include <qpe/qpeapplication.h> @@ -162,5 +163,6 @@ ZoneMap::ZoneMap( QWidget *parent, const char* name ) - QPixmap pixZoom = Resource::loadPixmap( "mag" ); + QPixmap pixZoom = Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon ); cmdZoom = new QToolButton( this, "Zoom command" ); + cmdZoom->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); cmdZoom->setPixmap( pixZoom ); @@ -604,3 +606,3 @@ void ZoneMap::makeMap( int w, int h ) { - QImage imgOrig = Resource::loadImage( strMAP ); + QImage imgOrig = Opie::Core::OResource::loadImage( strMAP ); if ( imgOrig.isNull() ) { |