-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) | |||
658 | folder->appendFrom(d); | 658 | folder->appendFrom(d); |
659 | /** let's do intellegint way of searching these files | ||
660 | * a) the user don't want to check mediums global | ||
661 | * b) the user wants to check but use the global options for it | ||
662 | * c) the user wants to check it but not this medium | ||
663 | * d) the user wants to check and this medium as well | ||
664 | * | ||
665 | * In all cases we need to apply a different mimefilter to | ||
666 | * the medium. | ||
667 | * a) mimefilter.isEmpty() we need to apply the responding filter | ||
668 | * either the global or the one on the medium | ||
669 | * | ||
670 | * b) mimefilter is set to an application we need to find out if the | ||
671 | * mimetypes are included in the mime mask of the medium | ||
672 | */ | ||
659 | StorageInfo storage; | 673 | 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 ) | |||
70 | Returns the filename of a pixmap named \a pix. You should avoid including | 70 | Returns the filename of a pixmap named \a pix. You should avoid including |
71 | any filename type extension (eg. .png, .xpm). | 71 | any filename type extension (eg. .png, .xpm .jpg .jpeg). |
72 | 72 | ||
@@ -80,2 +80,6 @@ QString Resource::findPixmap( const QString &pix ) | |||
80 | return picsPath + pix + ".png"; | 80 | return picsPath + pix + ".png"; |
81 | else if ( QFile( picsPath + pix + ".jpeg").exists() ) | ||
82 | return picsPath + pix + ".jpeg"; | ||
83 | else if ( QFile( picsPath + pix + ".jpg").exists() ) | ||
84 | return picsPath + pix + ".jpg"; | ||
81 | else if ( QFile( picsPath + pix + ".xpm").exists() ) | 85 | else if ( QFile( picsPath + pix + ".xpm").exists() ) |
@@ -119,3 +123,3 @@ QStringList Resource::allSounds() | |||
119 | Returns the QImage named \a name. You should avoid including | 123 | Returns the QImage named \a name. You should avoid including |
120 | any filename type extension (eg. .png, .xpm). | 124 | any filename type extension (eg. .png, .xpm .jpg). |
121 | */ | 125 | */ |