| -rw-r--r-- | library/resource.cpp | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/library/resource.cpp b/library/resource.cpp index 43fdc60..cfa0d26 100644 --- a/library/resource.cpp +++ b/library/resource.cpp @@ -41,77 +41,52 @@ static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET"); The resources may be provided from files or other sources. The allSounds() function returns a list of all the sounds available. A particular sound can be searched for using findSound(). Images can be loaded with loadImage(), loadPixmap(), loadBitmap() and loadIconSet(). \ingroup qtopiaemb */ /*! \fn Resource::Resource() \internal */ /*! Returns the QPixmap called \a pix. You should avoid including any filename type extension (e.g. .png, .xpm). */ QPixmap Resource::loadPixmap( const QString &pix ) { QPixmap pm; - - // Give the pixmaps some kind of namespace in the pixmapcache - int index = pix.find('/'); - QString appName1 = qApp->argv()[0]; - appName1 = appName1.replace(QRegExp(".*/"),""); - QString appName2 = pix.left(index); - - if ( appName2 == "" || appName2 == pix || appName2 == "icons" ) - appName2 = "Global"; - - QString appKey1 = "_QPE_" + appName1 + "_" + pix; - QString appKey2 = "_QPE_" + appName2 + "_" + pix.mid(index+1); - - if ( !QPixmapCache::find(appKey1, pm) ) { - if ( !QPixmapCache::find(appKey2, pm) ) { - QImage img; - QString f = findPixmap( pix ); - if ( !f.isEmpty() ) { - img.load(f); - if ( !img.isNull() ) { - pm.convertFromImage(img); - if ( f.contains(appName1) ) { - QPixmapCache::insert( appKey1, pm); - } else { - QPixmapCache::insert( appKey2, pm); - } - } - } - } + QString key="QPE_"+pix; + if ( !QPixmapCache::find(key,pm) ) { + pm.convertFromImage(loadImage(pix)); + QPixmapCache::insert(key,pm); } return pm; } /*! Returns the QBitmap called \a pix. You should avoid including any filename type extension (e.g. .png, .xpm). */ QBitmap Resource::loadBitmap( const QString &pix ) { QBitmap bm; bm = loadPixmap(pix); return bm; } /*! Returns the filename of a pixmap called \a pix. You should avoid including any filename type extension (e.g. .png, .xpm). Normally you will use loadPixmap() rather than this function. */ QString Resource::findPixmap( const QString &pix ) { QString picsPath = QPEApplication::qpeDir() + "pics/"; |