summaryrefslogtreecommitdiff
path: root/library
Unidiff
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp14
-rw-r--r--library/resource.cpp8
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)
653*/ 653*/
654void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter) 654void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
655{ 655{
656 QString homedocs = QString(getenv("HOME")) + "/Documents"; 656 QString homedocs = QString(getenv("HOME")) + "/Documents";
657 DocLnkSet d(homedocs,mimefilter); 657 DocLnkSet d(homedocs,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;
660 const QList<FileSystem> &fs = storage.fileSystems(); 674 const QList<FileSystem> &fs = storage.fileSystems();
661 QListIterator<FileSystem> it ( fs ); 675 QListIterator<FileSystem> it ( fs );
662 for ( ; it.current(); ++it ) { 676 for ( ; it.current(); ++it ) {
663 if ( (*it)->isRemovable() ) { // let's find out if we should search on it 677 if ( (*it)->isRemovable() ) { // let's find out if we should search on it
664 // this is a candidate look at the cf and see if we should search on it 678 // 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 )
65 bm = loadPixmap(pix); 65 bm = loadPixmap(pix);
66 return bm; 66 return bm;
67} 67}
68 68
69/*! 69/*!
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
73 Normally you will use loadPixmap() rather than this function. 73 Normally you will use loadPixmap() rather than this function.
74*/ 74*/
75QString Resource::findPixmap( const QString &pix ) 75QString Resource::findPixmap( const QString &pix )
76{ 76{
77 QString picsPath = QPEApplication::qpeDir() + "pics/"; 77 QString picsPath = QPEApplication::qpeDir() + "pics/";
78 78
79 if ( QFile( picsPath + pix + ".png").exists() ) 79 if ( QFile( picsPath + pix + ".png").exists() )
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() )
82 return picsPath + pix + ".xpm"; 86 return picsPath + pix + ".xpm";
83 else if ( QFile( picsPath + pix ).exists() ) 87 else if ( QFile( picsPath + pix ).exists() )
84 return picsPath + pix; 88 return picsPath + pix;
85 89
86 //qDebug("Cannot find pixmap: %s", pix.latin1()); 90 //qDebug("Cannot find pixmap: %s", pix.latin1());
@@ -114,13 +118,13 @@ QStringList Resource::allSounds()
114 result.append((*i).replace(QRegExp("\\.wav"),"")); 118 result.append((*i).replace(QRegExp("\\.wav"),""));
115 return result; 119 return result;
116} 120}
117 121
118/*! 122/*!
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*/
122QImage Resource::loadImage( const QString &name) 126QImage Resource::loadImage( const QString &name)
123{ 127{
124 QImage img = qembed_findImage(name.latin1()); 128 QImage img = qembed_findImage(name.latin1());
125 if ( img.isNull() ) 129 if ( img.isNull() )
126 return QImage(findPixmap(name)); 130 return QImage(findPixmap(name));