-rw-r--r-- | libopie2/opiecore/oresource.cpp | 5 | ||||
-rw-r--r-- | libopie2/opiecore/oresource.h | 11 |
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 | |||
@@ -75,13 +75,18 @@ QImage OResource::loadImage( const QString &name, Scale scale ) | |||
75 | 75 | ||
76 | QPixmap OResource::loadPixmap( const QString &name, Scale scale ) | 76 | QPixmap 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 | ||
83 | QString 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 | |||
@@ -77,14 +77,25 @@ class OResource | |||
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 |