summaryrefslogtreecommitdiff
Unidiff
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
@@ -1,88 +1,87 @@
1/* 1/*
2 � � � � � � � � This file is part of the Opie Project 2 � � � � � � � � This file is part of the Opie Project
3 3
4 Copyright (C) 2005 Dan Williams <drw@handhelds.org> 4 Copyright (C) 2005 Dan Williams <drw@handhelds.org>
5� � � � � � � Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> 5� � � � � � � Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
6 =. 6 =.
7 .=l. 7 .=l.
8� � � � � �.>+-= 8� � � � � �.>+-=
9�_;:, � � .> � �:=|. This program is free software; you can 9�_;:, � � .> � �:=|. This program is free software; you can
10.> <`_, � > �. � <= redistribute it and/or modify it under 10.> <`_, � > �. � <= redistribute it and/or modify it under
11:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public 11:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public
12.="- .-=="i, � � .._ License as published by the Free Software 12.="- .-=="i, � � .._ License as published by the Free Software
13�- . � .-<_> � � .<> Foundation; either version 2 of the License, 13�- . � .-<_> � � .<> Foundation; either version 2 of the License,
14� � �._= =} � � � : or (at your option) any later version. 14� � �._= =} � � � : or (at your option) any later version.
15� � .%`+i> � � � _;_. 15� � .%`+i> � � � _;_.
16� � .i_,=:_. � � �-<s. This program is distributed in the hope that 16� � .i_,=:_. � � �-<s. This program is distributed in the hope that
17� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY; 17� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
18� � : .. � �.:, � � . . . without even the implied warranty of 18� � : .. � �.:, � � . . . without even the implied warranty of
19� � =_ � � � �+ � � =;=|` MERCHANTABILITY or FITNESS FOR A 19� � =_ � � � �+ � � =;=|` MERCHANTABILITY or FITNESS FOR A
20� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU 20� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU
21..}^=.= � � � = � � � ; Library General Public License for more 21..}^=.= � � � = � � � ; Library General Public License for more
22++= � -. � � .` � � .: details. 22++= � -. � � .` � � .: details.
23�: � � = �...= . :.=- 23�: � � = �...= . :.=-
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
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 )
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 )
65 { 64 {
66 // Retrieve size of big icons 65 // Retrieve size of big icons
67 if ( bigIconSize == -1 ) 66 if ( bigIconSize == -1 )
68 bigIconSize = AppLnk::bigIconSize(); 67 bigIconSize = AppLnk::bigIconSize();
69 68
70 // Scale image 69 // Scale image
71 return image.smoothScale( bigIconSize, bigIconSize ); 70 return image.smoothScale( bigIconSize, bigIconSize );
72 } 71 }
73 else 72 else
74 return image; 73 return image;
75} 74}
76 75
77QPixmap OResource::loadPixmap( const QString &name, Scale scale ) 76QPixmap OResource::loadPixmap( const QString &name, Scale scale )
78{ 77{
79 QPixmap pixmap; 78 QPixmap pixmap;
80 pixmap.convertFromImage( loadImage( name, scale ) ); 79 pixmap.convertFromImage( loadImage( name, scale ) );
81 return pixmap; 80 return pixmap;
82} 81}
83 82
84} // namespace Core 83} // namespace Core
85} // namespace Opie 84} // namespace Opie
86 85
87 86
88 87