summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/resource.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/resource.cpp b/library/resource.cpp
index 0920b67..6f164c7 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -57,96 +57,98 @@ namespace {
57*/ 57*/
58 58
59/*! 59/*!
60 Returns the QPixmap called \a pix. You should avoid including 60 Returns the QPixmap called \a pix. You should avoid including
61 any filename type extension (e.g. .png, .xpm). 61 any filename type extension (e.g. .png, .xpm).
62*/ 62*/
63QPixmap Resource::loadPixmap( const QString &pix ) 63QPixmap Resource::loadPixmap( const QString &pix )
64{ 64{
65 QPixmap pm; 65 QPixmap pm;
66 QString key="QPE_"+pix; 66 QString key="QPE_"+pix;
67 if ( !QPixmapCache::find(key,pm) ) { 67 if ( !QPixmapCache::find(key,pm) ) {
68 pm.convertFromImage(loadImage(pix)); 68 pm.convertFromImage(loadImage(pix));
69 QPixmapCache::insert(key,pm); 69 QPixmapCache::insert(key,pm);
70 } 70 }
71 return pm; 71 return pm;
72} 72}
73 73
74/*! 74/*!
75 Returns the QBitmap called \a pix. You should avoid including 75 Returns the QBitmap called \a pix. You should avoid including
76 any filename type extension (e.g. .png, .xpm). 76 any filename type extension (e.g. .png, .xpm).
77*/ 77*/
78QBitmap Resource::loadBitmap( const QString &pix ) 78QBitmap Resource::loadBitmap( const QString &pix )
79{ 79{
80 QBitmap bm; 80 QBitmap bm;
81 bm = loadPixmap(pix); 81 bm = loadPixmap(pix);
82 return bm; 82 return bm;
83} 83}
84 84
85/*! 85/*!
86 Returns the filename of a pixmap called \a pix. You should avoid including 86 Returns the filename of a pixmap called \a pix. You should avoid including
87 any filename type extension (e.g. .png, .xpm). 87 any filename type extension (e.g. .png, .xpm).
88 88
89 Normally you will use loadPixmap() rather than this function. 89 Normally you will use loadPixmap() rather than this function.
90*/ 90*/
91QString Resource::findPixmap( const QString &pix ) 91QString Resource::findPixmap( const QString &pix )
92{ 92{
93 QString picsPath = QPEApplication::qpeDir() + "pics/"; 93 QString picsPath = QPEApplication::qpeDir() + "pics/";
94 94
95 QString f; 95 QString f;
96 96
97 // Common case optimizations... 97 // Common case optimizations...
98 f = picsPath + pix + ".png"; 98 f = picsPath + pix + ".png";
99 if ( QFile( f ).exists() ) 99 if ( QFile( f ).exists() )
100 return f; 100 return f;
101 f = picsPath + pix + ".xpm"; 101 f = picsPath + pix + ".xpm";
102 if ( QFile( f ).exists() ) 102 if ( QFile( f ).exists() )
103 return f; 103 return f;
104 104
105 qDebug ( "\nLoading of image '%s' is not ideal (either it doesn't exist or an extension was specified)\n", pix.latin1());
106
105 // All formats... 107 // All formats...
106 QStrList fileFormats = QImageIO::inputFormats(); 108 QStrList fileFormats = QImageIO::inputFormats();
107 QString ff = fileFormats.first(); 109 QString ff = fileFormats.first();
108 while ( fileFormats.current() ) { 110 while ( fileFormats.current() ) {
109 QStringList exts = MimeType("image/"+ff.lower()).extensions(); 111 QStringList exts = MimeType("image/"+ff.lower()).extensions();
110 for ( QStringList::ConstIterator it = exts.begin(); it!=exts.end(); ++it ) { 112 for ( QStringList::ConstIterator it = exts.begin(); it!=exts.end(); ++it ) {
111 QString f = picsPath + pix + "." + *it; 113 QString f = picsPath + pix + "." + *it;
112 if ( QFile(f).exists() ) 114 if ( QFile(f).exists() )
113 return f; 115 return f;
114 } 116 }
115 ff = fileFormats.next(); 117 ff = fileFormats.next();
116 } 118 }
117 119
118 // Finally, no (or existing) extension... 120 // Finally, no (or existing) extension...
119 if ( QFile( picsPath + pix ).exists() ) 121 if ( QFile( picsPath + pix ).exists() )
120 return picsPath + pix; 122 return picsPath + pix;
121 123
122 //qDebug("Cannot find pixmap: %s", pix.latin1()); 124 //qDebug("Cannot find pixmap: %s", pix.latin1());
123 return QString(); 125 return QString();
124} 126}
125 127
126/*! 128/*!
127 Returns a sound file for a sound called \a name. 129 Returns a sound file for a sound called \a name.
128 130
129 You should avoid including any filename type extension (e.g. .wav), 131 You should avoid including any filename type extension (e.g. .wav),
130 as the system will search for only those fileformats which are supported 132 as the system will search for only those fileformats which are supported
131 by the library. 133 by the library.
132 134
133 Currently, only WAV files are supported. 135 Currently, only WAV files are supported.
134*/ 136*/
135QString Resource::findSound( const QString &name ) 137QString Resource::findSound( const QString &name )
136{ 138{
137 QString picsPath = QPEApplication::qpeDir() + "sounds/"; 139 QString picsPath = QPEApplication::qpeDir() + "sounds/";
138 140
139 QString result; 141 QString result;
140 if ( QFile( (result = picsPath + name + ".wav") ).exists() ) 142 if ( QFile( (result = picsPath + name + ".wav") ).exists() )
141 return result; 143 return result;
142 144
143 return QString(); 145 return QString();
144} 146}
145 147
146/*! 148/*!
147 Returns a list of all sound names. 149 Returns a list of all sound names.
148*/ 150*/
149QStringList Resource::allSounds() 151QStringList Resource::allSounds()
150{ 152{
151 QDir resourcedir( QPEApplication::qpeDir() + "sounds/", "*.wav" ); 153 QDir resourcedir( QPEApplication::qpeDir() + "sounds/", "*.wav" );
152 QStringList entries = resourcedir.entryList(); 154 QStringList entries = resourcedir.entryList();