-rw-r--r-- | libopie2/opiecore/oresource.cpp | 7 |
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 | |||
@@ -24,41 +24,40 @@ | |||
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
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 | ||
39 | namespace Opie { | 40 | namespace Opie { |
40 | namespace Core { | 41 | namespace Core { |
41 | 42 | ||
42 | static int smallIconSize = -1; // Size of small icons (width & height) | 43 | static int smallIconSize = -1; // Size of small icons (width & height) |
43 | static int bigIconSize = -1; // Size of large icons (width & height) | 44 | static int bigIconSize = -1; // Size of large icons (width & height) |
44 | 45 | ||
45 | QImage OResource::loadImage( const QString &name, Scale scale ) | 46 | QImage 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 ) |
59 | smallIconSize = AppLnk::smallIconSize(); | 58 | smallIconSize = AppLnk::smallIconSize(); |
60 | 59 | ||
61 | // Scale image | 60 | // Scale image |
62 | return image.smoothScale( smallIconSize, smallIconSize ); | 61 | return image.smoothScale( smallIconSize, smallIconSize ); |
63 | } | 62 | } |
64 | else if ( scale == BigIcon ) | 63 | else if ( scale == BigIcon ) |