re-enabled the cache as designed.

for that, pixcache has now a method setting the size of cache (parameter count
of pix) and it will switched between the different views.
setPixmap is overloaded that way, that we don't store the pix inside the
item but calling calcRect which is accessing the cached pixmap. voila.
Zecke: Should we make a configure item where users can setup how much
pix-previews should cache? Should we setup a thumbnail cache like .xvpics?

3 files changed, 26 insertions, 9 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 039f53f..d546b64 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -54,3 +54,5 @@ namespace {
         void setTextOnly(bool how){m_textOnly=how;}
+        /* just for starting recalc of item rect! */
         virtual void setPixmap( const QPixmap & icon, bool recalc, bool redraw = TRUE );
+        /* just for starting recalc of item rect! */
         virtual void setPixmap( const QPixmap & icon);
@@ -101,3 +103,3 @@ namespace {
         m_Pixset = true;
-        QIconViewItem::setPixmap(icon,recalc,redraw);
+        calcRect(text());
     }
@@ -106,3 +108,3 @@ namespace {
         m_Pixset = true;
-        QIconViewItem::setPixmap(icon);
+        calcRect(text());
     }
@@ -127,3 +129,3 @@ namespace {
             m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 );
-            if (!m_pix && !g_stringPix.contains( m_path )&&!m_Pixset) {
+            if (!m_pix && !g_stringPix.contains( m_path )) {
                 currentView()->dirLister()->thumbNail( m_path, 64, 64 );
@@ -131,5 +133,2 @@ namespace {
             }
-            if (m_Pixset) {
-                return QIconViewItem::pixmap();
-            }
             return m_pix ? m_pix : _unkPix;
@@ -411,5 +410,9 @@ void PIconView::addFiles(  const QStringList& lst) {
         _iv = new IconViewItem( m_view, m_path+"/"+(*it), (*it) );
-        if (m_mode==3) _iv->setTextOnly(true);
+        if (m_mode==3) {
+            _iv->setTextOnly(true);
+            _iv->setPixmap(QPixmap());
+        } else {
         if (m_pix) _iv->setPixmap(*m_pix);
     }
+    }
 
@@ -594,4 +597,5 @@ void PIconView::calculateGrid() {
         case 2:
-            m_view->setGridX(80);
-            m_view->setGridY(80);
+            m_view->setGridX(50);
+            m_view->setGridY(20);
+            PPixmapCache::self()->setMaxImages(40);
             break;
@@ -600,2 +604,3 @@ void PIconView::calculateGrid() {
             m_view->setGridY(8);
+            PPixmapCache::self()->setMaxImages(2);
             break;
@@ -605,2 +610,3 @@ void PIconView::calculateGrid() {
             m_view->setGridY(80);
+            PPixmapCache::self()->setMaxImages(20);
             break;
diff --git a/noncore/graphics/opie-eye/lib/imagecache.cpp b/noncore/graphics/opie-eye/lib/imagecache.cpp
index 3b74a83..f1042a4 100644
--- a/noncore/graphics/opie-eye/lib/imagecache.cpp
+++ b/noncore/graphics/opie-eye/lib/imagecache.cpp
@@ -64,2 +64,8 @@ PPixmapCache::~PPixmapCache() {
 
+void PPixmapCache::setMaxImages(unsigned int aMax)
+{
+    m_MaxImages = aMax;
+    setMaxCost( 64*64*QPixmap::defaultDepth()/8*m_MaxImages);
+}
+
 PPixmapCache* PPixmapCache::self() {
diff --git a/noncore/graphics/opie-eye/lib/imagecache.h b/noncore/graphics/opie-eye/lib/imagecache.h
index 076ecd3..939247a 100644
--- a/noncore/graphics/opie-eye/lib/imagecache.h
+++ b/noncore/graphics/opie-eye/lib/imagecache.h
@@ -30,2 +30,5 @@ private:
     ~PPixmapCache();
+
+    unsigned int m_MaxImages;
+
 public:
@@ -35,2 +38,4 @@ public:
     void insertImage( const QString& path, const QPixmap *, int width, int height );
+    void setMaxImages(unsigned int aMax);
+    unsigned int maxImages()const{return m_MaxImages;}
 };