| -rw-r--r-- | core/launcher/launcherview.cpp | 28 | ||||
| -rw-r--r-- | core/launcher/launcherview.h | 22 |
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 @@ -272,4 +272,5 @@ LauncherIconView::LauncherIconView( QWidget* parent, const char* name ) ike = FALSE; calculateGrid( Bottom ); + connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer())); } @@ -456,4 +457,5 @@ void LauncherIconView::requestEyePix(const LauncherItem*item) if (!item) return; if (item->isEyeImage()) { + m_eyeTimer.changeInterval(600000); checkCallback(); int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); @@ -462,4 +464,14 @@ void LauncherIconView::requestEyePix(const LauncherItem*item) } +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) { @@ -602,4 +614,19 @@ void LauncherIconView::styleChange( QStyle &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 @@ -1124,5 +1151,4 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at ) 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); } 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 @@ -26,4 +26,5 @@ #include <qvbox.h> #include <qiconview.h> +#include <qtimer.h> class CategorySelect; @@ -174,18 +175,4 @@ public: 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); @@ -220,5 +207,5 @@ public: protected: - void timerEvent( QTimerEvent *te ); + virtual void timerEvent( QTimerEvent *te ); void styleChange( QStyle &old ); void calculateGrid( ItemTextPos pos ); @@ -228,7 +215,9 @@ protected: void addCheckItem(AppLnk* app); void checkCallback(); + virtual void keyPressEvent(QKeyEvent* e); protected slots: void setEyePixmap(const QPixmap&,const QString&,int width); + void stopEyeTimer(); private: @@ -249,5 +238,6 @@ private: QPixmap busyPix; #endif - BusyIndicatorType busyType; + BusyIndicatorType busyType; + QTimer m_eyeTimer; }; |