summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oresource.cpp5
-rw-r--r--libopie2/opiecore/oresource.h11
2 files changed, 16 insertions, 0 deletions
diff --git a/libopie2/opiecore/oresource.cpp b/libopie2/opiecore/oresource.cpp
index 7253d56..95cf8f3 100644
--- a/libopie2/opiecore/oresource.cpp
+++ b/libopie2/opiecore/oresource.cpp
@@ -19,69 +19,74 @@
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#include <qpe/resource.h>
37 37
38#include "oresource.h" 38#include "oresource.h"
39 39
40namespace Opie { 40namespace Opie {
41namespace Core { 41namespace Core {
42 42
43static int smallIconSize = -1; // Size of small icons (width & height) 43static int smallIconSize = -1; // Size of small icons (width & height)
44static int bigIconSize = -1; // Size of large icons (width & height) 44static int bigIconSize = -1; // Size of large icons (width & height)
45 45
46QImage OResource::loadImage( const QString &name, Scale scale ) 46QImage OResource::loadImage( const QString &name, Scale scale )
47{ 47{
48 // Load image 48 // Load image
49 QImage image = Resource::loadImage( name ); 49 QImage image = Resource::loadImage( name );
50 if ( image.isNull() ) 50 if ( image.isNull() )
51 odebug << "libopie2 OResource: can't find image " << name << oendl; 51 odebug << "libopie2 OResource: can't find image " << name << oendl;
52 52
53 // Scale image (if necessary) 53 // Scale image (if necessary)
54 if ( scale == SmallIcon ) 54 if ( scale == SmallIcon )
55 { 55 {
56 // Retrieve size of small icons 56 // Retrieve size of small icons
57 if ( smallIconSize == -1 ) 57 if ( smallIconSize == -1 )
58 smallIconSize = AppLnk::smallIconSize(); 58 smallIconSize = AppLnk::smallIconSize();
59 59
60 // Scale image 60 // Scale image
61 return image.smoothScale( smallIconSize, smallIconSize ); 61 return image.smoothScale( smallIconSize, smallIconSize );
62 } 62 }
63 else if ( scale == BigIcon ) 63 else if ( scale == BigIcon )
64 { 64 {
65 // Retrieve size of big icons 65 // Retrieve size of big icons
66 if ( bigIconSize == -1 ) 66 if ( bigIconSize == -1 )
67 bigIconSize = AppLnk::bigIconSize(); 67 bigIconSize = AppLnk::bigIconSize();
68 68
69 // Scale image 69 // Scale image
70 return image.smoothScale( bigIconSize, bigIconSize ); 70 return image.smoothScale( bigIconSize, bigIconSize );
71 } 71 }
72 else 72 else
73 return image; 73 return image;
74} 74}
75 75
76QPixmap OResource::loadPixmap( const QString &name, Scale scale ) 76QPixmap OResource::loadPixmap( const QString &name, Scale scale )
77{ 77{
78 QPixmap pixmap; 78 QPixmap pixmap;
79 pixmap.convertFromImage( loadImage( name, scale ) ); 79 pixmap.convertFromImage( loadImage( name, scale ) );
80 return pixmap; 80 return pixmap;
81} 81}
82 82
83QString OResource::findPixmap( const QString &name )
84{
85 return Resource::findPixmap( name );
86}
87
83} // namespace Core 88} // namespace Core
84} // namespace Opie 89} // namespace Opie
85 90
86 91
87 92
diff --git a/libopie2/opiecore/oresource.h b/libopie2/opiecore/oresource.h
index 87b2abd..2071b87 100644
--- a/libopie2/opiecore/oresource.h
+++ b/libopie2/opiecore/oresource.h
@@ -21,70 +21,81 @@
21  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 21  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
22..}^=.=       =       ; Library General Public License for more 22..}^=.=       =       ; Library General Public License for more
23++=   -.     .`     .: details. 23++=   -.     .`     .: details.
24 :     =  ...= . :.=- 24 :     =  ...= . :.=-
25 -.   .:....=;==+<; You should have received a copy of the GNU 25 -.   .:....=;==+<; You should have received a copy of the GNU
26  -_. . .   )=.  = Library General Public License along with 26  -_. . .   )=.  = Library General Public License along with
27    --        :-=` this library; see the file COPYING.LIB. 27    --        :-=` this library; see the file COPYING.LIB.
28 If not, write to the Free Software Foundation, 28 If not, write to the Free Software Foundation,
29 Inc., 59 Temple Place - Suite 330, 29 Inc., 59 Temple Place - Suite 330,
30 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
31*/ 31*/
32 32
33#ifndef ORESOURCE_H 33#ifndef ORESOURCE_H
34#define ORESOURCE_H 34#define ORESOURCE_H
35 35
36#include <qimage.h> 36#include <qimage.h>
37#include <qpixmap.h> 37#include <qpixmap.h>
38 38
39namespace Opie { 39namespace Opie {
40namespace Core { 40namespace Core {
41 41
42class OResource 42class OResource
43{ 43{
44 public: 44 public:
45 /** 45 /**
46 * Image scaling options. 46 * Image scaling options.
47 * 47 *
48 * NoScale - no scaling of image will be performed 48 * NoScale - no scaling of image will be performed
49 * SmallIcon - image will be scaled based using SmallIconSize value 49 * SmallIcon - image will be scaled based using SmallIconSize value
50 * for width and height 50 * for width and height
51 * BigIcon - image will be scaled based on BigIconSize value for 51 * BigIcon - image will be scaled based on BigIconSize value for
52 * width and height 52 * width and height
53 * 53 *
54 * Note: SmallIconSize and BigIconSize are run-time configuration 54 * Note: SmallIconSize and BigIconSize are run-time configuration
55 * options defined in qpe.conf (Appearance section) 55 * options defined in qpe.conf (Appearance section)
56 */ 56 */
57 enum Scale { NoScale = 0, SmallIcon, BigIcon }; 57 enum Scale { NoScale = 0, SmallIcon, BigIcon };
58 58
59 /** 59 /**
60 * Constructor 60 * Constructor
61 */ 61 */
62 OResource() {} 62 OResource() {}
63 63
64 /** 64 /**
65 * @fn loadImage( const QString &name, Scale scale = NoScale ) 65 * @fn loadImage( const QString &name, Scale scale = NoScale )
66 * @brief Load specified image. 66 * @brief Load specified image.
67 * 67 *
68 * @param name - name of pixmap image to load 68 * @param name - name of pixmap image to load
69 * @param scale - scaling (if any) to preform on image 69 * @param scale - scaling (if any) to preform on image
70 * 70 *
71 * @return QImage containing image loaded (and scaled if appropriate) 71 * @return QImage containing image loaded (and scaled if appropriate)
72 **/ 72 **/
73 static QImage loadImage( const QString &name, Scale scale = NoScale ); 73 static QImage loadImage( const QString &name, Scale scale = NoScale );
74 74
75 /** 75 /**
76 * @fn loadPixmap( const QString &name, Scale scale = NoScale ) 76 * @fn loadPixmap( const QString &name, Scale scale = NoScale )
77 * @brief Load specified image. 77 * @brief Load specified image.
78 * 78 *
79 * @param name - name of pixmap image to load 79 * @param name - name of pixmap image to load
80 * @param scale - scaling (if any) to preform on image 80 * @param scale - scaling (if any) to preform on image
81 * 81 *
82 * @return QPixmap containing image loaded (and scaled if appropriate) 82 * @return QPixmap containing image loaded (and scaled if appropriate)
83 **/ 83 **/
84 static QPixmap loadPixmap( const QString &name, Scale scale = NoScale ); 84 static QPixmap loadPixmap( const QString &name, Scale scale = NoScale );
85
86 /**
87 * @fn findPixmap( const QString &name )
88 * @brief Retrieve fully qualified filename of image.
89 *
90 * @param name - name of pixmap image to retrieve filename of
91 *
92 * @return QString containing fully qualified filename of image
93 * (Null string if image is not found)
94 **/
95 static QString findPixmap( const QString &name );
85}; 96};
86 97
87} // namespace Core 98} // namespace Core
88} // namespace Opie 99} // namespace Opie
89 100
90#endif 101#endif