-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 | |||
@@ -271,6 +271,7 @@ LauncherIconView::LauncherIconView( QWidget* parent, const char* name ) | |||
271 | hidden.setAutoDelete(TRUE); | 271 | hidden.setAutoDelete(TRUE); |
272 | ike = FALSE; | 272 | ike = FALSE; |
273 | calculateGrid( Bottom ); | 273 | calculateGrid( Bottom ); |
274 | connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer())); | ||
274 | } | 275 | } |
275 | 276 | ||
276 | LauncherIconView::~LauncherIconView() | 277 | LauncherIconView::~LauncherIconView() |
@@ -455,12 +456,23 @@ void LauncherIconView::requestEyePix(const LauncherItem*item) | |||
455 | { | 456 | { |
456 | if (!item) return; | 457 | if (!item) return; |
457 | if (item->isEyeImage()) { | 458 | if (item->isEyeImage()) { |
459 | m_eyeTimer.changeInterval(600000); | ||
458 | checkCallback(); | 460 | checkCallback(); |
459 | int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); | 461 | int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); |
460 | m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s); | 462 | m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s); |
461 | } | 463 | } |
462 | } | 464 | } |
463 | 465 | ||
466 | void LauncherIconView::stopEyeTimer() | ||
467 | { | ||
468 | odebug << "Launcherview: delete opie-eye handle" << oendl; | ||
469 | if (m_EyeCallBack) { | ||
470 | delete m_EyeCallBack; | ||
471 | m_EyeCallBack=0; | ||
472 | } | ||
473 | m_eyeTimer.stop(); | ||
474 | } | ||
475 | |||
464 | void LauncherIconView::addItem(AppLnk* app, bool resort) | 476 | void LauncherIconView::addItem(AppLnk* app, bool resort) |
465 | { | 477 | { |
466 | addCatsAndMimes(app); | 478 | addCatsAndMimes(app); |
@@ -601,6 +613,21 @@ void LauncherIconView::styleChange( QStyle &old ) | |||
601 | QIconView::styleChange( old ); | 613 | QIconView::styleChange( old ); |
602 | calculateGrid( itemTextPos() ); | 614 | calculateGrid( itemTextPos() ); |
603 | } | 615 | } |
616 | |||
617 | void LauncherIconView::keyPressEvent(QKeyEvent* e) | ||
618 | { | ||
619 | ike = TRUE; | ||
620 | if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) { | ||
621 | if ( (e->state() & ShiftButton) ) | ||
622 | emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() ); | ||
623 | else | ||
624 | returnPressed(currentItem()); | ||
625 | } | ||
626 | |||
627 | QIconView::keyPressEvent(e); | ||
628 | ike = FALSE; | ||
629 | } | ||
630 | |||
604 | //=========================================================================== | 631 | //=========================================================================== |
605 | // Implemantation of LauncherIconview end | 632 | // Implemantation of LauncherIconview end |
606 | //=========================================================================== | 633 | //=========================================================================== |
@@ -1123,7 +1150,6 @@ void LauncherThumbReceiver::recieve( const QCString&str, const QByteArray&at ) | |||
1123 | stream >> pixinfos; | 1150 | stream >> pixinfos; |
1124 | 1151 | ||
1125 | for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it ) { | 1152 | for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it ) { |
1126 | odebug << "Pixinfos: " << (*it).file << " - " << (*it).width << oendl; | ||
1127 | emit sig_Thumbnail((*it).pixmap,(*it).file,(*it).width); | 1153 | emit sig_Thumbnail((*it).pixmap,(*it).file,(*it).width); |
1128 | } | 1154 | } |
1129 | } | 1155 | } |
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 | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include <qvbox.h> | 26 | #include <qvbox.h> |
27 | #include <qiconview.h> | 27 | #include <qiconview.h> |
28 | #include <qtimer.h> | ||
28 | 29 | ||
29 | class CategorySelect; | 30 | class CategorySelect; |
30 | class LauncherIconView; | 31 | class LauncherIconView; |
@@ -173,20 +174,6 @@ public: | |||
173 | void setBusy(bool on); | 174 | void setBusy(bool on); |
174 | bool inKeyEvent() const { return ike; } | 175 | bool inKeyEvent() const { return ike; } |
175 | 176 | ||
176 | void keyPressEvent(QKeyEvent* e) | ||
177 | { | ||
178 | ike = TRUE; | ||
179 | if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) { | ||
180 | if ( (e->state() & ShiftButton) ) | ||
181 | emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() ); | ||
182 | else | ||
183 | returnPressed(currentItem()); | ||
184 | } | ||
185 | |||
186 | QIconView::keyPressEvent(e); | ||
187 | ike = FALSE; | ||
188 | } | ||
189 | |||
190 | void addItem(AppLnk* app, bool resort=TRUE); | 177 | void addItem(AppLnk* app, bool resort=TRUE); |
191 | bool removeLink(const QString& linkfile); | 178 | bool removeLink(const QString& linkfile); |
192 | 179 | ||
@@ -219,7 +206,7 @@ public: | |||
219 | void requestEyePix(const LauncherItem*which); | 206 | void requestEyePix(const LauncherItem*which); |
220 | 207 | ||
221 | protected: | 208 | protected: |
222 | void timerEvent( QTimerEvent *te ); | 209 | virtual void timerEvent( QTimerEvent *te ); |
223 | void styleChange( QStyle &old ); | 210 | void styleChange( QStyle &old ); |
224 | void calculateGrid( ItemTextPos pos ); | 211 | void calculateGrid( ItemTextPos pos ); |
225 | void focusInEvent( QFocusEvent * ) {} | 212 | void focusInEvent( QFocusEvent * ) {} |
@@ -227,9 +214,11 @@ protected: | |||
227 | LauncherItem*findDocItem(const QString&); | 214 | LauncherItem*findDocItem(const QString&); |
228 | void addCheckItem(AppLnk* app); | 215 | void addCheckItem(AppLnk* app); |
229 | void checkCallback(); | 216 | void checkCallback(); |
217 | virtual void keyPressEvent(QKeyEvent* e); | ||
230 | 218 | ||
231 | protected slots: | 219 | protected slots: |
232 | void setEyePixmap(const QPixmap&,const QString&,int width); | 220 | void setEyePixmap(const QPixmap&,const QString&,int width); |
221 | void stopEyeTimer(); | ||
233 | 222 | ||
234 | private: | 223 | private: |
235 | QList<AppLnk> hidden; | 224 | QList<AppLnk> hidden; |
@@ -248,7 +237,8 @@ private: | |||
248 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY | 237 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY |
249 | QPixmap busyPix; | 238 | QPixmap busyPix; |
250 | #endif | 239 | #endif |
251 | BusyIndicatorType busyType; | 240 | BusyIndicatorType busyType; |
241 | QTimer m_eyeTimer; | ||
252 | }; | 242 | }; |
253 | 243 | ||
254 | #endif // LAUNCHERVIEW_H | 244 | #endif // LAUNCHERVIEW_H |