2 files changed, 31 insertions, 7 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index a4c7561..d960908 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -106,16 +106,18 @@ protected:
 private:
     void paintAnimatedIcon( QPainter *p );
     BusyIndicatorType busyType;
     int psize;
     bool m_EyeImage;
     iconstate_t m_EyeImageSet;
 };
 
+static bool s_IgnoreNextPix = false;
+
 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_EyeImage(false),
@@ -136,17 +138,17 @@ 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) {
+    if (m_EyeImage && m_EyeImageSet == BASE_ICON && s_IgnoreNextPix==false) {
         LauncherIconView* liv = (LauncherIconView*)iconView();
         liv->requestEyePix(this);
     }
     return QIconViewItem::pixmap();
 }
 
 int LauncherItem::compare ( QIconViewItem * i ) const
 {
@@ -289,46 +291,60 @@ LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
     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()));
     Config config( "Launcher" );
     config.setGroup( "GUI" );
-    setStaticBackgroundPicture( config.readBoolEntry( "StaticBackground", true ) );   
+    setStaticBackgroundPicture( config.readBoolEntry( "StaticBackground", true ) );
 }
 
 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
 }
 
+void LauncherIconView::unsetPalette()
+{
+    s_IgnoreNextPix = true;
+    QIconView::unsetPalette();
+    s_IgnoreNextPix = false;
+}
+
+void LauncherIconView::setPalette(const QPalette & palette)
+{
+    s_IgnoreNextPix = true;
+    QIconView::setPalette(palette);
+    s_IgnoreNextPix = false;
+}
+
 void LauncherIconView::setStaticBackgroundPicture( bool enable )
 {
     staticBackground = enable;
     if ( staticBackground )
     {
         setStaticBackground( true );
         verticalScrollBar()->setTracking( false );
     }
     else
     {
         setStaticBackground( false );
         verticalScrollBar()->setTracking( true );
-    }    
-}    
+    }
+}
 
 int LauncherIconView::compare(const AppLnk* a, const AppLnk* b)
 {
     switch (sortmeth) {
     case Name:
         return a->name().lower().compare(b->name().lower());
     case Date: {
         QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
@@ -481,18 +497,18 @@ void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,in
 }
 
 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();
     }
@@ -1203,18 +1219,20 @@ QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) {
     return s;
 }
 
 QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
     return s << inf.file  << inf.width << inf.height;
 }
 
 LauncherThumbReceiver::LauncherThumbReceiver()
-    :QObject()
+    :QObject(),requestTimer(this)
 {
+
+    connect(&requestTimer,SIGNAL(timeout()),SLOT(sendRequest()));
     QCopChannel * chan = new QCopChannel( "QPE/opie-eye",this );
     connect(chan, SIGNAL(received(const QCString&,const QByteArray&)),
             this, SLOT(recieve(const QCString&,const QByteArray&)) );
 
     {
         QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" );
     }
 }
@@ -1242,17 +1260,19 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at )
 
 void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height)
 {
     PixmapInfo rItem;
     rItem.file = file;
     rItem.width = width;
     rItem.height = height;
     m_inThumbNail.append(rItem);
-    QTimer::singleShot(2, this, SLOT(sendRequest()));
+    if (!requestTimer.isActive()) {
+        requestTimer.start(100,true);
+    }
 }
 
 void LauncherThumbReceiver::sendRequest()
 {
     if (m_inThumbNail.count()>0) {
         QCopEnvelope env("QPE/opie-eye_slave", "pixmapInfos(PixmapInfos)" );
         env << m_inThumbNail;
         m_inThumbNail.clear();
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 6a2d197..792c6d1 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -148,16 +148,17 @@ public slots:
     void recieve( const QCString&, const QByteArray& );
 protected slots:
     virtual void sendRequest();
 
 signals:
     void sig_Thumbnail(const QPixmap&,const QString&,int);
 
 protected:
+    QTimer requestTimer;
     PixmapInfos m_inThumbNail;
 };
 
 class LauncherIconView : public QIconView {
     Q_OBJECT
 public:
     LauncherIconView( QWidget* parent, const char* name=0 );
     ~LauncherIconView();
@@ -209,16 +210,19 @@ public:
     enum SortMethod { Name, Date, Type };
 
     void setSortMethod( SortMethod m );
     int compare(const AppLnk* a, const AppLnk* b);
     void requestEyePix(const LauncherItem*which);
 
     static QMap<QString,QPixmap>* sm_EyeCache;
 
+    virtual void setPalette(const QPalette & palette);
+    virtual void unsetPalette();
+
 protected:
     virtual void timerEvent( QTimerEvent *te );
     void styleChange( QStyle &old );
     void calculateGrid( ItemTextPos pos );
     void focusInEvent( QFocusEvent * ) {}
     void focusOutEvent( QFocusEvent * ) {}
     LauncherItem*findDocItem(const QString&);
     void addCheckItem(AppLnk* app);