-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 | |||
@@ -61,12 +61,8 @@ public: | |||
61 | QPixmap pm; | 61 | QPixmap pm; |
62 | int ref; | 62 | int ref; |
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; |
71 | 67 | ||
72 | static void cleanup_cache() | 68 | static void cleanup_cache() |
@@ -96,14 +92,17 @@ public: | |||
96 | void resetIcon(); | 92 | void resetIcon(); |
97 | 93 | ||
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; |
102 | int iteration; | 100 | int iteration; |
103 | AppLnk* app; | 101 | AppLnk* app; |
104 | private: | 102 | private: |
105 | void paintAnimatedIcon( QPainter *p ); | 103 | void paintAnimatedIcon( QPainter *p ); |
104 | BusyIndicatorType busyType; | ||
106 | }; | 105 | }; |
107 | 106 | ||
108 | 107 | ||
109 | class LauncherIconView : public QIconView { | 108 | class LauncherIconView : public QIconView { |
@@ -146,10 +145,10 @@ public: | |||
146 | #endif | 145 | #endif |
147 | } | 146 | } |
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) |
154 | } | 153 | } |
155 | 154 | ||
@@ -175,12 +174,15 @@ public: | |||
175 | 174 | ||
176 | if ( bsy != c ) { | 175 | if ( bsy != c ) { |
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 | } |
185 | 187 | ||
186 | bool inKeyEvent() const { return ike; } | 188 | bool inKeyEvent() const { return ike; } |
@@ -362,8 +364,9 @@ private: | |||
362 | QColor bgColor; | 364 | QColor bgColor; |
363 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY | 365 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY |
364 | QPixmap busyPix; | 366 | QPixmap busyPix; |
365 | #endif | 367 | #endif |
368 | BusyIndicatorType busyType; | ||
366 | }; | 369 | }; |
367 | 370 | ||
368 | 371 | ||
369 | bool LauncherView::bsy=FALSE; | 372 | bool LauncherView::bsy=FALSE; |
@@ -373,9 +376,12 @@ void LauncherView::setBusy(bool on) | |||
373 | icons->setBusy(on); | 376 | icons->setBusy(on); |
374 | } | 377 | } |
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 | ||
380 | LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) | 386 | LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) |
381 | : QIconViewItem( parent, applnk->name(), | 387 | : QIconViewItem( parent, applnk->name(), |
@@ -419,8 +425,10 @@ void LauncherItem::paintItem( QPainter *p, const QColorGroup &cg ) | |||
419 | if ( liv->currentItem() == this ) | 425 | if ( liv->currentItem() == this ) |
420 | liv->setItemTextBackground( oldBrush ); | 426 | liv->setItemTextBackground( oldBrush ); |
421 | } | 427 | } |
422 | 428 | ||
429 | |||
430 | |||
423 | void LauncherItem::paintAnimatedIcon( QPainter *p ) | 431 | void LauncherItem::paintAnimatedIcon( QPainter *p ) |
424 | { | 432 | { |
425 | LauncherIconView* liv = (LauncherIconView*)iconView(); | 433 | LauncherIconView* liv = (LauncherIconView*)iconView(); |
426 | int pic = iteration % 16; | 434 | int pic = iteration % 16; |
@@ -439,10 +447,12 @@ void LauncherItem::paintAnimatedIcon( QPainter *p ) | |||
439 | p2.translate(-x1,-y1); | 447 | p2.translate(-x1,-y1); |
440 | liv->drawBackground( &p2, QRect(x1,y1,w,h+4) ); | 448 | liv->drawBackground( &p2, QRect(x1,y1,w,h+4) ); |
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() ); |
447 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY | 457 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY |
448 | p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h ); | 458 | p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h ); |
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 | |||
@@ -33,8 +33,15 @@ class QLabel; | |||
33 | class QWidgetStack; | 33 | class QWidgetStack; |
34 | class MenuButton; | 34 | 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 | { |
39 | Q_OBJECT | 46 | Q_OBJECT |
40 | 47 | ||
@@ -105,8 +112,8 @@ private: | |||
105 | QString bgName; | 112 | QString bgName; |
106 | QColor textCol; | 113 | QColor textCol; |
107 | 114 | ||
108 | QImage loadBackgroundImage(QString &fname); | 115 | QImage loadBackgroundImage(QString &fname); |
109 | int m_busyType; | 116 | |
110 | }; | 117 | }; |
111 | 118 | ||
112 | #endif // LAUNCHERVIEW_H | 119 | #endif // LAUNCHERVIEW_H |