2 files changed, 20 insertions, 2 deletions

diff --git a/library/global.cpp b/library/global.cpp
index 4f1cc38..edb7b85 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -653,12 +653,26 @@ QString Global::stringQuote(const QString& s)
 */
 void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
 {
     QString homedocs = QString(getenv("HOME")) + "/Documents";
     DocLnkSet d(homedocs,mimefilter);
     folder->appendFrom(d);
+    /** let's do intellegint way of searching these files
+     *  a) the user don't want to check mediums global
+     *  b) the user wants to check but use the global options for it
+     *  c) the user wants to check it but not this medium
+     *  d) the user wants to check and this medium as well
+     * 
+     *  In all cases we need to apply a different mimefilter to 
+     *  the medium.
+     *  a) mimefilter.isEmpty() we need to apply the responding filter
+     *     either the global or the one on the medium
+     *
+     *  b) mimefilter is set to an application we need to find out if the
+     *     mimetypes are included in the mime mask of the medium
+     */
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     for ( ; it.current(); ++it ) {
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
         // this is a candidate look at the cf and see if we should search on it 
diff --git a/library/resource.cpp b/library/resource.cpp
index dc19880..0915c45 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -65,22 +65,26 @@ QBitmap Resource::loadBitmap( const QString &pix )
     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());
@@ -114,13 +118,13 @@ QStringList Resource::allSounds()
         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));