summaryrefslogtreecommitdiff
authorzecke <zecke>2005-05-09 20:31:12 (UTC)
committer zecke <zecke>2005-05-09 20:31:12 (UTC)
commit43c1f1abbcb6166b2a0239d70ba149601ee80ba6 (patch) (unidiff)
tree3aab5af9156ea9c453b55995bf73695d202f23e8
parentf7b59d9b31766517bd45cdc54454b68ddf85c448 (diff)
downloadopie-43c1f1abbcb6166b2a0239d70ba149601ee80ba6.zip
opie-43c1f1abbcb6166b2a0239d70ba149601ee80ba6.tar.gz
opie-43c1f1abbcb6166b2a0239d70ba149601ee80ba6.tar.bz2
Temporarily show more images for me... until Drw or Skyhusker do it the way
they want it
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oresource.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/libopie2/opiecore/oresource.cpp b/libopie2/opiecore/oresource.cpp
index 0d6e60a..7253d56 100644
--- a/libopie2/opiecore/oresource.cpp
+++ b/libopie2/opiecore/oresource.cpp
@@ -30,29 +30,28 @@
30*/ 30*/
31 31
32#include <opie2/oapplication.h> 32#include <opie2/oapplication.h>
33#include <opie2/odebug.h> 33#include <opie2/odebug.h>
34 34
35#include <qpe/applnk.h> 35#include <qpe/applnk.h>
36#include <qpe/resource.h>
36 37
37#include "oresource.h" 38#include "oresource.h"
38 39
39namespace Opie { 40namespace Opie {
40namespace Core { 41namespace Core {
41 42
42static int smallIconSize = -1; // Size of small icons (width & height) 43static int smallIconSize = -1; // Size of small icons (width & height)
43static int bigIconSize = -1; // Size of large icons (width & height) 44static int bigIconSize = -1; // Size of large icons (width & height)
44 45
45QImage OResource::loadImage( const QString &name, Scale scale ) 46QImage OResource::loadImage( const QString &name, Scale scale )
46{ 47{
47 // Load image 48 // Load image
48 QString filename; 49 QImage image = Resource::loadImage( name );
49 filename.sprintf( "%spics/%s.png", (const char*) oApp->qpeDir(), (const char*) name );
50 QImage image( filename );
51 if ( image.isNull() ) 50 if ( image.isNull() )
52 odebug << "libopie2 OResource: can't find image " << filename << oendl; 51 odebug << "libopie2 OResource: can't find image " << name << oendl;
53 52
54 // Scale image (if necessary) 53 // Scale image (if necessary)
55 if ( scale == SmallIcon ) 54 if ( scale == SmallIcon )
56 { 55 {
57 // Retrieve size of small icons 56 // Retrieve size of small icons
58 if ( smallIconSize == -1 ) 57 if ( smallIconSize == -1 )