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
@@ -55,42 +55,46 @@ QPixmap Resource::loadPixmap( const QString &pix )
     return pm;
 }
 
 /*!
   Returns the QBitmap named \a pix. You should avoid including
   any filename type extension (eg. .png, .xpm).
 */
 QBitmap Resource::loadBitmap( const QString &pix ) 
 {
     QBitmap bm;
     bm = loadPixmap(pix);
     return bm;
 }
 
 /*!
   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 )
 {
     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;
 
     //qDebug("Cannot find pixmap: %s", pix.latin1());
     return QString();
 }
 
 /*!
   Returns a sound file for a sound named \a name.
   You should avoid including any filename type extension (eg. .wav, .au, .mp3).
 */
 QString Resource::findSound( const QString &name )
 {
     QString picsPath = QPEApplication::qpeDir() + "sounds/";
@@ -104,33 +108,33 @@ QString Resource::findSound( const QString &name )
 
 /*!
   Returns a list of all sound names.
 */
 QStringList Resource::allSounds()
 {
     QDir resourcedir( QPEApplication::qpeDir() + "sounds/", "*.wav" );
     QStringList entries = resourcedir.entryList();
     QStringList result;
     for (QStringList::Iterator i=entries.begin(); i != entries.end(); ++i)
         result.append((*i).replace(QRegExp("\\.wav"),""));
     return result;
 }
 
 /*!
   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());
     if ( img.isNull() )
         return QImage(findPixmap(name));
     return img;
 }
 
 /*!
   \fn QIconSet Resource::loadIconSet( const QString &name ) 
 
   Returns a QIconSet for the pixmap named \a name.  A disabled icon is
   generated that conforms to the Qtopia look & feel.  You should avoid
   including any filename type extension (eg. .png, .xpm).
 */