author | harlekin <harlekin> | 2003-11-30 18:04:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-11-30 18:04:13 (UTC) |
commit | f40b049e2345a9b008ea2bdc241062302bd7ca04 (patch) (side-by-side diff) | |
tree | 82ba2d954605de18ef063315b62f04f434ce43cb | |
parent | a7e786be4f9545a881015de8ba8a124a62f0f891 (diff) | |
download | opie-f40b049e2345a9b008ea2bdc241062302bd7ca04.zip opie-f40b049e2345a9b008ea2bdc241062302bd7ca04.tar.gz opie-f40b049e2345a9b008ea2bdc241062302bd7ca04.tar.bz2 |
make the busy indicator launcher settings also work in head
-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: QPixmap pm; int ref; }; -enum BusyIndicatorType { - BIT_Normal = 0, - BIT_Blinking -}; static QMap<QString,BgPixmap*> *bgCache = 0; static void cleanup_cache() @@ -96,14 +92,17 @@ public: void resetIcon(); virtual int compare ( QIconViewItem * i ) const; void paintItem( QPainter *p, const QColorGroup &cg ); + + void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } protected: bool isBigIcon; int iteration; AppLnk* app; private: void paintAnimatedIcon( QPainter *p ); + BusyIndicatorType busyType; }; class LauncherIconView : public QIconView { @@ -146,10 +145,10 @@ public: #endif } void updateCategoriesAndMimeTypes(); - - void doAutoScroll() + void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } + void doAutoScroll() { // We don't want rubberbanding (yet) } @@ -175,12 +174,15 @@ public: if ( bsy != c ) { LauncherItem *oldBusy = bsy; bsy = c; - if ( oldBusy ) + if ( oldBusy ) { oldBusy->resetIcon(); - if ( bsy ) + } + if ( bsy ) { + bsy->setBusyIndicatorType( busyType ) ; bsy->animateIcon(); + } } } bool inKeyEvent() const { return ike; } @@ -362,8 +364,9 @@ private: QColor bgColor; #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY QPixmap busyPix; #endif + BusyIndicatorType busyType; }; bool LauncherView::bsy=FALSE; @@ -373,9 +376,12 @@ void LauncherView::setBusy(bool on) icons->setBusy(on); } void LauncherView::setBusyIndicatorType( const QString& type ) { - /* ### FIXME */ + if ( type. lower ( ) == "animated" ) + icons->setBusyIndicatorType( BIT_Animated ) ; + else + icons->setBusyIndicatorType( BIT_Normal ) ; } LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) : QIconViewItem( parent, applnk->name(), @@ -419,8 +425,10 @@ void LauncherItem::paintItem( QPainter *p, const QColorGroup &cg ) if ( liv->currentItem() == this ) liv->setItemTextBackground( oldBrush ); } + + void LauncherItem::paintAnimatedIcon( QPainter *p ) { LauncherIconView* liv = (LauncherIconView*)iconView(); int pic = iteration % 16; @@ -439,10 +447,12 @@ void LauncherItem::paintAnimatedIcon( QPainter *p ) p2.translate(-x1,-y1); liv->drawBackground( &p2, QRect(x1,y1,w,h+4) ); int bounceY = 2; #ifdef BOUNCE_BUSY_ICON - bounceY = 4 - ((iteration+2)%8); - bounceY = bounceY < 0 ? -bounceY : bounceY; + if ( busyType == BIT_Animated ) { + bounceY = 4 - ((iteration+2)%8); + bounceY = bounceY < 0 ? -bounceY : bounceY; + } #endif p2.drawPixmap( x1, y1 + bounceY, *pixmap() ); #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY 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; class QWidgetStack; class MenuButton; class QComboBox; + + +enum BusyIndicatorType { + BIT_Normal = 0, + BIT_Animated +}; + class LauncherView : public QVBox { Q_OBJECT @@ -105,8 +112,8 @@ private: QString bgName; QColor textCol; QImage loadBackgroundImage(QString &fname); - int m_busyType; + }; #endif // LAUNCHERVIEW_H |