summaryrefslogtreecommitdiff
path: root/library/resource.cpp
Side-by-side diff
Diffstat (limited to 'library/resource.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/resource.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/library/resource.cpp b/library/resource.cpp
index dc19880..0915c45 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -67,9 +67,9 @@ QBitmap Resource::loadBitmap( const QString &pix )
}
/*!
Returns the filename of a pixmap named \a pix. You should avoid including
- any filename type extension (eg. .png, .xpm).
+ any filename type extension (eg. .png, .xpm .jpg .jpeg).
Normally you will use loadPixmap() rather than this function.
*/
QString Resource::findPixmap( const QString &pix )
@@ -77,8 +77,12 @@ QString Resource::findPixmap( const QString &pix )
QString picsPath = QPEApplication::qpeDir() + "pics/";
if ( QFile( picsPath + pix + ".png").exists() )
return picsPath + pix + ".png";
+ else if ( QFile( picsPath + pix + ".jpeg").exists() )
+ return picsPath + pix + ".jpeg";
+ else if ( QFile( picsPath + pix + ".jpg").exists() )
+ return picsPath + pix + ".jpg";
else if ( QFile( picsPath + pix + ".xpm").exists() )
return picsPath + pix + ".xpm";
else if ( QFile( picsPath + pix ).exists() )
return picsPath + pix;
@@ -116,9 +120,9 @@ QStringList Resource::allSounds()
}
/*!
Returns the QImage named \a name. You should avoid including
- any filename type extension (eg. .png, .xpm).
+ any filename type extension (eg. .png, .xpm .jpg).
*/
QImage Resource::loadImage( const QString &name)
{
QImage img = qembed_findImage(name.latin1());