implemented icon cache so it will not scan every time when changing the

doctab categorie
ToDo: implement a cache flush

4 files changed, 113 insertions, 50 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 5ec1cf8..ccc2114 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -78,5 +78,5 @@ static bool isVisibleWindow( int );
 
 LauncherTabWidget::LauncherTabWidget( Launcher* parent ) :
-    QVBox( parent ), docview( 0 )
+    QVBox( parent ), docview( 0 ),docTabEnabled(true),m_DocumentTabId(0)
 {
     docLoadingWidgetEnabled = false;
@@ -129,5 +129,5 @@ void LauncherTabWidget::createDocLoadingWidget()
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
-    bool docTabEnabled = cfg.readBoolEntry( "Enable", true );
+    docTabEnabled = cfg.readBoolEntry( "Enable", true );
 
     QLabel *textLabel = new QLabel( docLoadingVBox );
@@ -170,5 +170,5 @@ void LauncherTabWidget::appMessage(const QCString& message, const QByteArray&)
 {
     if ( message == "nextView()" )
-    categoryBar->nextTab();
+        categoryBar->nextTab();
 }
 
@@ -176,9 +176,9 @@ void LauncherTabWidget::raiseTabWidget()
 {
     if ( categoryBar->currentView() == docView()
-     && docLoadingWidgetEnabled ) {
-    stack->raiseWidget( docLoadingWidget );
-    docLoadingWidget->updateGeometry();
+         && docLoadingWidgetEnabled ) {
+        stack->raiseWidget( docLoadingWidget );
+        docLoadingWidget->updateGeometry();
     } else {
-    stack->raiseWidget( categoryBar->currentView() );
+        stack->raiseWidget( categoryBar->currentView() );
     }
 }
@@ -193,5 +193,5 @@ void LauncherTabWidget::tabProperties()
     int rv = m->exec( QCursor::pos() );
     if ( rv >= 0 && rv != view->viewMode() ) {
-    view->setViewMode( (LauncherView::ViewMode)rv );
+        view->setViewMode( (LauncherView::ViewMode)rv );
     }
 
@@ -203,7 +203,7 @@ void LauncherTabWidget::deleteView( const QString& id )
     LauncherTab *t = categoryBar->launcherTab(id);
     if ( t ) {
-    stack->removeWidget( t->view );
-    delete t->view;
-    categoryBar->removeTab( t );
+        stack->removeWidget( t->view );
+        delete t->view;
+        categoryBar->removeTab( t );
     }
 }
@@ -217,12 +217,15 @@ LauncherView* LauncherTabWidget::newView( const QString& id, const QPixmap& pm,
         this, SIGNAL(rightPressed(AppLnk*)));
 
+
     int n = categoryBar->count();
+
     stack->addWidget( view, n );
 
     LauncherTab *tab = new LauncherTab( id, view, pm, label );
     categoryBar->insertTab( tab, n-1 );
-
-    if ( id == "Documents" )
-    docview = view;
+    if ( id == "Documents" ) {
+        docview = view;
+        m_DocumentTabId = n;
+    }
 
     odebug << "inserting " << id << " at " << n-1 << "" << oendl;
@@ -241,5 +244,5 @@ LauncherView *LauncherTabWidget::view( const QString &id )
     LauncherTab *t = categoryBar->launcherTab(id);
     if ( !t )
-    return 0;
+        return 0;
     return t->view;
 }
@@ -253,6 +256,6 @@ void LauncherTabWidget::setLoadingWidgetEnabled( bool v )
 {
     if ( v != docLoadingWidgetEnabled && docLoadingWidget ) {
-    docLoadingWidgetEnabled = v;
-    raiseTabWidget();
+        docLoadingWidgetEnabled = v;
+        raiseTabWidget();
     }
 }
@@ -605,5 +608,4 @@ void Launcher::properties( AppLnk *appLnk )
 
         if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) {
-            tabs->docView()->updateTools();
         }
     }
@@ -722,6 +724,11 @@ void Launcher::documentRemoved( const DocLnk& doc )
 void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc )
 {
+#if 0
     documentRemoved( oldDoc );
     documentAdded( newDoc );
+//    tabs->docView()->updateTools();
+#else
+    tabs->docView()->changeItem(oldDoc,new DocLnk(newDoc));
+#endif
 }
 
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index 2eaf77c..db6ac54 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -91,4 +91,6 @@ private:
     QProgressBar *docLoadingWidgetProgress;
     bool docLoadingWidgetEnabled;
+    bool docTabEnabled;
+    int m_DocumentTabId;
 };
 
@@ -136,5 +138,5 @@ signals:
 
 private slots:
-    void systemMessage( const QCString &, const QByteArray &);    
+    void systemMessage( const QCString &, const QByteArray &);
 
 protected:
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
@@ -45,4 +45,5 @@ using namespace Opie::Core;
 #define BOUNCE_BUSY_ICON
 
+typedef QMap<QString,QPixmap>::Iterator pixiter;
 
 class BgPixmap
@@ -106,5 +107,4 @@ private:
     BusyIndicatorType busyType;
     int psize;
-    QPixmap m_iPixmap;
     bool m_EyeImage;
     iconstate_t m_EyeImageSet;
@@ -118,5 +118,4 @@ LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
     app(applnk), // Takes ownership
     psize( (bigIcon ? applnk->bigPixmap().width() :applnk->pixmap().width() ) ),
-    m_iPixmap(),
     m_EyeImage(false),
     m_EyeImageSet(BASE_ICON)
@@ -124,5 +123,9 @@ LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
     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);
+        }
     }
 }
@@ -214,5 +217,11 @@ void LauncherItem::animateIcon()
     // 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;
@@ -250,5 +259,12 @@ 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());
 }
 
@@ -256,5 +272,4 @@ void LauncherItem::setEyePixmap(const QPixmap&aIcon)
 {
     if (!isEyeImage()) return;
-    m_iPixmap = aIcon;
     setPixmap(aIcon);
     m_EyeImageSet = EYE_ICON;
@@ -264,8 +279,12 @@ void LauncherItem::setEyePixmap(const QPixmap&aIcon)
 // 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);
@@ -433,4 +452,5 @@ void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,in
     LauncherItem*item = findDocItem(aFile);
     if (!item||!item->isEyeImage()) return;
+    (*sm_EyeCache)[aFile]=aPixmap;
     item->setEyePixmap(aPixmap);
 }
@@ -442,6 +462,6 @@ void LauncherIconView::checkCallback()
         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);
 }
 
@@ -467,4 +487,6 @@ 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;
@@ -473,19 +495,4 @@ void LauncherIconView::stopEyeTimer()
 }
 
-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()
 {
@@ -529,5 +536,5 @@ void LauncherIconView::hideOrShowItems(bool resort)
 }
 
-bool LauncherIconView::removeLink(const QString& linkfile)
+bool LauncherIconView::removeLink(const QString& linkfile,bool removeCache)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
@@ -540,4 +547,5 @@ bool LauncherIconView::removeLink(const QString& linkfile)
         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;
@@ -558,4 +566,36 @@ bool LauncherIconView::removeLink(const QString& linkfile)
 }
 
+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 )
 {
@@ -570,4 +610,5 @@ void LauncherIconView::timerEvent( QTimerEvent *te )
 void LauncherIconView::setBigIcons( bool bi )
 {
+    sm_EyeCache->clear();
     bigIcns = bi;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
@@ -757,6 +798,9 @@ void LauncherView::updateTools()
 
     int pcat = catmb ? catmb->currentCategory() : -2;
-    if ( !catmb )
+    if ( !catmb ) {
         catmb = new CategorySelect(tools);
+    } else if (pcat!=-2) {
+
+    }
     Categories cats( 0 );
     cats.load( categoryFileName() );
@@ -1021,5 +1065,5 @@ void LauncherView::itemClicked( int btn, QIconViewItem *item )
         emit clicked( appLnk );
     }
-    item->setSelected(FALSE);
+        item->setSelected(FALSE);
     }
 }
@@ -1048,4 +1092,14 @@ bool LauncherView::removeLink(const QString& 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 )
 {
@@ -1065,9 +1119,4 @@ void LauncherView::sort()
 }
 
-void LauncherView::addItem(AppLnk* app, bool resort)
-{
-    icons->addItem(app,resort);
-}
-
 void LauncherView::paletteChange( const QPalette &p )
 {
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 6d94539..05073ab 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -57,4 +57,6 @@ public:
     bool removeLink(const QString& linkfile);
     void addItem(AppLnk* app, bool resort=TRUE);
+    void changeItem(const AppLnk&old,AppLnk*nlink);
+
     void removeAllItems();
     void setSortEnabled(bool);
@@ -177,5 +179,6 @@ public:
 
     void addItem(AppLnk* app, bool resort=TRUE);
-    bool removeLink(const QString& linkfile);
+    bool removeLink(const QString& linkfile,bool removeCache = true);
+    void changeItem(const AppLnk&old,AppLnk*nlink);
 
     QStringList mimeTypes() const;
@@ -207,4 +210,6 @@ public:
     void requestEyePix(const LauncherItem*which);
 
+    static QMap<QString,QPixmap>* sm_EyeCache;
+
 protected:
     virtual void timerEvent( QTimerEvent *te );