-rw-r--r-- | core/launcher/launcherview.cpp | 32 | ||||
-rw-r--r-- | core/launcher/launcherview.h | 9 |
2 files changed, 29 insertions, 12 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 85163b6..62c678d 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -63,8 +63,4 @@ public: | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | enum BusyIndicatorType { | ||
66 | BIT_Normal = 0, | ||
67 | BIT_Blinking | ||
68 | }; | ||
69 | 65 | ||
70 | static QMap<QString,BgPixmap*> *bgCache = 0; | 66 | static QMap<QString,BgPixmap*> *bgCache = 0; |
@@ -98,4 +94,6 @@ public: | |||
98 | virtual int compare ( QIconViewItem * i ) const; | 94 | virtual int compare ( QIconViewItem * i ) const; |
99 | void paintItem( QPainter *p, const QColorGroup &cg ); | 95 | void paintItem( QPainter *p, const QColorGroup &cg ); |
96 | |||
97 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } | ||
100 | protected: | 98 | protected: |
101 | bool isBigIcon; | 99 | bool isBigIcon; |
@@ -104,4 +102,5 @@ protected: | |||
104 | private: | 102 | private: |
105 | void paintAnimatedIcon( QPainter *p ); | 103 | void paintAnimatedIcon( QPainter *p ); |
104 | BusyIndicatorType busyType; | ||
106 | }; | 105 | }; |
107 | 106 | ||
@@ -148,6 +147,6 @@ public: | |||
148 | 147 | ||
149 | void updateCategoriesAndMimeTypes(); | 148 | void updateCategoriesAndMimeTypes(); |
150 | 149 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } | |
151 | void doAutoScroll() | 150 | void doAutoScroll() |
152 | { | 151 | { |
153 | // We don't want rubberbanding (yet) | 152 | // We don't want rubberbanding (yet) |
@@ -177,8 +176,11 @@ public: | |||
177 | LauncherItem *oldBusy = bsy; | 176 | LauncherItem *oldBusy = bsy; |
178 | bsy = c; | 177 | bsy = c; |
179 | if ( oldBusy ) | 178 | if ( oldBusy ) { |
180 | oldBusy->resetIcon(); | 179 | oldBusy->resetIcon(); |
181 | if ( bsy ) | 180 | } |
181 | if ( bsy ) { | ||
182 | bsy->setBusyIndicatorType( busyType ) ; | ||
182 | bsy->animateIcon(); | 183 | bsy->animateIcon(); |
184 | } | ||
183 | } | 185 | } |
184 | } | 186 | } |
@@ -364,4 +366,5 @@ private: | |||
364 | QPixmap busyPix; | 366 | QPixmap busyPix; |
365 | #endif | 367 | #endif |
368 | BusyIndicatorType busyType; | ||
366 | }; | 369 | }; |
367 | 370 | ||
@@ -375,5 +378,8 @@ void LauncherView::setBusy(bool on) | |||
375 | 378 | ||
376 | void LauncherView::setBusyIndicatorType( const QString& type ) { | 379 | void LauncherView::setBusyIndicatorType( const QString& type ) { |
377 | /* ### FIXME */ | 380 | if ( type. lower ( ) == "animated" ) |
381 | icons->setBusyIndicatorType( BIT_Animated ) ; | ||
382 | else | ||
383 | icons->setBusyIndicatorType( BIT_Normal ) ; | ||
378 | } | 384 | } |
379 | 385 | ||
@@ -421,4 +427,6 @@ void LauncherItem::paintItem( QPainter *p, const QColorGroup &cg ) | |||
421 | } | 427 | } |
422 | 428 | ||
429 | |||
430 | |||
423 | void LauncherItem::paintAnimatedIcon( QPainter *p ) | 431 | void LauncherItem::paintAnimatedIcon( QPainter *p ) |
424 | { | 432 | { |
@@ -441,6 +449,8 @@ void LauncherItem::paintAnimatedIcon( QPainter *p ) | |||
441 | int bounceY = 2; | 449 | int bounceY = 2; |
442 | #ifdef BOUNCE_BUSY_ICON | 450 | #ifdef BOUNCE_BUSY_ICON |
443 | bounceY = 4 - ((iteration+2)%8); | 451 | if ( busyType == BIT_Animated ) { |
444 | bounceY = bounceY < 0 ? -bounceY : bounceY; | 452 | bounceY = 4 - ((iteration+2)%8); |
453 | bounceY = bounceY < 0 ? -bounceY : bounceY; | ||
454 | } | ||
445 | #endif | 455 | #endif |
446 | p2.drawPixmap( x1, y1 + bounceY, *pixmap() ); | 456 | p2.drawPixmap( x1, y1 + bounceY, *pixmap() ); |
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h index 7863d6a..e40a006 100644 --- a/core/launcher/launcherview.h +++ b/core/launcher/launcherview.h | |||
@@ -35,4 +35,11 @@ class MenuButton; | |||
35 | class QComboBox; | 35 | class QComboBox; |
36 | 36 | ||
37 | |||
38 | |||
39 | enum BusyIndicatorType { | ||
40 | BIT_Normal = 0, | ||
41 | BIT_Animated | ||
42 | }; | ||
43 | |||
37 | class LauncherView : public QVBox | 44 | class LauncherView : public QVBox |
38 | { | 45 | { |
@@ -107,5 +114,5 @@ private: | |||
107 | 114 | ||
108 | QImage loadBackgroundImage(QString &fname); | 115 | QImage loadBackgroundImage(QString &fname); |
109 | int m_busyType; | 116 | |
110 | }; | 117 | }; |
111 | 118 | ||