summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/resource.cpp11
-rw-r--r--library/resource.h9
2 files changed, 20 insertions, 0 deletions
diff --git a/library/resource.cpp b/library/resource.cpp
index 18139b9..da09892 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -27,2 +27,8 @@
27 27
28/*
29 * enable or disable the search for the icon without .png or .xpm
30 * suffix. We would use MimeType to lookup possible extensions...
31 */
32bool qpe_fast_findPixmap = false; // visible in libqpe
33
28// this namespace is just a workaround for a gcc bug 34// this namespace is just a workaround for a gcc bug
@@ -74,2 +80,4 @@ QPixmap Resource::loadPixmap( const QString &pix )
74 } 80 }
81 }else {
82 qWarning("In Cache for %s pixmap %s", qApp->argv()[0], pix.local8Bit().data() );
75 } 83 }
@@ -142,2 +150,4 @@ QString Resource::findPixmap( const QString &pix )
142 150
151 if ( !qpe_fast_findPixmap ) {
152 printf("Doing slow search for %s %s\n", qApp->argv()[0], pix.local8Bit().data() );
143 // All formats... 153 // All formats...
@@ -153,2 +163,3 @@ QString Resource::findPixmap( const QString &pix )
153 return picsPath + pix; 163 return picsPath + pix;
164 }
154 165
diff --git a/library/resource.h b/library/resource.h
index 1f1ba9a..4a3502a 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -44,2 +44,3 @@ public:
44 44
45extern bool qpe_fast_findPixmap;
45// Inline for compatibility with SHARP ROMs 46// Inline for compatibility with SHARP ROMs
@@ -47,2 +48,8 @@ inline QIconSet Resource::loadIconSet( const QString &pix )
47{ 48{
49 /*
50 * disable the slow load
51 */
52 bool oldMode = qpe_fast_findPixmap;
53 qpe_fast_findPixmap = true;
54
48 QPixmap dpm = loadPixmap( pix + "_disabled" ); 55 QPixmap dpm = loadPixmap( pix + "_disabled" );
@@ -52,2 +59,4 @@ inline QIconSet Resource::loadIconSet( const QString &pix )
52 is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled ); 59 is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled );
60
61 qpe_fast_findPixmap = oldMode;
53 return is; 62 return is;