2 files changed, 33 insertions, 17 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 506c11e..42704ba 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -268,12 +268,13 @@ LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
 {
     m_EyeCallBack = 0;
     sortmeth = Name;
     hidden.setAutoDelete(TRUE);
     ike = FALSE;
     calculateGrid( Bottom );
+    connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer()));
 }
 
 LauncherIconView::~LauncherIconView()
 {
 #if 0 // debuggery
     QListIterator<AppLnk> it(hidden);
@@ -452,18 +453,29 @@ void LauncherIconView::addCheckItem(AppLnk* app)
 }
 
 void LauncherIconView::requestEyePix(const LauncherItem*item)
 {
     if (!item) return;
     if (item->isEyeImage()) {
+        m_eyeTimer.changeInterval(600000);
         checkCallback();
         int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
         m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s);
     }
 }
 
+void LauncherIconView::stopEyeTimer()
+{
+    odebug << "Launcherview: delete opie-eye handle" << oendl;
+    if (m_EyeCallBack) {
+        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 ) ) {
@@ -598,12 +610,27 @@ void LauncherIconView::calculateGrid( ItemTextPos pos )
 
 void LauncherIconView::styleChange( QStyle &old )
 {
     QIconView::styleChange( old );
     calculateGrid( itemTextPos() );
 }
+
+void LauncherIconView::keyPressEvent(QKeyEvent* e)
+{
+    ike = TRUE;
+    if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) {
+        if ( (e->state() & ShiftButton) )
+            emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() );
+         else
+            returnPressed(currentItem());
+    }
+
+    QIconView::keyPressEvent(e);
+    ike = FALSE;
+}
+
 //===========================================================================
 // Implemantation of LauncherIconview end
 //===========================================================================
 
 
 //===========================================================================
@@ -1120,13 +1147,12 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at )
 
     /* we are just interested in thumbmails */
     if ( str == "pixmapsHandled(PixmapList)" )
         stream >> pixinfos;
 
     for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it ) {
-        odebug << "Pixinfos: " << (*it).file << " - " << (*it).width << oendl;
         emit sig_Thumbnail((*it).pixmap,(*it).file,(*it).width);
     }
 }
 
 void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height)
 {
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 0be9a1f..ebb1362 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -22,12 +22,13 @@
 
 #include <qtopia/storage.h>
 #include <qtopia/applnk.h>
 
 #include <qvbox.h>
 #include <qiconview.h>
+#include <qtimer.h>
 
 class CategorySelect;
 class LauncherIconView;
 class LauncherItem;
 class QIconViewItem;
 class QLabel;
@@ -170,26 +171,12 @@ public:
     // We don't want rubberbanding (yet)
     }
 
     void setBusy(bool on);
     bool inKeyEvent() const { return ike; }
 
-    void keyPressEvent(QKeyEvent* e)
-    {
-        ike = TRUE;
-        if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) {
-            if ( (e->state() & ShiftButton) )
-                emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() );
-            else
-                returnPressed(currentItem());
-        }
-
-        QIconView::keyPressEvent(e);
-        ike = FALSE;
-    }
-
     void addItem(AppLnk* app, bool resort=TRUE);
     bool removeLink(const QString& linkfile);
 
     QStringList mimeTypes() const;
     QStringList categories() const;
     void clear();
@@ -216,23 +203,25 @@ public:
 
     void setSortMethod( SortMethod m );
     int compare(const AppLnk* a, const AppLnk* b);
     void requestEyePix(const LauncherItem*which);
 
 protected:
-    void timerEvent( QTimerEvent *te );
+    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);
     void checkCallback();
+    virtual void keyPressEvent(QKeyEvent* e);
 
 protected slots:
     void setEyePixmap(const QPixmap&,const QString&,int width);
+    void stopEyeTimer();
 
 private:
     QList<AppLnk> hidden;
     QDict<void> mimes;
     QDict<void> cats;
     SortMethod sortmeth;
@@ -245,10 +234,11 @@ private:
     QPixmap bgPixmap;
     QColor bgColor;
     LauncherThumbReceiver*m_EyeCallBack;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     QPixmap busyPix;
 #endif
-  BusyIndicatorType busyType;
+    BusyIndicatorType busyType;
+    QTimer m_eyeTimer;
 };
 
 #endif // LAUNCHERVIEW_H