timer for releasing a reference to opie-eye_slave if exists when unused for ten

minutes.

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
@@ -242,64 +242,65 @@ void LauncherItem::animateIcon()
     iteration++;
 
     // Paint animation overlay
     QPainter p( liv->viewport() );
     paintAnimatedIcon( &p );
 }
 
 void LauncherItem::resetIcon()
 {
     iteration = 0;
     setPixmap((isEyeImage()?m_iPixmap:(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
 //===========================================================================
 LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
     : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white)
 {
     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);
     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:
         return a->name().lower().compare(b->name().lower());
     case Date: {
         QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
         QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
         return fa.lastModified().secsTo(fb.lastModified());
     }
     case Type:
         return a->type().compare(b->type());
     }
     return 0;
 }
 
 void LauncherIconView::setSortMethod( SortMethod m )
 {
@@ -426,70 +427,81 @@ LauncherItem*LauncherIconView::findDocItem(const QString&fname)
 
 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;
     item->setEyePixmap(aPixmap);
 }
 
 void LauncherIconView::checkCallback()
 {
     if (m_EyeCallBack) {
         return;
     }
     m_EyeCallBack = new LauncherThumbReceiver();
     connect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)),
         this,SLOT(setEyePixmap(const QPixmap&,const QString&,int)));
 }
 
 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()) {
+        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 ) ) {
         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;
     }
 }
 
@@ -572,64 +584,79 @@ QIconViewItem* LauncherIconView::busyItem() const
 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 );
             setGridX( (viewerWidth-(cols+1)*spacing())/cols );
             setGridY( fontMetrics().height()*2+24 );
         } else {
             int cols = 2;
             if ( viewerWidth < 150 )
                 cols = 1;
             else if ( viewerWidth >= 400 )
                 cols = viewerWidth/150;
             setSpacing( 2 );
             setGridX( (viewerWidth-(cols+1)*spacing())/cols );
             setGridY( fontMetrics().height()+2 );
         }
 }
 
 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
 //===========================================================================
 
 
 //===========================================================================
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     catmb = 0;
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
     icons->setResizeMode( QIconView::Fixed );
     vmode = (ViewMode)-1;
     setViewMode( Icon );
 
     connect( icons, SIGNAL(mouseButtonClicked(int,QIconViewItem*,const QPoint&)),
            SLOT(itemClicked(int,QIconViewItem*)) );
     connect( icons, SIGNAL(selectionChanged()),
            SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem*)),
            SLOT(returnPressed(QIconViewItem*)) );
     connect( icons, SIGNAL(mouseButtonPressed(int,QIconViewItem*,const QPoint&)),
@@ -1094,55 +1121,54 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
     return s << inf.file  << inf.width << inf.height;
 }
 
 LauncherThumbReceiver::LauncherThumbReceiver()
     :QObject()
 {
     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()" );
     }
 }
 
 LauncherThumbReceiver::~LauncherThumbReceiver()
 {
     {
         QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" );
     }
 }
 
 void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at )
 {
     PixmapInfos pixinfos;
     QDataStream stream( at, IO_ReadOnly );
 
     /* 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)
 {
     PixmapInfo rItem;
     rItem.file = file;
     rItem.width = width;
     rItem.height = height;
     m_inThumbNail.append(rItem);
     QTimer::singleShot(0, this, SLOT(sendRequest()));
 }
 
 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 0be9a1f..ebb1362 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -1,59 +1,60 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef LAUNCHERVIEW_H
 #define LAUNCHERVIEW_H
 
 #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;
 class QWidgetStack;
 class MenuButton;
 class QComboBox;
 
 
 
 enum BusyIndicatorType {
     BIT_Normal = 0,
     BIT_Animated
 };
 
 class LauncherView : public QVBox
 {
     Q_OBJECT
 
 public:
     LauncherView( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~LauncherView();
 
     void hideIcons();
 
     bool removeLink(const QString& linkfile);
     void addItem(AppLnk* app, bool resort=TRUE);
     void removeAllItems();
     void setSortEnabled(bool);
     void setUpdatesEnabled(bool);
@@ -144,111 +145,100 @@ public slots:
     void recieve( const QCString&, const QByteArray& );
 protected slots:
     virtual void sendRequest();
 
 signals:
     void sig_Thumbnail(const QPixmap&,const QString&,int);
 
 protected:
     PixmapInfos m_inThumbNail;
 };
 
 class LauncherIconView : public QIconView {
     Q_OBJECT
 public:
     LauncherIconView( QWidget* parent, const char* name=0 );
     ~LauncherIconView();
     QIconViewItem* busyItem() const;
 
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     QPixmap busyPixmap() const { return busyPix; }
 #endif
     void setBigIcons( bool bi );
     void updateCategoriesAndMimeTypes();
     void setBusyIndicatorType ( BusyIndicatorType t );
     void doAutoScroll()
     {
     // 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();
     void addCatsAndMimes(AppLnk* app);
 
     void setBackgroundOrigin( QWidget::BackgroundOrigin ) {}
 
     void setBackgroundPixmap( const QPixmap &pm ) {
         bgPixmap = pm;
     }
 
     void setBackgroundColor( const QColor &c ) {
         bgColor = c;
     }
 
     void drawBackground( QPainter *p, const QRect &r );
     void setItemTextPos( ItemTextPos pos );
     void hideOrShowItems(bool resort);
 
     void setTypeFilter(const QString& typefilter, bool resort);
     void setCategoryFilter( int catfilter, bool resort );
 
     enum SortMethod { Name, Date, Type };
 
     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;
     QRegExp tf;
     int cf;
     LauncherItem* bsy;
     int busyTimer;
     bool ike;
     bool bigIcns;
     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