summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-18 19:10:20 (UTC)
committer zecke <zecke>2004-02-18 19:10:20 (UTC)
commit859ad22772e90dfbd4a8c0760ddc52d451f50011 (patch) (unidiff)
treef5c37a68dd06326703205f665aa193ce16481b6c
parent7d16774139aa40fb812d636bcf9ad3f45aa2b9e1 (diff)
downloadopie-859ad22772e90dfbd4a8c0760ddc52d451f50011.zip
opie-859ad22772e90dfbd4a8c0760ddc52d451f50011.tar.gz
opie-859ad22772e90dfbd4a8c0760ddc52d451f50011.tar.bz2
Commit the patch to allow overwriting the inline image
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/resource.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/library/resource.cpp b/library/resource.cpp
index 4108883..f70658d 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -36,6 +36,8 @@ namespace {
36#include "inlinepics_p.h" 36#include "inlinepics_p.h"
37} 37}
38 38
39static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET");
40
39/*! 41/*!
40 \class Resource resource.h 42 \class Resource resource.h
41 \brief The Resource class provides access to named resources. 43 \brief The Resource class provides access to named resources.
@@ -159,7 +161,19 @@ QStringList Resource::allSounds()
159 161
160static QImage load_image(const QString &name) 162static QImage load_image(const QString &name)
161{ 163{
164 if (g_notUseSet ) {
165 // try file
166 QImage img;
167 QString f = Resource::findPixmap(name);
168 if ( !f.isEmpty() )
169 img.load(f);
170 if (img.isNull() )
171 img = qembed_findImage(name.latin1() );
172 return img;
173 }
174 else{
162 QImage img = qembed_findImage(name.latin1()); 175 QImage img = qembed_findImage(name.latin1());
176
163 if ( img.isNull() ) { 177 if ( img.isNull() ) {
164 // No inlined image, try file 178 // No inlined image, try file
165 QString f = Resource::findPixmap(name); 179 QString f = Resource::findPixmap(name);
@@ -168,6 +182,7 @@ static QImage load_image(const QString &name)
168 } 182 }
169 return img; 183 return img;
170} 184}
185}
171 186
172/*! 187/*!
173 Returns the QImage called \a name. You should avoid including 188 Returns the QImage called \a name. You should avoid including