1 files changed, 79 insertions, 30 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ff26133..c9efacb 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -23,48 +23,49 @@
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/categoryselect.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/resource.h>
 using namespace Opie::Core;
 
 #include <qpe/qcopenvelope_qws.h>
 
 /* QT */
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qiconview.h>
 #include <qobjectlist.h>
 
 
 // These define how the busy icon is animated and highlighted
 #define BRIGHTEN_BUSY_ICON
 //#define ALPHA_FADE_BUSY_ICON
 //#define USE_ANIMATED_BUSY_ICON_OVERLAY
 #define BOUNCE_BUSY_ICON
 
+typedef QMap<QString,QPixmap>::Iterator pixiter;
 
 class BgPixmap
 {
 public:
     BgPixmap( const QPixmap &p ) : pm(p), ref(1) {}
     QPixmap pm;
     int ref;
 };
 
 
 static QMap<QString,BgPixmap*> *bgCache = 0;
 
 static void cleanup_cache()
 {
     QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
     while ( it != bgCache->end() ) {
     QMap<QString,BgPixmap*>::Iterator curr = it;
     ++it;
     delete (*curr);
     bgCache->remove( curr );
     }
     delete bgCache;
     bgCache = 0;
 }
@@ -84,67 +85,69 @@ public:
 
     AppLnk *appLnk() const { return app; }
     AppLnk *takeAppLnk() { AppLnk* r=app; app=0; return r; }
 
     void animateIcon();
     void resetIcon();
     bool isEyeImage()const{return m_EyeImage;}
 
     virtual int compare ( QIconViewItem * i ) const;
     void paintItem( QPainter *p, const QColorGroup &cg );
 
     void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
     void setEyePixmap(const QPixmap&aIcon);
     virtual QPixmap*pixmap()const;
 
 protected:
     bool isBigIcon;
     int iteration;
     AppLnk* app;
 
 private:
     void paintAnimatedIcon( QPainter *p );
     BusyIndicatorType busyType;
     int psize;
-    QPixmap m_iPixmap;
     bool m_EyeImage;
     iconstate_t m_EyeImageSet;
 };
 
 LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
     : QIconViewItem( parent, applnk->name(),
            bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
     isBigIcon( bigIcon ),
     iteration(0),
     app(applnk), // Takes ownership
     psize( (bigIcon ? applnk->bigPixmap().width() :applnk->pixmap().width() ) ),
-    m_iPixmap(),
     m_EyeImage(false),
     m_EyeImageSet(BASE_ICON)
 {
     if (applnk->type().lower().startsWith("image/") && applnk->exec().contains("opie-eye",false)) {
         m_EyeImage = true;
-        m_iPixmap = (bigIcon ? applnk->bigPixmap():applnk->pixmap());
+        QMap<QString,QPixmap>::Iterator it = LauncherIconView::sm_EyeCache->find(applnk->file());
+        if (it != LauncherIconView::sm_EyeCache->end()) {
+            m_EyeImageSet = EYE_ICON;
+            setPixmap(*it);
+        }
     }
 }
 
 LauncherItem::~LauncherItem()
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
     if ( liv->busyItem() == this )
         liv->setBusy(FALSE);
     delete app;
 }
 
 QPixmap*LauncherItem::pixmap()const
 {
     if (m_EyeImage && m_EyeImageSet == BASE_ICON) {
         LauncherIconView* liv = (LauncherIconView*)iconView();
         liv->requestEyePix(this);
     }
     return QIconViewItem::pixmap();
 }
 
 int LauncherItem::compare ( QIconViewItem * i ) const
 {
     LauncherIconView* view = (LauncherIconView*)iconView();
     return view->compare(app,((LauncherItem *)i)->appLnk());
@@ -192,102 +195,118 @@ void LauncherItem::paintAnimatedIcon( QPainter *p )
 #ifdef BOUNCE_BUSY_ICON
     if ( busyType == BIT_Animated ) {
        bounceY = 4 - ((iteration+2)%8);
        bounceY = bounceY < 0 ? -bounceY : bounceY;
     }
 #endif
     p2.drawPixmap( x1, y1 + bounceY, *pixmap() );
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
 #else
     Q_UNUSED( pic )
 #endif
     p->drawPixmap( x1, y1, dblBuf );
 }
 
 void LauncherItem::animateIcon()
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
 
     if ( liv->busyItem() != this || !app )
     return;
 
     // Highlight the icon
     if ( iteration == 0 ) {
-        QPixmap src = (isEyeImage()?m_iPixmap:(isBigIcon ? app->bigPixmap() : app->pixmap()));
+        QPixmap src;
+        pixiter it;
+        if (isEyeImage() && (it=LauncherIconView::sm_EyeCache->find(appLnk()->file()))!=LauncherIconView::sm_EyeCache->end()) {
+            src = (*it);
+        } else {
+            src = ((isBigIcon ? app->bigPixmap() : app->pixmap()));
+        }
         QImage img = src.convertToImage();
         QRgb *rgb;
         int count;
         if ( img.depth() == 32 ) {
             rgb = (QRgb*)img.bits();
             count = img.bytesPerLine()/sizeof(QRgb)*img.height();
         } else {
             rgb = img.colorTable();
             count = img.numColors();
         }
         for ( int r = 0; r < count; r++, rgb++ ) {
 #if defined(BRIGHTEN_BUSY_ICON)
             QColor c(*rgb);
             int h, s, v;
             c.hsv(&h,&s,&v);
             c.setHsv(h,QMAX(s-24,0),QMIN(v+48,255));
             *rgb = qRgba(c.red(),c.green(),c.blue(),qAlpha(*rgb));
 #elif defined(ALPHA_FADE_BUSY_ICON)
             *rgb = qRgba(qRed(*rgb),qGreen(*rgb),qBlue(*rgb),qAlpha(*rgb)/2);
 #endif
         }
         src.convertFromImage( img );
         setPixmap( src );
     }
 
     iteration++;
 
     // Paint animation overlay
     QPainter p( liv->viewport() );
     paintAnimatedIcon( &p );
 }
 
 void LauncherItem::resetIcon()
 {
     iteration = 0;
-    setPixmap((isEyeImage()?m_iPixmap:(isBigIcon ? app->bigPixmap() : app->pixmap())));
+    if (isEyeImage()) {
+        QMap<QString,QPixmap>::Iterator it = LauncherIconView::sm_EyeCache->find(appLnk()->file());
+        if (it != LauncherIconView::sm_EyeCache->end()) {
+            setPixmap(*it);
+            return;
+        }
+    }
+    setPixmap(isBigIcon ? app->bigPixmap() : app->pixmap());
 }
 
 void LauncherItem::setEyePixmap(const QPixmap&aIcon)
 {
     if (!isEyeImage()) return;
-    m_iPixmap = aIcon;
     setPixmap(aIcon);
     m_EyeImageSet = EYE_ICON;
 }
 
 //===========================================================================
 // Implemantation of LauncherIconview start
 //===========================================================================
+
+QMap<QString,QPixmap>* LauncherIconView::sm_EyeCache=0;
+
 LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
     : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white)
 {
     m_EyeCallBack = 0;
+    if (!sm_EyeCache) sm_EyeCache = new QMap<QString,QPixmap>();
     sortmeth = Name;
     hidden.setAutoDelete(TRUE);
     ike = FALSE;
     calculateGrid( Bottom );
     connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer()));
 }
 
 LauncherIconView::~LauncherIconView()
 {
     odebug << "LauncherIconView::~LauncherIconView()" << oendl;
 #if 0 // debuggery
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
         ++it;
         //odebug << "" << l << ": hidden (should remove)" << oendl;
     }
 #endif
 }
 
 int LauncherIconView::compare(const AppLnk* a, const AppLnk* b)
 {
     switch (sortmeth) {
     case Name:
@@ -411,185 +430,207 @@ QStringList LauncherIconView::mimeTypes() const
         ++it;
     }
     r.sort();
     return r;
 }
 
 LauncherItem*LauncherIconView::findDocItem(const QString&fname)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         if (item->appLnk()->file()==fname) {
             break;
         }
         item = (LauncherItem*)item->nextItem();
     }
     return item;
 }
 
 void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,int width)
 {
     int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
     if (s!=width) return;
     LauncherItem*item = findDocItem(aFile);
     if (!item||!item->isEyeImage()) return;
+    (*sm_EyeCache)[aFile]=aPixmap;
     item->setEyePixmap(aPixmap);
 }
 
 void LauncherIconView::checkCallback()
 {
     if (!m_EyeCallBack) {
         m_EyeCallBack = new LauncherThumbReceiver();
         connect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)),
             this,SLOT(setEyePixmap(const QPixmap&,const QString&,int)));
-        m_eyeTimer.changeInterval(600000);
     }
+    m_eyeTimer.changeInterval(600000);
 }
 
 void LauncherIconView::addCheckItem(AppLnk* app)
 {
     LauncherItem*item = new LauncherItem( this, app, bigIcns );
     if (item->isEyeImage()) {
         checkCallback();
     }
 }
 
 void LauncherIconView::requestEyePix(const LauncherItem*item)
 {
     if (!item) return;
     if (item->isEyeImage()) {
         checkCallback();
         int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
         m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s);
     }
 }
 
 void LauncherIconView::stopEyeTimer()
 {
     if (m_EyeCallBack) {
+        disconnect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)),
+            this,SLOT(setEyePixmap(const QPixmap&,const QString&,int)));
         delete m_EyeCallBack;
         m_EyeCallBack=0;
     }
     m_eyeTimer.stop();
 }
 
-void LauncherIconView::addItem(AppLnk* app, bool resort)
-{
-    addCatsAndMimes(app);
-    if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
-     && (cf == 0 || app->categories().contains(cf)
-         || cf == -1 && app->categories().count() == 0 ) ) {
-        addCheckItem(app);
-    } else {
-        hidden.append(app);
-    }
-    if ( resort ){
-        sort();
-    }
-}
-
 void LauncherIconView::updateCategoriesAndMimeTypes()
 {
     mimes.clear();
     cats.clear();
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         addCatsAndMimes(item->appLnk());
         item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
         addCatsAndMimes(l);
         ++it;
     }
 }
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
     viewport()->setUpdatesEnabled( FALSE );
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         links.append(item->takeAppLnk());
         item = (LauncherItem*)item->nextItem();
     }
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
         addItem(l,FALSE);
         ++it;
     }
     if ( resort && !autoArrange() )
     sort();
     viewport()->setUpdatesEnabled( TRUE );
 }
 
-bool LauncherIconView::removeLink(const QString& linkfile)
+bool LauncherIconView::removeLink(const QString& linkfile,bool removeCache)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
         l = item->appLnk();
         LauncherItem *nextItem = (LauncherItem *)item->nextItem();
         if (  l->linkFileKnown() && l->linkFile() == linkfile || l->fileKnown() &&
                  ( l->file() == linkfile || dl.isValid() && dl.file() == l->file() ) ) {
+            if (removeCache) sm_EyeCache->remove(l->file());
             delete item;
             did = TRUE;
         }
         item = nextItem;
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
         ++it;
         if ( l->linkFileKnown() && l->linkFile() == linkfile
                 || l->file() == linkfile
                 || dl.isValid() && dl.file() == l->file() ) {
             hidden.removeRef(l);
            did = TRUE;
         }
     }
     return did;
 }
 
+void LauncherIconView::addItem(AppLnk* app, bool resort)
+{
+    addCatsAndMimes(app);
+    if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
+     && (cf == 0 || app->categories().contains(cf)
+         || cf == -1 && app->categories().count() == 0 ) ) {
+        addCheckItem(app);
+    } else {
+        hidden.append(app);
+    }
+    if ( resort ){
+        sort();
+    }
+}
+
+void LauncherIconView::changeItem(const AppLnk&old,AppLnk*nlink)
+{
+    QString oldfile = old.file();
+    QString newfile = nlink->file();
+
+    if (newfile != oldfile) {
+        QMap<QString,QPixmap>::Iterator it = sm_EyeCache->find(oldfile);
+        if (it != sm_EyeCache->end()) {
+            (*sm_EyeCache)[newfile]=(*it);
+        }
+        removeLink(old.linkFile());
+    } else {
+        removeLink(old.linkFile(),false);
+    }
+    addItem(nlink,false);
+}
+
 void LauncherIconView::timerEvent( QTimerEvent *te )
 {
     if ( te->timerId() == busyTimer ) {
         if ( bsy )
         bsy->animateIcon();
     } else {
         QIconView::timerEvent( te );
     }
 }
 
 void LauncherIconView::setBigIcons( bool bi )
 {
+    sm_EyeCache->clear();
     bigIcns = bi;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     busyPix.resize(0,0);
 #endif
 }
 
 QIconViewItem* LauncherIconView::busyItem() const
 {
     return bsy;
 }
 
 void LauncherIconView::setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
 
 void LauncherIconView::calculateGrid( ItemTextPos pos )
 {
         int dw = QApplication::desktop()->width();
         int viewerWidth = dw-style().scrollBarExtent().width();
         if ( pos == Bottom ) {
             int cols = 3;
             if ( viewerWidth <= 200 )
                 cols = 2;
             else if ( viewerWidth >= 400 )
                  cols = viewerWidth/96;
             setSpacing( 4 );
@@ -735,50 +776,53 @@ void LauncherView::updateTools()
             if ( app )
                 t = app->name();
             else
                 t = t.mid(12);
         } else {
             t[0] = t[0].upper();
         }
         types += t;
     }
     types << tr("All types");
     prev = typemb->currentText();
     typemb->clear();
     typemb->insertStringList(types);
     for (int i=0; i<typemb->count(); i++) {
         if ( typemb->text(i) == prev ) {
             typemb->setCurrentItem(i);
             break;
         }
     }
     if ( prev.isNull() ) {
         typemb->setCurrentItem(typemb->count()-1);
     }
 
     int pcat = catmb ? catmb->currentCategory() : -2;
-    if ( !catmb )
+    if ( !catmb ) {
         catmb = new CategorySelect(tools);
+    } else if (pcat!=-2) {
+
+    }
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
     catmb->setCategories( vl, "Document View", // No tr
         tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
     catmb->setCurrentCategory(pcat);
 
     // if type has changed we need to redisplay
     if ( typemb->currentText() != prev )
         showType( typemb->currentItem() );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
 void LauncherView::showType(int t)
 {
@@ -999,97 +1043,102 @@ void LauncherView::selectionChanged()
     AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
     if ( icons->inKeyEvent() ) // not for mouse press
         emit clicked( appLnk );
     item->setSelected(FALSE);
     }
 }
 
 void LauncherView::returnPressed( QIconViewItem *item )
 {
     if ( item ) {
     AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
     emit clicked( appLnk );
     }
 }
 
 void LauncherView::itemClicked( int btn, QIconViewItem *item )
 {
     if ( item ) {
     AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
     if ( btn == LeftButton ) {
         // Make sure it's the item we execute that gets highlighted
         icons->setCurrentItem( item );
         emit clicked( appLnk );
     }
-    item->setSelected(FALSE);
+        item->setSelected(FALSE);
     }
 }
 
 void LauncherView::itemPressed( int btn, QIconViewItem *item )
 {
     if ( item ) {
     AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
     if ( btn == RightButton )
         emit rightPressed( appLnk );
     else if ( btn == ShiftButton )
         emit rightPressed( appLnk );
     item->setSelected(FALSE);
     }
 }
 
 void LauncherView::removeAllItems()
 {
     odebug << "LauncherView::removeAllItems()" << oendl;
     icons->clear();
 }
 
 bool LauncherView::removeLink(const QString& linkfile)
 {
     return icons->removeLink(linkfile);
 }
 
+void LauncherView::addItem(AppLnk* app, bool resort)
+{
+    icons->addItem(app,resort);
+}
+
+void LauncherView::changeItem(const AppLnk&old,AppLnk*nlink)
+{
+    icons->changeItem(old,nlink);
+}
+
 void LauncherView::setSortEnabled( bool v )
 {
     icons->setSorting( v );
     if ( v )
     sort();
 }
 
 void LauncherView::setUpdatesEnabled( bool u )
 {
     icons->setUpdatesEnabled( u );
 }
 
 void LauncherView::sort()
 {
     icons->sort();
 }
 
-void LauncherView::addItem(AppLnk* app, bool resort)
-{
-    icons->addItem(app,resort);
-}
-
 void LauncherView::paletteChange( const QPalette &p )
 {
     icons->unsetPalette();
     QVBox::paletteChange( p );
     if ( bgType == Ruled )
     setBackgroundType( Ruled, QString::null );
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, textCol );
     icons->setPalette( QPalette(cg,cg,cg) );
 }
 
 void LauncherView::fontChanged(const QFont&)
 {
     odebug << "LauncherView::fontChanged()" << oendl;
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::relayout(void)
 {
     icons->hideOrShowItems(FALSE);
 }
 
 void LauncherView::flushBgCache()
 {