| author | zecke <zecke> | 2002-05-16 15:56:24 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-05-16 15:56:24 (UTC) |
| commit | b94bd6003bf7c2024b0f254805f54ff4e52ead6e (patch) (side-by-side diff) | |
| tree | 8e137366438872bbd2ca03256678c9a2d10d7517 /library | |
| parent | 0292492b1c9570a896ac4b9acfe168724e8439f9 (diff) | |
| download | opie-b94bd6003bf7c2024b0f254805f54ff4e52ead6e.zip opie-b94bd6003bf7c2024b0f254805f54ff4e52ead6e.tar.gz opie-b94bd6003bf7c2024b0f254805f54ff4e52ead6e.tar.bz2 | |
Some ole docu and search for jpgs too in Resource PNG, JPG, XPM
| -rw-r--r-- | library/global.cpp | 14 | ||||
| -rw-r--r-- | library/resource.cpp | 8 |
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 @@ -658,2 +658,16 @@ void Global::findDocuments(DocLnkSet* folder, const QString &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; diff --git a/library/resource.cpp b/library/resource.cpp index dc19880..0915c45 100644 --- a/library/resource.cpp +++ b/library/resource.cpp @@ -70,3 +70,3 @@ 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). @@ -80,2 +80,6 @@ QString Resource::findPixmap( const QString &pix ) 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() ) @@ -119,3 +123,3 @@ 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). */ |